static int
breakpoint_hit_catch_syscall (const struct bp_location *bl,
- struct address_space *aspace, CORE_ADDR bp_addr,
+ const address_space *aspace, CORE_ADDR bp_addr,
const struct target_waitstatus *ws)
{
/* We must check if we are catching specific syscalls in this
create_syscall_event_catchpoint (int tempflag, std::vector<int> &&filter,
const struct breakpoint_ops *ops)
{
- struct syscall_catchpoint *c;
struct gdbarch *gdbarch = get_current_arch ();
- c = new syscall_catchpoint ();
- init_catchpoint (c, gdbarch, tempflag, NULL, ops);
- c->syscalls_to_be_caught = filter;
+ std::unique_ptr<syscall_catchpoint> c (new syscall_catchpoint ());
+ init_catchpoint (c.get (), gdbarch, tempflag, NULL, ops);
+ c->syscalls_to_be_caught = std::move (filter);
- install_breakpoint (0, c, 1);
+ install_breakpoint (0, std::move (c), 1);
}
/* Splits the argument using space as delimiter. */
static std::vector<int>
-catch_syscall_split_args (char *arg)
+catch_syscall_split_args (const char *arg)
{
std::vector<int> result;
struct gdbarch *gdbarch = target_gdbarch ();
/* Implement the "catch syscall" command. */
static void
-catch_syscall_command_1 (char *arg, int from_tty,
+catch_syscall_command_1 (const char *arg, int from_tty,
struct cmd_list_element *command)
{
int tempflag;
const char *text, const char *word)
{
struct gdbarch *gdbarch = get_current_arch ();
- struct cleanup *cleanups = make_cleanup (null_cleanup, NULL);
- const char **group_list = NULL;
- const char **syscall_list = NULL;
+ gdb::unique_xmalloc_ptr<const char *> group_list;
const char *prefix;
int i;
if (startswith (prefix, "g:") || startswith (prefix, "group:"))
{
/* Perform completion inside 'group:' namespace only. */
- group_list = get_syscall_group_names (gdbarch);
+ group_list.reset (get_syscall_group_names (gdbarch));
if (group_list != NULL)
- complete_on_enum (tracker, group_list, word, word);
+ complete_on_enum (tracker, group_list.get (), word, word);
}
else
{
/* Complete with both, syscall names and groups. */
- syscall_list = get_syscall_names (gdbarch);
- group_list = get_syscall_group_names (gdbarch);
+ gdb::unique_xmalloc_ptr<const char *> syscall_list
+ (get_syscall_names (gdbarch));
+ group_list.reset (get_syscall_group_names (gdbarch));
+
+ const char **group_ptr = group_list.get ();
+
+ /* Hold on to strings while we're using them. */
+ std::vector<std::string> holders;
/* Append "group:" prefix to syscall groups. */
- for (i = 0; group_list[i] != NULL; i++)
+ for (i = 0; group_ptr[i] != NULL; i++)
{
- char *prefixed_group = xstrprintf ("group:%s", group_list[i]);
+ std::string prefixed_group = string_printf ("group:%s",
+ group_ptr[i]);
- group_list[i] = prefixed_group;
- make_cleanup (xfree, prefixed_group);
+ group_ptr[i] = prefixed_group.c_str ();
+ holders.push_back (std::move (prefixed_group));
}
if (syscall_list != NULL)
- complete_on_enum (tracker, syscall_list, word, word);
+ complete_on_enum (tracker, syscall_list.get (), word, word);
if (group_list != NULL)
- complete_on_enum (tracker, group_list, word, word);
+ complete_on_enum (tracker, group_ptr, word, word);
}
-
- xfree (syscall_list);
- xfree (group_list);
- do_cleanups (cleanups);
}
static void
ops->print_recreate = print_recreate_catch_syscall;
}
-initialize_file_ftype _initialize_break_catch_syscall;
-
void
_initialize_break_catch_syscall (void)
{