Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-26 01:07:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make extract_arg return a std::string

Browse Source 
Change extract_arg to return a std::string and fix up all the users.
I think string is mildly better than unique_xmalloc_ptr<char>, when
possible, because it provides a more robust API.

I changed the error messages emitted from find_location_by_number to
avoid either writing to a string or an extra allocation; this can be
changed but I thought that the new message was not any less clear.
You can see an example in the testsuite patch.

ChangeLog
2017-09-11  Tom Tromey  <tom@tromey.com>

	* demangle.c (demangle_command): Update.
	* breakpoint.c (disable_command): Update.
	(enable_command): Update.
	(find_location_by_number): Make "number" const.  Use
	get_number_trailer.
	* cli/cli-utils.c (extract_arg): Return std::string.
	* probe.c (parse_probe_linespec): Update.  Change types.
	(collect_probes): Take string arguments.
	(parse_probe_linespec): Likewise.
	(info_probes_for_ops): Update.
	(enable_probes_command): Update.
	(disable_probes_command): Update.
	* break-catch-sig.c (catch_signal_split_args): Update.
	* mi/mi-parse.c (mi_parse): Update.

testsuite/ChangeLog
2017-09-11  Tom Tromey  <tom@tromey.com>

	* gdb.base/ena-dis-br.exp (test_ena_dis_br): Update test.
This commit is contained in:
Tom Tromey
2017-09-10 14:48:30 -06:00
parent 2039bd9f0c
commit cb791d5948
10 changed files with 92 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
gdb/breakpoint.c
View File

@@ -14489,20 +14489,17 @@ map_breakpoint_numbers (const char *args,
}
static struct bp_location *
find_location_by_number (char *number)
find_location_by_number (const char *number)
{
char *dot = strchr (number, '.');
char *p1;
const char *p1;
int bp_num;
int loc_num;
struct breakpoint *b;
struct bp_location *loc;
*dot = '\0';
p1 = number;
bp_num = get_number (&p1);
if (bp_num == 0)
bp_num = get_number_trailer (&p1, '.');
if (bp_num == 0 || p1[0] != '.')
error (_("Bad breakpoint number '%s'"), number);
ALL_BREAKPOINTS (b)
@@ -14514,7 +14511,9 @@ find_location_by_number (char *number)
if (!b || b->number != bp_num)
error (_("Bad breakpoint number '%s'"), number);
p1 = dot+1;
/* Skip the dot. */
++p1;
const char *save = p1;
loc_num = get_number (&p1);
if (loc_num == 0)
error (_("Bad breakpoint location number '%s'"), number);
@@ -14524,7 +14523,7 @@ find_location_by_number (char *number)
for (;loc_num && loc; --loc_num, loc = loc->next)
;
if (!loc)
error (_("Bad breakpoint location number '%s'"), dot+1);
error (_("Bad breakpoint location number '%s'"), save);
return loc;
}
@@ -14592,13 +14591,13 @@ disable_command (char *args, int from_tty)
}
else
{
char *num = extract_arg (&args);
std::string num = extract_arg (&args);
while (num)
while (!num.empty ())
{
if (strchr (num, '.'))
if (num.find ('.') != std::string::npos)
{
struct bp_location *loc = find_location_by_number (num);
struct bp_location *loc = find_location_by_number (num.c_str ());
if (loc)
{
@@ -14615,7 +14614,8 @@ disable_command (char *args, int from_tty)
update_global_location_list (UGLL_DONT_INSERT);
}
else
map_breakpoint_numbers (num, do_map_disable_breakpoint, NULL);
map_breakpoint_numbers (num.c_str (), do_map_disable_breakpoint,
NULL);
num = extract_arg (&args);
}
}
@@ -14723,13 +14723,13 @@ enable_command (char *args, int from_tty)
}
else
{
char *num = extract_arg (&args);
std::string num = extract_arg (&args);
while (num)
while (!num.empty ())
{
if (strchr (num, '.'))
if (num.find ('.') != std::string::npos)
{
struct bp_location *loc = find_location_by_number (num);
struct bp_location *loc = find_location_by_number (num.c_str ());
if (loc)
{
@@ -14746,7 +14746,8 @@ enable_command (char *args, int from_tty)
update_global_location_list (UGLL_MAY_INSERT);
}
else
map_breakpoint_numbers (num, do_map_enable_breakpoint, NULL);
map_breakpoint_numbers (num.c_str (), do_map_enable_breakpoint,
NULL);
num = extract_arg (&args);
}
}