From unknown Sun Jun 22 04:26:17 2025 X-Loop: help-debbugs@gnu.org Subject: bug#6270: [PATCH] maint: don't emit an extra newline in each of two diagnostics Resent-From: Jim Meyering Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-coreutils@gnu.org Resent-Date: Tue, 25 May 2010 16:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 6270 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: patch To: 6270@debbugs.gnu.org X-Debbugs-Original-To: bug-coreutils@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.127480404621270 (code B ref -1); Tue, 25 May 2010 16:15:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 May 2010 16:14:06 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OGwla-0005X1-Hr for submit@debbugs.gnu.org; Tue, 25 May 2010 12:14:06 -0400 Received: from mx10.gnu.org ([199.232.76.166]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OGwlY-0005Wf-BI for submit@debbugs.gnu.org; Tue, 25 May 2010 12:14:05 -0400 Received: from lists.gnu.org ([199.232.76.165]:40433) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1OGwlT-0002wv-1j for submit@debbugs.gnu.org; Tue, 25 May 2010 12:13:59 -0400 Received: from [140.186.70.92] (port=44360 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGwlR-0002eR-5j for bug-coreutils@gnu.org; Tue, 25 May 2010 12:13:58 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OGwlP-0002gQ-J2 for bug-coreutils@gnu.org; Tue, 25 May 2010 12:13:56 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:34834) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OGwlP-0002fc-0S for bug-coreutils@gnu.org; Tue, 25 May 2010 12:13:55 -0400 Received: from smtp5-g21.free.fr (localhost [127.0.0.1]) by smtp5-g21.free.fr (Postfix) with ESMTP id 4BF18D48386 for ; Tue, 25 May 2010 18:13:51 +0200 (CEST) Received: from mx.meyering.net (mx.meyering.net [82.230.74.64]) by smtp5-g21.free.fr (Postfix) with ESMTP for ; Tue, 25 May 2010 18:13:50 +0200 (CEST) Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000) id D14F9F305; Tue, 25 May 2010 18:13:43 +0200 (CEST) From: Jim Meyering Date: Tue, 25 May 2010 18:13:43 +0200 Message-ID: <87d3wkot6w.fsf@meyering.net> Lines: 45 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Spam-Score: -5.2 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -5.2 (-----) FYI, >From 5d59808a65dc05c2777afb4b78128ca9db1ea78f Mon Sep 17 00:00:00 2001 From: Jim Meyering 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 From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 03 08:33:56 2010 Received: (at control) by debbugs.gnu.org; 3 Jun 2010 12:33:56 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OK9cS-0004YZ-DY for submit@debbugs.gnu.org; Thu, 03 Jun 2010 08:33:56 -0400 Received: from smtp1-g21.free.fr ([212.27.42.1]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OK9cP-0004YU-JR for control@debbugs.gnu.org; Thu, 03 Jun 2010 08:33:54 -0400 Received: from mx.meyering.net (mx.meyering.net [82.230.74.64]) by smtp1-g21.free.fr (Postfix) with ESMTP id C7C53940114 for ; Thu, 3 Jun 2010 14:33:43 +0200 (CEST) Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000) id 040A9DE32; Thu, 3 Jun 2010 14:33:42 +0200 (CEST) From: Jim Meyering To: control@debbugs.gnu.org Subject: control In-Reply-To: <87d3wkot6w.fsf@meyering.net> (Jim Meyering's message of "Tue, 25 May 2010 18:13:43 +0200") References: <87d3wkot6w.fsf@meyering.net> Date: Thu, 03 Jun 2010 14:33:41 +0200 Message-ID: <87ljaw70t6.fsf@meyering.net> Lines: 7 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.3 (--) close 6270 close 6169 close 6317 close 6329 close 6293 tags 5962 + wishlist