From 4721dc182386f8071324ed3106493cf2797344c1 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Tue, 24 Sep 2013 13:54:42 +0000 Subject: [PATCH] Code cleanup: rename variable gdb/ 2013-09-24 Jan Kratochvil Code cleanup. * probe.c (parse_probes): Rename variable objfile_name to objfile_namestr. --- gdb/ChangeLog | 6 ++++++ gdb/probe.c | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3f3c72012c3..6dbb51d707a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2013-09-24 Jan Kratochvil + + Code cleanup. + * probe.c (parse_probes): Rename variable objfile_name to + objfile_namestr. + 2013-09-24 Jan Kratochvil Remove solib-sunos.c. diff --git a/gdb/probe.c b/gdb/probe.c index c313c38911d..4d8b92b541b 100644 --- a/gdb/probe.c +++ b/gdb/probe.c @@ -41,7 +41,7 @@ struct symtabs_and_lines parse_probes (char **argptr, struct linespec_result *canonical) { char *arg_start, *arg_end, *arg; - char *objfile_name = NULL, *provider = NULL, *name, *p; + char *objfile_namestr = NULL, *provider = NULL, *name, *p; struct cleanup *cleanup; struct symtabs_and_lines result; struct objfile *objfile; @@ -92,7 +92,7 @@ parse_probes (char **argptr, struct linespec_result *canonical) { /* This is `-p objfile:provider:name'. */ *p = '\0'; - objfile_name = arg; + objfile_namestr = arg; provider = hold; name = p + 1; } @@ -102,7 +102,7 @@ parse_probes (char **argptr, struct linespec_result *canonical) error (_("no probe name specified")); if (provider && *provider == '\0') error (_("invalid provider name")); - if (objfile_name && *objfile_name == '\0') + if (objfile_namestr && *objfile_namestr == '\0') error (_("invalid objfile name")); ALL_PSPACES (pspace) @@ -115,9 +115,9 @@ parse_probes (char **argptr, struct linespec_result *canonical) if (!objfile->sf || !objfile->sf->sym_probe_fns) continue; - if (objfile_name - && FILENAME_CMP (objfile->name, objfile_name) != 0 - && FILENAME_CMP (lbasename (objfile->name), objfile_name) != 0) + if (objfile_namestr + && FILENAME_CMP (objfile->name, objfile_namestr) != 0 + && FILENAME_CMP (lbasename (objfile->name), objfile_namestr) != 0) continue; probes = objfile->sf->sym_probe_fns->sym_get_probes (objfile); @@ -155,7 +155,7 @@ parse_probes (char **argptr, struct linespec_result *canonical) { throw_error (NOT_FOUND_ERROR, _("No probe matching objfile=`%s', provider=`%s', name=`%s'"), - objfile_name ? objfile_name : _(""), + objfile_namestr ? objfile_namestr : _(""), provider ? provider : _(""), name); } -- 2.30.2