diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-08-15 05:53:50 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-08-15 05:53:50 +0000 |
| commit | 3a2ba84afba2d9b315c65aa46ba036fd22ef4fb0 (patch) | |
| tree | 47a553a26365a6738426804af7609434daf047b8 /misc | |
| parent | 256926546643ba909661c83e7a7d24d733b9b390 (diff) | |
| download | glibc-3a2ba84afba2d9b315c65aa46ba036fd22ef4fb0.tar glibc-3a2ba84afba2d9b315c65aa46ba036fd22ef4fb0.tar.gz glibc-3a2ba84afba2d9b315c65aa46ba036fd22ef4fb0.tar.bz2 glibc-3a2ba84afba2d9b315c65aa46ba036fd22ef4fb0.zip | |
Updated to fedora-glibc-20060815T0533
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/error.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/misc/error.c b/misc/error.c index 66a8ccb501..aca435d995 100644 --- a/misc/error.c +++ b/misc/error.c @@ -1,5 +1,5 @@ /* Error handler for noninteractive utilities - Copyright (C) 1990-1998, 2000-2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1990-1998, 2000-2005, 2006 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 @@ -224,7 +224,10 @@ error_tail (int status, int errnum, const char *message, va_list args) { /* The string cannot be converted. */ if (use_malloc) - free (wmessage); + { + free (wmessage); + use_malloc = false; + } wmessage = (wchar_t *) L"???"; } @@ -382,14 +385,13 @@ error_at_line (status, errnum, file_name, line_number, message, va_alist) #endif } - if (file_name != NULL) - { #if _LIBC - __fxprintf (NULL, "%s:%d: ", file_name, line_number); + __fxprintf (NULL, file_name != NULL ? "%s:%d: " : " ", + file_name, line_number); #else - fprintf (stderr, "%s:%d: ", file_name, line_number); + fprintf (stderr, file_name != NULL ? "%s:%d: " : " ", + file_name, line_number); #endif - } #ifdef VA_START VA_START (args, message); |