X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=libiberty%2Fstrerror.c;h=cc7692c1d6951ce7008b59d7f93766777d256547;hb=1ee1a363454d88a87ad2ade7530b2a7fb670021e;hp=37fbf4d0a8bc7aea20c48d59c976f3408a24d06e;hpb=99b581398536aae4ac5653df23c3d12d23359c1d;p=deliverable%2Fbinutils-gdb.git

diff --git a/libiberty/strerror.c b/libiberty/strerror.c
index 37fbf4d0a8..cc7692c1d6 100644
--- a/libiberty/strerror.c
+++ b/libiberty/strerror.c
@@ -2,9 +2,6 @@
    Written by Fred Fish.  fnf@cygnus.com
    This file is in the public domain.  --Per Bothner.  */
 
-#include "ansidecl.h"
-#include "libiberty.h"
-
 #include "config.h"
 
 #ifdef HAVE_SYS_ERRLIST
@@ -17,6 +14,9 @@
 #define sys_errlist sys_errlist__
 #endif
 
+#include "ansidecl.h"
+#include "libiberty.h"
+
 #include <stdio.h>
 #include <errno.h>
 
@@ -43,7 +43,7 @@ extern PTR memset ();
 #  define MAX(a,b) ((a) > (b) ? (a) : (b))
 #endif
 
-static void init_error_tables PARAMS ((void));
+static void init_error_tables (void);
 
 /* Translation table for errno values.  See intro(2) in most UNIX systems
    Programmers Reference Manuals.
@@ -299,7 +299,7 @@ static const struct error_info error_table[] =
   ENTRY(EREMCHG, "EREMCHG", "Remote address changed"),
 #endif
 #if defined (ELIBACC)
-  ENTRY(ELIBACC, "ELIBACC", "Can not access a needed shared library"),
+  ENTRY(ELIBACC, "ELIBACC", "Cannot access a needed shared library"),
 #endif
 #if defined (ELIBBAD)
   ENTRY(ELIBBAD, "ELIBBAD", "Accessing a corrupted shared library"),
@@ -462,16 +462,22 @@ static int num_error_names = 0;
 
 #ifndef HAVE_SYS_ERRLIST
 
+#define sys_nerr sys_nerr__
+#define sys_errlist sys_errlist__
 static int sys_nerr;
 static const char **sys_errlist;
 
 #else
 
+
+#ifndef sys_nerr
 extern int sys_nerr;
+#endif
+#ifndef sys_errlist
 extern char *sys_errlist[];
-
 #endif
 
+#endif
 
 /*
 
@@ -502,7 +508,7 @@ BUGS
 */
 
 static void
-init_error_tables ()
+init_error_tables (void)
 {
   const struct error_info *eip;
   int nbytes;
@@ -563,7 +569,7 @@ init_error_tables ()
 /*
 
 
-@deftypefn Replacement int errno_max (void)
+@deftypefn Extension int errno_max (void)
 
 Returns the maximum @code{errno} value for which a corresponding
 symbolic name or message is available.  Note that in the case where we
@@ -583,7 +589,7 @@ symbolic name or message.
 */
 
 int
-errno_max ()
+errno_max (void)
 {
   int maxsize;
 
@@ -599,7 +605,7 @@ errno_max ()
 
 /*
 
-@deftypefn Replacement char* strerror (int @var{errnoval})
+@deftypefn Supplemental char* strerror (int @var{errnoval})
 
 Maps an @code{errno} number to an error message string, the contents
 of which are implementation defined.  On systems which have the
@@ -608,7 +614,7 @@ strings will be the same as the ones used by @code{perror}.
 
 If the supplied error number is within the valid range of indices for
 the @code{sys_errlist}, but no message is available for the particular
-error number, then returns the string @samp{"Error @var{num}"}, where
+error number, then returns the string @samp{Error @var{num}}, where
 @var{num} is the error number.
 
 If the supplied error number is not a valid index into
@@ -622,8 +628,7 @@ next call to @code{strerror}.
 */
 
 char *
-strerror (errnoval)
-  int errnoval;
+strerror (int errnoval)
 {
   const char *msg;
   static char buf[32];
@@ -667,7 +672,7 @@ strerror (errnoval)
 
 /*
 
-@deftypefn Replacement const char* strerrno (int @var{errnum})
+@deftypefn Replacement {const char*} strerrno (int @var{errnum})
 
 Given an error number returned from a system call (typically returned
 in @code{errno}), returns a pointer to a string containing the
@@ -675,7 +680,7 @@ symbolic name of that error number, as found in @code{<errno.h>}.
 
 If the supplied error number is within the valid range of indices for
 symbolic names, but no name is available for the particular error
-number, then returns the string @samp{"Error @var{num}"}, where @var{num}
+number, then returns the string @samp{Error @var{num}}, where @var{num}
 is the error number.
 
 If the supplied error number is not within the range of valid
@@ -689,8 +694,7 @@ valid until the next call to @code{strerrno}.
 */
 
 const char *
-strerrno (errnoval)
-  int errnoval;
+strerrno (int errnoval)
 {
   const char *name;
   static char buf[32];
@@ -727,7 +731,7 @@ strerrno (errnoval)
 
 /*
 
-@deftypefn Replacement int strtoerrno (const char *@var{name})
+@deftypefn Extension int strtoerrno (const char *@var{name})
 
 Given the symbolic name of a error number (e.g., @code{EACCES}), map it
 to an errno value.  If no translation is found, returns 0.
@@ -737,8 +741,7 @@ to an errno value.  If no translation is found, returns 0.
 */
 
 int
-strtoerrno (name)
-     const char *name;
+strtoerrno (const char *name)
 {
   int errnoval = 0;
 
@@ -778,7 +781,7 @@ strtoerrno (name)
 #include <stdio.h>
 
 int
-main ()
+main (void)
 {
   int errn;
   int errnmax;