From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17625 invoked by alias); 15 May 2012 16:45:59 -0000 Received: (qmail 17616 invoked by uid 22791); 15 May 2012 16:45:58 -0000 X-SWARE-Spam-Status: No, hits=-4.3 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_NO,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 15 May 2012 16:45:33 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id C73871C680C; Tue, 15 May 2012 12:45:32 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id KR1gyfLhh1zf; Tue, 15 May 2012 12:45:32 -0400 (EDT) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id 90B4B1C67C7; Tue, 15 May 2012 12:45:32 -0400 (EDT) Received: by joel.gnat.com (Postfix, from userid 1000) id ECECE145616; Tue, 15 May 2012 09:45:22 -0700 (PDT) From: Joel Brobecker To: gdb-patches@sourceware.org Cc: Joel Brobecker Subject: [commit] init_breakpoint_sal: Add quotes around part of command in error message Date: Tue, 15 May 2012 16:45:00 -0000 Message-Id: <1337100321-32279-1-git-send-email-brobecker@adacore.com> In-Reply-To: <20120515163748.GS10253@adacore.com> References: <20120515163748.GS10253@adacore.com> Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-05/txt/msg00582.txt.bz2 For the record, this is the version I ended up checking in. gdb/ChangeLog: * breakpoint.c (init_breakpoint_sal): Add quotes around part of command in two error message. Tested on x86_64-linux. --- gdb/ChangeLog | 5 +++++ gdb/breakpoint.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c488a2f..2af1f59 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2012-05-15 Joel Brobecker + * breakpoint.c (init_breakpoint_sal): Add quotes around part + of command in two error message. + +2012-05-15 Joel Brobecker + * breakpoint.c (init_breakpoint_sal): Remove trailing spaces. 2012-05-15 Joel Brobecker diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 9eecdf8..1a76754 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -8629,7 +8629,7 @@ init_breakpoint_sal (struct breakpoint *b, struct gdbarch *gdbarch, char *arg = b->cond_string; loc->cond = parse_exp_1 (&arg, block_for_pc (loc->address), 0); if (*arg) - error (_("Garbage %s follows condition"), arg); + error (_("Garbage '%s' follows condition"), arg); } /* Dynamic printf requires and uses additional arguments on the @@ -8642,7 +8642,7 @@ init_breakpoint_sal (struct breakpoint *b, struct gdbarch *gdbarch, error (_("Format string required")); } else if (b->extra_string) - error (_("Garbage %s at end of command"), b->extra_string); + error (_("Garbage '%s' at end of command"), b->extra_string); } b->display_canonical = display_canonical; -- 1.7.1