aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--include/bits/error.h1
-rw-r--r--misc/bits/error.h18
-rw-r--r--misc/error.h6
4 files changed, 25 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 846a38234c..60cdd2e1f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
[BZ #3924]
diff --git a/include/bits/error.h b/include/bits/error.h
new file mode 100644
index 0000000000..c2c7c9b710
--- /dev/null
+++ b/include/bits/error.h
@@ -0,0 +1 @@
+#include "../../misc/bits/error.h"
diff --git a/misc/bits/error.h b/misc/bits/error.h
index aafed58e7d..799a3f18bf 100644
--- a/misc/bits/error.h
+++ b/misc/bits/error.h
@@ -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,
diff --git a/misc/error.h b/misc/error.h
index ce99a941d2..00321e4c3d 100644
--- a/misc/error.h
+++ b/misc/error.h
@@ -29,11 +29,11 @@ __BEGIN_DECLS
if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
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)));
-extern void error_at_line (int __status, int __errnum, const char *__fname,
- unsigned int __lineno, const char *__format, ...)
+extern void error_at_line (int __status, int __errnum, __const char *__fname,
+ unsigned int __lineno, __const char *__format, ...)
__attribute__ ((__format__ (__printf__, 5, 6)));
/* If NULL, error will flush stdout, then print on stderr the program