mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-01-30 12:31:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2007-10-07 Ulrich Drepper <drepper@redhat.com>
* 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.
2007-10-06 Ulrich Drepper <drepper@redhat.com> 2007-10-06 Ulrich Drepper <drepper@redhat.com>
[BZ #3924] [BZ #3924]

1
include/bits/error.h Normal file
View File

@ -0,0 +1 @@
#include "../../misc/bits/error.h"

18
misc/bits/error.h
View File

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

6
misc/error.h
View File

@ -29,11 +29,11 @@ __BEGIN_DECLS
if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM). if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
If STATUS is nonzero, terminate the program with `exit (STATUS)'. */ If STATUS is nonzero, terminate the program with `exit (STATUS)'. */
extern void error (int __status, int __errnum, const char *__format, ...) extern void error (int __status, int __errnum, __const char *__format, ...)
__attribute__ ((__format__ (__printf__, 3, 4))); __attribute__ ((__format__ (__printf__, 3, 4)));
extern void error_at_line (int __status, int __errnum, const char *__fname, extern void error_at_line (int __status, int __errnum, __const char *__fname,
unsigned int __lineno, const char *__format, ...) unsigned int __lineno, __const char *__format, ...)
__attribute__ ((__format__ (__printf__, 5, 6))); __attribute__ ((__format__ (__printf__, 5, 6)));
/* If NULL, error will flush stdout, then print on stderr the program /* If NULL, error will flush stdout, then print on stderr the program