Re: typo in error module

[Eric Blake]

Paul Eggert <eggert <at> CS.UCLA.EDU> writes:

> 
> Eric Blake <ebb9 <at> byu.net> writes:
> 
> > Meanwhile, is this patch acceptable, which updates the _LIBC
> > portions of the error module to resemble CVS glibc more closely, so
> > that I have fewer spurious diffs to filter through?
> 
> Yes, and thanks for doing some of this (normally-thankless) task.
> 
> 

Upstream bugs 2997 and 2998 have been resolved; committing this port to gnulib 
(I already fixed 2998 in the same manner earlier, so this is just Ulrich's fix 
to 2997).  Time for me to write some more upstream bugs on error.c, now that 
I've got my feet wet with the first two successfully addressed.

2006-08-12  Ulrich Drepper  <address@hidden>

        * misc/error.c: Add space between program name and message if file
        name is missing.  Upstream bug 2997.


Index: lib/error.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/error.c,v
retrieving revision 1.44
diff -u -r1.44 error.c
--- lib/error.c 6 Aug 2006 12:36:48 -0000       1.44
+++ lib/error.c 14 Aug 2006 15:52:20 -0000
@@ -310,14 +310,13 @@
 #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
-    }
 
   va_start (args, message);
   error_tail (status, errnum, message, args);