This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[patchv3 2/5] Code cleanup: rename variable
- From: Jan Kratochvil <jan dot kratochvil at redhat dot com>
- To: gdb-patches at sourceware dot org
- Date: Sun, 15 Sep 2013 21:37:50 +0200
- Subject: [patchv3 2/5] Code cleanup: rename variable
- Authentication-results: sourceware.org; auth=none
Hi,
the variable name was OK but it conflicts with [patch 3/5] where the name is
used as the most appropriate one for a GDB global scope function.
Jan
2013-09-15 Jan Kratochvil <jan.kratochvil@redhat.com>
Code cleanup.
* probe.c (parse_probes): Rename variable objfile_name to
objfile_namestr.
--- 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 : _("<any>"),
+ objfile_namestr ? objfile_namestr : _("<any>"),
provider ? provider : _("<any>"),
name);
}