OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix complaint string formatting on stap-probe.c 

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.
This commit is contained in:
Sergio Durigan Junior 2019-05-16 16:20:39 -04:00
parent f1bb75ab2a
commit f3da911665
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -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> 2019-05-16 Sergio Durigan Junior <sergiodj@redhat.com>
* stap-probe.c (stap_parse_register_operand): Make "if (*p->arg == * stap-probe.c (stap_parse_register_operand): Make "if (*p->arg ==

13
gdb/stap-probe.c
View File

@ -1512,12 +1512,11 @@ handle_stap_probe (struct objfile *objfile, struct sdt_note *el,
/* Making sure there is a name. */ /* Making sure there is a name. */
if (name == NULL) if (name == NULL)
{ {
complaint (_("corrupt probe name when " complaint (_("corrupt probe name when reading `%s'"),
"reading `%s'"),
objfile_name (objfile)); objfile_name (objfile));
/* There is no way to use a probe without a name or a provider, so /* 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; return;
} }
else 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) || (memchr (probe_args, '\0', (char *) el->data + el->size - name)
!= el->data + el->size - 1)) != el->data + el->size - 1))
{ {
complaint (_("corrupt probe argument when " complaint (_("corrupt probe argument when reading `%s'"),
"reading `%s'"),
objfile_name (objfile)); objfile_name (objfile));
/* If the argument string is NULL, it means some problem happened with /* If the argument string is NULL, it means some problem happened with
it. So we return 0. */ it. So we return. */
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 /* If we are here, it means we have failed to parse every known
probe. */ probe. */
complaint (_("could not parse SystemTap probe(s) " complaint (_("could not parse SystemTap probe(s) from inferior"));
"from inferior"));
return; return;
} }
} }