diff options
| author | tjr <tjr@FreeBSD.org> | 2004-08-12 05:37:46 +0000 |
|---|---|---|
| committer | tjr <tjr@FreeBSD.org> | 2004-08-12 05:37:46 +0000 |
| commit | fa48dfef0cb1aca5ea3aeb98ace78860f6b469dd (patch) | |
| tree | 23c9b7d281c9e44de15af3669e2f834a4091648c /contrib/gnu-sort/lib/error.c | |
| parent | 6a255763d78e0631ac9bd2df5f8e4f662a5d17a7 (diff) | |
| parent | a20bc469ca40f5ef5bfdb2a722a731356c0b3c88 (diff) | |
| download | FreeBSD-src-fa48dfef0cb1aca5ea3aeb98ace78860f6b469dd.zip FreeBSD-src-fa48dfef0cb1aca5ea3aeb98ace78860f6b469dd.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r133543,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/gnu-sort/lib/error.c')
| -rw-r--r-- | contrib/gnu-sort/lib/error.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/contrib/gnu-sort/lib/error.c b/contrib/gnu-sort/lib/error.c index 1149235..5a5e126 100644 --- a/contrib/gnu-sort/lib/error.c +++ b/contrib/gnu-sort/lib/error.c @@ -1,5 +1,5 @@ /* 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 @@ -106,7 +106,7 @@ extern char *program_name; static void print_errno_message (int errnum) { - char const *s; + char const *s = NULL; #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 - s = 0; # endif -#else - s = strerror (errnum); #endif #if !_LIBC - if (! s) + if (! s && ! (s = strerror (errnum))) s = _("Unknown system error"); #endif |
