[FYI 4/5] Fix complaint string formatting on stap-probe.c
Sergio Durigan Junior
sergiodj@redhat.com
Thu May 16 20:41:00 GMT 2019
I think the string formatting for complaints was messed up by Tom's
patch to simplify the complaint mechanism. This small and trivial
patch fixes them.
Pushed as obvious.
gdb/ChangeLog:
2019-05-16 Sergio Durigan Junior <sergiodj@redhat.com>
* stap-probe.c (handle_stap_probe): Fix complaint formatting.
(stap_static_probe_ops::get_probes): Likewise.
---
gdb/ChangeLog | 5 +++++
gdb/stap-probe.c | 13 +++++--------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c89b7039e8..faee99916e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-16 Sergio Durigan Junior <sergiodj@redhat.com>
+
+ * stap-probe.c (handle_stap_probe): Fix complaint formatting.
+ (stap_static_probe_ops::get_probes): Likewise.
+
2019-05-16 Sergio Durigan Junior <sergiodj@redhat.com>
* stap-probe.c (stap_parse_register_operand): Make "if (*p->arg ==
diff --git a/gdb/stap-probe.c b/gdb/stap-probe.c
index db9231558f..5261a1aaa4 100644
--- a/gdb/stap-probe.c
+++ b/gdb/stap-probe.c
@@ -1512,12 +1512,11 @@ handle_stap_probe (struct objfile *objfile, struct sdt_note *el,
/* Making sure there is a name. */
if (name == NULL)
{
- complaint (_("corrupt probe name when "
- "reading `%s'"),
+ complaint (_("corrupt probe name when reading `%s'"),
objfile_name (objfile));
/* There is no way to use a probe without a name or a provider, so
- returning zero here makes sense. */
+ returning here makes sense. */
return;
}
else
@@ -1549,11 +1548,10 @@ handle_stap_probe (struct objfile *objfile, struct sdt_note *el,
|| (memchr (probe_args, '\0', (char *) el->data + el->size - name)
!= el->data + el->size - 1))
{
- complaint (_("corrupt probe argument when "
- "reading `%s'"),
+ complaint (_("corrupt probe argument when reading `%s'"),
objfile_name (objfile));
/* If the argument string is NULL, it means some problem happened with
- it. So we return 0. */
+ it. So we return. */
return;
}
@@ -1661,8 +1659,7 @@ stap_static_probe_ops::get_probes
{
/* If we are here, it means we have failed to parse every known
probe. */
- complaint (_("could not parse SystemTap probe(s) "
- "from inferior"));
+ complaint (_("could not parse SystemTap probe(s) from inferior"));
return;
}
}
--
2.17.2
More information about the Gdb-patches
mailing list