projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* atanl.c, logl.c: Add GPL notice, and make the code more similar to glibc.
[gnulib.git]
/
lib
/
error.c
diff --git
a/lib/error.c
b/lib/error.c
index
1149235
..
9bb3e55
100644
(file)
--- a/
lib/error.c
+++ b/
lib/error.c
@@
-1,5
+1,5
@@
/* Error handler for noninteractive utilities
/* Error handler for noninteractive utilities
- Copyright (C) 1990-1998, 2000-2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1990-1998, 2000-2002, 2003
, 2004
Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
@@
-40,7
+40,7
@@
# define mbsrtowcs __mbsrtowcs
#endif
# define mbsrtowcs __mbsrtowcs
#endif
-#if
!_LIBC
+#if
USE_UNLOCKED_IO
# include "unlocked-io.h"
#endif
# include "unlocked-io.h"
#endif
@@
-106,7
+106,7
@@
extern char *program_name;
static void
print_errno_message (int errnum)
{
static void
print_errno_message (int errnum)
{
- char const *s;
+ char const *s
= NULL
;
#if defined HAVE_STRERROR_R || _LIBC
char errbuf[1024];
#if defined HAVE_STRERROR_R || _LIBC
char errbuf[1024];
@@
-115,15
+115,11
@@
print_errno_message (int errnum)
# else
if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0)
s = errbuf;
# else
if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0)
s = errbuf;
- else
- s = 0;
# endif
# endif
-#else
- s = strerror (errnum);
#endif
#if !_LIBC
#endif
#if !_LIBC
- if (! s)
+ if (! s
&& ! (s = strerror (errnum))
)
s = _("Unknown system error");
#endif
s = _("Unknown system error");
#endif