summary refs log tree commit diff
path: root/misc/error.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-08-30 08:31:39 +0000
committerUlrich Drepper <drepper@redhat.com>2003-08-30 08:31:39 +0000
commit8c620ae0822b1c4439b42f4f7f01e5b6959f0574 (patch)
treef4842585fb9df365129514d61c8e01931095447e /misc/error.h
parentbc2e36893ac897047556babee5f7eb8eee7003aa (diff)
downloadglibc-8c620ae0822b1c4439b42f4f7f01e5b6959f0574.tar.gz
glibc-8c620ae0822b1c4439b42f4f7f01e5b6959f0574.tar.xz
glibc-8c620ae0822b1c4439b42f4f7f01e5b6959f0574.zip
Update.
2003-08-30  Ulrich Drepper  <drepper@redhat.com>

	* misc/error.c (error): Disable cancellation handling around the
	actual output.  The message should in any case be printed.
	(error_at_line): Likewise.

	* misc/error.h: Protect parameter names with leading __.
Diffstat (limited to 'misc/error.h')
-rw-r--r--misc/error.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/misc/error.h b/misc/error.h
index da5cf2f16b..3638bc6e98 100644
--- a/misc/error.h
+++ b/misc/error.h
@@ -1,7 +1,6 @@
 /* Declaration for error-reporting function
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.  The master source lives in /gd/gnu/lib.
+   Copyright (C) 1995, 1996, 1997, 2003 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -38,17 +37,17 @@
 extern "C" {
 #endif
 
-#if defined (__STDC__) && __STDC__
+#if defined __STDC__ && __STDC__
 
 /* Print a message with `fprintf (stderr, FORMAT, ...)';
    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