vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/gnulib/regcomp.c (regerror): Don't use abort on

Browse source 
unexpected error.
	(optimize_utf8): Likewise.
	* grub-core/lib/posix_wrap/stdlib.h (abort): Removed.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-01-29 23:22:57 +01:00
parent f37c87e1ba
commit db7337a3d3
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2012-01-29 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/gnulib/regcomp.c (regerror): Don't use abort on
unexpected error.
(optimize_utf8): Likewise.
* grub-core/lib/posix_wrap/stdlib.h (abort): Removed.
2012-01-29 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/boot/i386/pc/lnxboot.S: Use

4
grub-core/gnulib/regcomp.c
View file

@ -555,7 +555,7 @@ regerror (int errcode, const regex_t *_Restrict_ preg,
to this routine. If we are given anything else, or if other regex
code generates an invalid error code, then the program has a bug.
Dump core so we can fix it. */
abort ();
msg = "unknown regexp error";
msg = gettext (__re_error_msgid + __re_error_msgid_idx[errcode]);
@ -1119,7 +1119,7 @@ optimize_utf8 (re_dfa_t *dfa)
}
break;
default:
abort ();
break;
}
if (mb_chars || has_period)

6
grub-core/lib/posix_wrap/stdlib.h
View file

@ -46,10 +46,4 @@ realloc (void *ptr, grub_size_t size)
return grub_realloc (ptr, size);
}
static inline void __attribute__ ((noreturn))
abort (void)
{
grub_abort ();
}
#endif