From: Jim Meyering <jim@meyering.net>
Date: Tue, 25 Jun 1996 03:41:29 +0000 (+0000)
Subject: (dc_parse_stream): Remove spurious newline in error message.
X-Git-Tag: TEXTUTILS-1_18a~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=408a47499efb5da42c1c3ac829f6e9e73284e9ea;p=thirdparty%2Fcoreutils.git

(dc_parse_stream): Remove spurious newline in error message.
(dc_parse_file): Remove erroneous test of ERR.
---

diff --git a/src/dircolors.c b/src/dircolors.c
index e4d5380890..b2b4096864 100644
--- a/src/dircolors.c
+++ b/src/dircolors.c
@@ -1,3 +1,4 @@
+/* FIXME: why no error for BERM?  */
 /* FIXME: dircolors - parse a Slackware-style DIR_COLORS file.
    Copyright (C) 1994, 1995 H. Peter Anvin
    Copyright (C) 1996 Free Software Foundation, Inc.
@@ -325,7 +326,7 @@ dc_parse_stream (FILE *fp, const char *filename, char **result)
 		    }
 		  else
 		    {
-		      error (0, 0, _("%s:%lu: unrecognized keyword %s\n"),
+		      error (0, 0, _("%s:%lu: unrecognized keyword %s"),
 			     filename, (long unsigned) line_number, keywd);
 		      err = 1;
 		    }
@@ -366,13 +367,6 @@ dc_parse_file (const char *filename, char **ls_color_string)
     }
 
   err = dc_parse_stream (fp, filename, ls_color_string);
-  if (err)
-    {
-      error (0, errno, "%s", filename);
-      if (fp != stdin)
-	fclose (fp);
-      return 1;
-    }
 
   if (fp != stdin && fclose (fp) == EOF)
     {
@@ -380,7 +374,7 @@ dc_parse_file (const char *filename, char **ls_color_string)
       return 1;
     }
 
-  return 0;
+  return err;
 }
 
 int