[commit] init_breakpoint_sal: Add quotes around part of command in error message

Joel Brobecker
2012-05-15T16:45:59Z

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 <brobecker@adacore.com>

+ * breakpoint.c (init_breakpoint_sal): Add quotes around part
+ of command in two error message.
+
+2012-05-15 Joel Brobecker <brobecker@adacore.com>
+
* breakpoint.c (init_breakpoint_sal): Remove trailing spaces.

2012-05-15 Joel Brobecker <brobecker@adacore.com>
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