1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00

* misc/error.h: Use __const instead of const.

* misc/bits/error.h: Likewise.

2007-10-07  Andreas Jaeger  <aj@suse.de>

	* include/bits/error.h: New file.

	* misc/bits/error.h (error_at_line): Fix prototype.
This commit is contained in:
Ulrich Drepper
2007-10-07 17:29:37 +00:00
parent a6fa53288f
commit a1a363d20c
4 changed files with 25 additions and 11 deletions

View File

@ -23,11 +23,11 @@
extern void __REDIRECT (__error_alias, (int __status, int __errnum,
const char *__format, ...),
__const char *__format, ...),
error)
__attribute__ ((__format__ (__printf__, 3, 4)));
extern void __REDIRECT (__error_noreturn, (int __status, int __errnum,
const char *__format, ...),
__const char *__format, ...),
error)
__attribute__ ((__noreturn__, __format__ (__printf__, 3, 4)));
@ -35,7 +35,7 @@ extern void __REDIRECT (__error_noreturn, (int __status, int __errnum,
/* If we know the function will never return make sure the compiler
realizes that, too. */
__extern_always_inline void
error (int __status, int __errnum, const char *__format, ...)
error (int __status, int __errnum, __const char *__format, ...)
{
if (__builtin_constant_p (__status) && __status != 0)
__error_noreturn (__status, __errnum, __format, __va_arg_pack ());
@ -45,15 +45,16 @@ error (int __status, int __errnum, const char *__format, ...)
extern void __REDIRECT (__error_at_line_alias, (int __status, int __errnum,
const char *__fname,
__const char *__fname,
unsigned int __line,
const char *__format, ...),
__const char *__format, ...),
error_at_line)
__attribute__ ((__format__ (__printf__, 5, 6)));
extern void __REDIRECT (__error_at_line_noreturn, (int __status, int __errnum,
const char *__fname,
__const char *__fname,
unsigned int __line,
const char *__format, ...),
__const char *__format,
...),
error_at_line)
__attribute__ ((__noreturn__, __format__ (__printf__, 5, 6)));
@ -61,7 +62,8 @@ extern void __REDIRECT (__error_at_line_noreturn, (int __status, int __errnum,
/* If we know the function will never return make sure the compiler
realizes that, too. */
__extern_always_inline void
error_at_line (int __status, int __errnum, const char *__format, ...)
error_at_line (int __status, int __errnum, __const char *__fname,
unsigned int __line,__const char *__format, ...)
{
if (__builtin_constant_p (__status) && __status != 0)
__error_at_line_noreturn (__status, __errnum, __fname, __line, __format,