Subject: bug#6270: [PATCH] maint: don't emit an extra newline in each of two diagnostics

From: Jim Meyering <[email-masked]>
Date: Tue, 25 May 2010 18:13:43 +0200

FYI,

>From 5d59808a65dc05c2777afb4b78128ca9db1ea78f Mon Sep 17 00:00:00 2001
From: Jim Meyering <[email-masked]>
Date: Tue, 25 May 2010 18:05:29 +0200
Subject: [PATCH] maint: don't emit an extra newline in each of two diagnostics

* src/shuf.c (main): Remove a stray newline in a diagnostic.
* src/od.c (main): Likewise.
Detected via these:
  git grep -A1 'error *(.*,$' | grep -C1 '\\n"[,)]'
  git grep 'error *(.*;$' | grep '\\n"[,)]'
---
 src/od.c   |    2 +-
 src/shuf.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/od.c b/src/od.c
index 964552d..4508725 100644
--- a/src/od.c
+++ b/src/od.c
@@ -1800,7 +1800,7 @@ it must be one character from [doxn]"),
       if (traditional && 1 < n_files)
         {
           error (0, 0, _("extra operand %s"), quote (argv[optind + 1]));
-          error (0, 0, "%s\n",
+          error (0, 0, "%s",
                  _("compatibility mode supports at most one file"));
           usage (EXIT_FAILURE);
         }
diff --git a/src/shuf.c b/src/shuf.c
index 4f4ca1c..67b19af 100644
--- a/src/shuf.c
+++ b/src/shuf.c
@@ -355,7 +355,7 @@ main (int argc, char **argv)
     {
       if (n_operands)
         {
-          error (0, 0, _("extra operand %s\n"), quote (operand[0]));
+          error (0, 0, _("extra operand %s"), quote (operand[0]));
           usage (EXIT_FAILURE);
         }
       n_lines = hi_input - lo_input + 1;
--
1.7.1.342.g1c280