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.
+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.
+
2017-09-11 Tom Tromey <tom@tromey.com>
* language.h (language_enum): Make argument const.
gdb_signal signal_number;
char *endptr;
- gdb::unique_xmalloc_ptr<char> one_arg (extract_arg (&arg));
- if (one_arg == NULL)
+ std::string one_arg = extract_arg (&arg);
+ if (one_arg.empty ())
break;
/* Check for the special flag "all". */
- if (strcmp (one_arg.get (), "all") == 0)
+ if (one_arg == "all")
{
arg = skip_spaces (arg);
if (*arg != '\0' || !first)
first = false;
/* Check if the user provided a signal name or a number. */
- num = (int) strtol (one_arg.get (), &endptr, 0);
+ num = (int) strtol (one_arg.c_str (), &endptr, 0);
if (*endptr == '\0')
signal_number = gdb_signal_from_command (num);
else
{
- signal_number = gdb_signal_from_name (one_arg.get ());
+ signal_number = gdb_signal_from_name (one_arg.c_str ());
if (signal_number == GDB_SIGNAL_UNKNOWN)
- error (_("Unknown signal name '%s'."), one_arg.get ());
+ error (_("Unknown signal name '%s'."), one_arg.c_str ());
}
result.push_back (signal_number);
}
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)
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);
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;
}
}
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)
{
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);
}
}
}
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)
{
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);
}
}
/* See documentation in cli-utils.h. */
-char *
+std::string
extract_arg (const char **arg)
{
const char *result;
if (!*arg)
- return NULL;
+ return std::string ();
/* Find the start of the argument. */
*arg = skip_spaces (*arg);
if (!**arg)
- return NULL;
+ return std::string ();
result = *arg;
/* Find the end of the argument. */
*arg = skip_to_space (*arg + 1);
if (result == *arg)
- return NULL;
+ return std::string ();
- return savestring (result, *arg - result);
+ return std::string (result, *arg - result);
}
/* See documentation in cli-utils.h. */
-char *
+std::string
extract_arg (char **arg)
{
const char *arg_const = *arg;
- char *result;
+ std::string result;
result = extract_arg (&arg_const);
*arg += arg_const - *arg;
}
/* A helper function to extract an argument from *ARG. An argument is
- delimited by whitespace. The return value is either NULL if no
- argument was found, or an xmalloc'd string. */
+ delimited by whitespace. The return value is empty if no argument
+ was found. */
-extern char *extract_arg (char **arg);
+extern std::string extract_arg (char **arg);
-/* A const-correct version of the above.
+/* A const-correct version of the above. */
- Since the returned value is xmalloc'd, it eventually needs to be
- xfree'ed, which prevents us from making it const as well. */
-
-extern char *extract_arg (const char **arg);
+extern std::string extract_arg (const char **arg);
/* A helper function that looks for an argument at the start of a
string. The argument must also either be at the end of the string,
std::string arg_buf = args != NULL ? args : "";
arg_start = arg_buf.c_str ();
- gdb::unique_xmalloc_ptr<char> lang_name;
+ std::string lang_name;
while (processing_args
&& *arg_start == '-')
{
const char *p = skip_to_space (arg_start);
if (strncmp (arg_start, "-l", p - arg_start) == 0)
- lang_name.reset (extract_arg (&p));
+ lang_name = extract_arg (&p);
else if (strncmp (arg_start, "--", p - arg_start) == 0)
processing_args = 0;
else
{
- gdb::unique_xmalloc_ptr<char> option (extract_arg (&p));
+ std::string option = extract_arg (&p);
error (_("Unrecognized option '%s' to demangle command. "
- "Try \"help demangle\"."), option.get ());
+ "Try \"help demangle\"."), option.c_str ());
}
arg_start = skip_spaces (p);
if (*name == '\0')
error (_("Usage: demangle [-l language] [--] name"));
- if (lang_name != NULL)
+ if (!lang_name.empty ())
{
enum language lang_enum;
- lang_enum = language_enum (lang_name.get ());
+ lang_enum = language_enum (lang_name.c_str ());
if (lang_enum == language_unknown)
- error (_("Unknown language \"%s\""), lang_name.get ());
+ error (_("Unknown language \"%s\""), lang_name.c_str ());
lang = language_def (lang_enum);
}
else
}
else if (strncmp (chp, "--language ", ls) == 0)
{
- char *lang_name;
- struct cleanup *old_chain;
-
option = "--language";
chp += ls;
- lang_name = extract_arg (&chp);
- old_chain = make_cleanup (xfree, lang_name);
+ std::string lang_name = extract_arg (&chp);
- parse->language = language_enum (lang_name);
+ parse->language = language_enum (lang_name.c_str ());
if (parse->language == language_unknown
|| parse->language == language_auto)
- error (_("Invalid --language argument: %s"), lang_name);
-
- do_cleanups (old_chain);
+ error (_("Invalid --language argument: %s"), lang_name.c_str ());
}
else
break;
Each argument is a regexp, or NULL, which matches anything. */
static VEC (bound_probe_s) *
-collect_probes (char *objname, char *provider, char *probe_name,
- const struct probe_ops *pops)
+collect_probes (const std::string &objname, const std::string &provider,
+ const std::string &probe_name, const struct probe_ops *pops)
{
struct objfile *objfile;
VEC (bound_probe_s) *result = NULL;
cleanup = make_cleanup (VEC_cleanup (bound_probe_s), &result);
- if (provider != NULL)
- prov_pat.emplace (provider, REG_NOSUB, _("Invalid provider regexp"));
- if (probe_name != NULL)
- probe_pat.emplace (probe_name, REG_NOSUB, _("Invalid probe regexp"));
- if (objname != NULL)
- obj_pat.emplace (objname, REG_NOSUB, _("Invalid object file regexp"));
+ if (!provider.empty ())
+ prov_pat.emplace (provider.c_str (), REG_NOSUB,
+ _("Invalid provider regexp"));
+ if (!probe_name.empty ())
+ probe_pat.emplace (probe_name.c_str (), REG_NOSUB,
+ _("Invalid probe regexp"));
+ if (!objname.empty ())
+ obj_pat.emplace (objname.c_str (), REG_NOSUB,
+ _("Invalid object file regexp"));
ALL_OBJFILES (objfile)
{
if (! objfile->sf || ! objfile->sf->sym_probe_fns)
continue;
- if (objname)
+ if (obj_pat)
{
if (obj_pat->exec (objfile_name (objfile), 0, NULL, 0) != 0)
continue;
if (pops != NULL && probe->pops != pops)
continue;
- if (provider
+ if (prov_pat
&& prov_pat->exec (probe->provider, 0, NULL, 0) != 0)
continue;
- if (probe_name
+ if (probe_pat
&& probe_pat->exec (probe->name, 0, NULL, 0) != 0)
continue;
[PROBE [OBJNAME]]] from the provided string STR. */
static void
-parse_probe_linespec (const char *str, char **provider,
- char **probe_name, char **objname)
+parse_probe_linespec (const char *str, std::string *provider,
+ std::string *probe_name, std::string *objname)
{
- *probe_name = *objname = NULL;
+ *probe_name = *objname = "";
*provider = extract_arg (&str);
- if (*provider != NULL)
+ if (!provider->empty ())
{
*probe_name = extract_arg (&str);
- if (*probe_name != NULL)
+ if (!probe_name->empty ())
*objname = extract_arg (&str);
}
}
info_probes_for_ops (const char *arg, int from_tty,
const struct probe_ops *pops)
{
- char *provider, *probe_name = NULL, *objname = NULL;
+ std::string provider, probe_name, objname;
struct cleanup *cleanup = make_cleanup (null_cleanup, NULL);
VEC (bound_probe_s) *probes;
int i, any_found;
struct gdbarch *gdbarch = get_current_arch ();
parse_probe_linespec (arg, &provider, &probe_name, &objname);
- make_cleanup (xfree, provider);
- make_cleanup (xfree, probe_name);
- make_cleanup (xfree, objname);
probes = collect_probes (objname, provider, probe_name, pops);
make_cleanup (VEC_cleanup (probe_p), &probes);
static void
enable_probes_command (char *arg, int from_tty)
{
- char *provider, *probe_name = NULL, *objname = NULL;
+ std::string provider, probe_name, objname;
struct cleanup *cleanup = make_cleanup (null_cleanup, NULL);
VEC (bound_probe_s) *probes;
struct bound_probe *probe;
int i;
parse_probe_linespec ((const char *) arg, &provider, &probe_name, &objname);
- make_cleanup (xfree, provider);
- make_cleanup (xfree, probe_name);
- make_cleanup (xfree, objname);
probes = collect_probes (objname, provider, probe_name, NULL);
if (VEC_empty (bound_probe_s, probes))
static void
disable_probes_command (char *arg, int from_tty)
{
- char *provider, *probe_name = NULL, *objname = NULL;
+ std::string provider, probe_name, objname;
struct cleanup *cleanup = make_cleanup (null_cleanup, NULL);
VEC (bound_probe_s) *probes;
struct bound_probe *probe;
int i;
parse_probe_linespec ((const char *) arg, &provider, &probe_name, &objname);
- make_cleanup (xfree, provider);
- make_cleanup (xfree, probe_name);
- make_cleanup (xfree, objname);
probes = collect_probes (objname, provider, probe_name, NULL /* pops */);
if (VEC_empty (bound_probe_s, probes))
+2017-09-11 Tom Tromey <tom@tromey.com>
+
+ * gdb.base/ena-dis-br.exp (test_ena_dis_br): Update test.
+
2017-09-11 Tom Tromey <tom@tromey.com>
* gdb.python/py-infthread.exp: Add tests for new_thread event.
# Now enable(disable) $b1 fooo.1, it should give error on fooo.
gdb_test "$what $b1 fooo.1" \
- "Bad breakpoint number 'fooo'" \
+ "Bad breakpoint number 'fooo\\.1'" \
"$what \$b1 fooo.1"
# $b1 should be enabled(disabled).
projects / thirdparty / binutils-gdb.git / commitdiff
