aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gdb/ChangeLog27
-rw-r--r--gdb/ada-lang.c3
-rw-r--r--gdb/breakpoint.c5
-rw-r--r--gdb/cli/cli-dump.c2
-rw-r--r--gdb/common/filestuff.c2
-rw-r--r--gdb/common/gdb_tilde_expand.c2
-rw-r--r--gdb/common/gdb_unique_ptr.h8
-rw-r--r--gdb/common/pathstuff.c8
-rw-r--r--gdb/compile/compile-cplus-types.c2
-rw-r--r--gdb/completer.c19
-rw-r--r--gdb/cp-support.c2
-rw-r--r--gdb/fbsd-tdep.c2
-rw-r--r--gdb/gdbserver/ChangeLog4
-rw-r--r--gdb/gdbserver/server.c2
-rw-r--r--gdb/guile/scm-safe-call.c2
-rw-r--r--gdb/infcmd.c2
-rw-r--r--gdb/linespec.c2
-rw-r--r--gdb/mi/mi-main.c2
-rw-r--r--gdb/psymtab.c2
-rw-r--r--gdb/symfile.c2
-rw-r--r--gdb/target.c2
-rw-r--r--gdb/tui/tui-regs.c2
-rw-r--r--gdb/value.c6
23 files changed, 65 insertions, 45 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e36eae9..7947568 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,30 @@
+2019-06-04 Pedro Alves <palves@redhat.com>
+
+ * common/gdb_unique_ptr.h (make_unique_xstrdup): New.
+
+ * ada-lang.c (catch_ada_completer): Use make_unique_xstrdup.
+ * breakpoint.c (condition_completer): Likewise.
+ * cli/cli-dump.c (scan_expression): Likewise.
+ * common/filestuff.c (mkdir_recursive): Likewise.
+ * common/gdb_tilde_expand.c (gdb_tilde_expand_up)
+ * common/pathstuff.c (gdb_realpath, gdb_realpath_keepfile)
+ (gdb_abspath): Likewise.
+ * compile/compile-cplus-types.c
+ (compile_cplus_instance::decl_name): Likewise.
+ * completer.c (complete_explicit_location):
+ (signal_completer, reg_or_group_completer_1): Likewise.
+ * cp-support.c (cp_remove_params_if_any): Likewise.
+ * fbsd-tdep.c (fbsd_core_vnode_path): Likewise.
+ * guile/scm-safe-call.c (gdbscm_safe_eval_string): Likewise.
+ * infcmd.c (strip_bg_char): Likewise.
+ * linespec.c (copy_token_string): Likewise.
+ * mi/mi-main.c (output_cores): Likewise.
+ * psymtab.c (psymtab_search_name):
+ * symfile.c (test_set_ext_lang_command): Likewise.
+ * target.c (target_fileio_read_stralloc): Likewise.
+ * tui/tui-regs.c (tui_reggroup_completer): Likewise.
+ * value.c (complete_internalvar): Likewise.
+
2019-06-04 Christian Biesinger <cbiesinger@google.com>
Add objfile property to gdb.Type.
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 99c099a..22c51fb 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -13195,8 +13195,7 @@ catch_ada_completer (struct cmd_list_element *cmd, completion_tracker &tracker,
for (const ada_exc_info &info : exceptions)
{
if (startswith (info.name, word))
- tracker.add_completion
- (gdb::unique_xmalloc_ptr<char> (xstrdup (info.name)));
+ tracker.add_completion (make_unique_xstrdup (info.name));
}
}
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 054bb1b..ae3dcc0 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -941,10 +941,7 @@ condition_completer (struct cmd_list_element *cmd,
xsnprintf (number, sizeof (number), "%d", b->number);
if (strncmp (number, text, len) == 0)
- {
- gdb::unique_xmalloc_ptr<char> copy (xstrdup (number));
- tracker.add_completion (std::move (copy));
- }
+ tracker.add_completion (make_unique_xstrdup (number));
}
return;
diff --git a/gdb/cli/cli-dump.c b/gdb/cli/cli-dump.c
index 8f0d8bf..621bc93 100644
--- a/gdb/cli/cli-dump.c
+++ b/gdb/cli/cli-dump.c
@@ -37,7 +37,7 @@ static gdb::unique_xmalloc_ptr<char>
scan_expression (const char **cmd, const char *def)
{
if ((*cmd) == NULL || (**cmd) == '\0')
- return gdb::unique_xmalloc_ptr<char> (xstrdup (def));
+ return make_unique_xstrdup (def);
else
{
char *exp;
diff --git a/gdb/common/filestuff.c b/gdb/common/filestuff.c
index 1ca6248..c7b8c69 100644
--- a/gdb/common/filestuff.c
+++ b/gdb/common/filestuff.c
@@ -462,7 +462,7 @@ is_regular_file (const char *name, int *errno_ptr)
bool
mkdir_recursive (const char *dir)
{
- gdb::unique_xmalloc_ptr<char> holder (xstrdup (dir));
+ auto holder = make_unique_xstrdup (dir);
char * const start = holder.get ();
char *component_start = start;
char *component_end = start;
diff --git a/gdb/common/gdb_tilde_expand.c b/gdb/common/gdb_tilde_expand.c
index fc338ff..326df8f 100644
--- a/gdb/common/gdb_tilde_expand.c
+++ b/gdb/common/gdb_tilde_expand.c
@@ -91,5 +91,5 @@ gdb_tilde_expand_up (const char *dir)
gdb_assert (glob.pathc () > 0);
/* "glob" may return more than one match to the path provided by the
user, but we are only interested in the first match. */
- return gdb::unique_xmalloc_ptr<char> (xstrdup (glob.pathv ()[0]));
+ return make_unique_xstrdup (glob.pathv ()[0]);
}
diff --git a/gdb/common/gdb_unique_ptr.h b/gdb/common/gdb_unique_ptr.h
index a4be2bb..67a5f26 100644
--- a/gdb/common/gdb_unique_ptr.h
+++ b/gdb/common/gdb_unique_ptr.h
@@ -56,4 +56,12 @@ struct noop_deleter
} /* namespace gdb */
+/* Dup STR and return a unique_xmalloc_ptr for the result. */
+
+static inline gdb::unique_xmalloc_ptr<char>
+make_unique_xstrdup (const char *str)
+{
+ return gdb::unique_xmalloc_ptr<char> (xstrdup (str));
+}
+
#endif /* COMMON_GDB_UNIQUE_PTR_H */
diff --git a/gdb/common/pathstuff.c b/gdb/common/pathstuff.c
index 2b1669a..e0e048d 100644
--- a/gdb/common/pathstuff.c
+++ b/gdb/common/pathstuff.c
@@ -65,7 +65,7 @@ gdb_realpath (const char *filename)
we might not be able to display the original casing in a given
path. */
if (len > 0 && len < MAX_PATH)
- return gdb::unique_xmalloc_ptr<char> (xstrdup (buf));
+ return make_unique_xstrdup (buf);
}
#else
{
@@ -77,7 +77,7 @@ gdb_realpath (const char *filename)
#endif
/* This system is a lost cause, just dup the buffer. */
- return gdb::unique_xmalloc_ptr<char> (xstrdup (filename));
+ return make_unique_xstrdup (filename);
}
/* See common/pathstuff.h. */
@@ -92,7 +92,7 @@ gdb_realpath_keepfile (const char *filename)
/* Extract the basename of filename, and return immediately
a copy of filename if it does not contain any directory prefix. */
if (base_name == filename)
- return gdb::unique_xmalloc_ptr<char> (xstrdup (filename));
+ return make_unique_xstrdup (filename);
dir_name = (char *) alloca ((size_t) (base_name - filename + 2));
/* Allocate enough space to store the dir_name + plus one extra
@@ -135,7 +135,7 @@ gdb_abspath (const char *path)
return gdb_tilde_expand_up (path);
if (IS_ABSOLUTE_PATH (path))
- return gdb::unique_xmalloc_ptr<char> (xstrdup (path));
+ return make_unique_xstrdup (path);
/* Beware the // my son, the Emacs barfs, the botch that catch... */
return gdb::unique_xmalloc_ptr<char>
diff --git a/gdb/compile/compile-cplus-types.c b/gdb/compile/compile-cplus-types.c
index 6923930..d7aef26 100644
--- a/gdb/compile/compile-cplus-types.c
+++ b/gdb/compile/compile-cplus-types.c
@@ -65,7 +65,7 @@ compile_cplus_instance::decl_name (const char *natural)
if (name != nullptr)
return name;
- return gdb::unique_xmalloc_ptr<char> (xstrdup (natural));
+ return make_unique_xstrdup (natural);
}
/* Get the access flag for the NUM'th field of TYPE. */
diff --git a/gdb/completer.c b/gdb/completer.c
index 24c8446..d4773f2 100644
--- a/gdb/completer.c
+++ b/gdb/completer.c
@@ -798,9 +798,7 @@ complete_explicit_location (completion_tracker &tracker,
before: "b -function 'not_loaded_function_yet()'"
after: "b -function 'not_loaded_function_yet()' "
*/
- gdb::unique_xmalloc_ptr<char> text_copy
- (xstrdup (text));
- tracker.add_completion (std::move (text_copy));
+ tracker.add_completion (make_unique_xstrdup (text));
}
else if (quoted_arg_end[1] == ' ')
{
@@ -1723,10 +1721,7 @@ signal_completer (struct cmd_list_element *ignore,
continue;
if (strncasecmp (signame, word, len) == 0)
- {
- gdb::unique_xmalloc_ptr<char> copy (xstrdup (signame));
- tracker.add_completion (std::move (copy));
- }
+ tracker.add_completion (make_unique_xstrdup (signame));
}
}
@@ -1765,10 +1760,7 @@ reg_or_group_completer_1 (completion_tracker &tracker,
i++)
{
if (*name != '\0' && strncmp (word, name, len) == 0)
- {
- gdb::unique_xmalloc_ptr<char> copy (xstrdup (name));
- tracker.add_completion (std::move (copy));
- }
+ tracker.add_completion (make_unique_xstrdup (name));
}
}
@@ -1782,10 +1774,7 @@ reg_or_group_completer_1 (completion_tracker &tracker,
{
name = reggroup_name (group);
if (strncmp (word, name, len) == 0)
- {
- gdb::unique_xmalloc_ptr<char> copy (xstrdup (name));
- tracker.add_completion (std::move (copy));
- }
+ tracker.add_completion (make_unique_xstrdup (name));
}
}
}
diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index 4afb79a..9ba6ee3 100644
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -908,7 +908,7 @@ cp_remove_params_if_any (const char *demangled_name, bool completion_mode)
we're completing / matching everything, avoid returning NULL
which would make callers interpret the result as an error. */
if (demangled_name[0] == '\0' && completion_mode)
- return gdb::unique_xmalloc_ptr<char> (xstrdup (""));
+ return make_unique_xstrdup ("");
gdb::unique_xmalloc_ptr<char> without_params
= cp_remove_params_1 (demangled_name, false);
diff --git a/gdb/fbsd-tdep.c b/gdb/fbsd-tdep.c
index cc7c2b7..e81c6c9 100644
--- a/gdb/fbsd-tdep.c
+++ b/gdb/fbsd-tdep.c
@@ -1266,7 +1266,7 @@ fbsd_core_vnode_path (struct gdbarch *gdbarch, int fd)
&& bfd_get_signed_32 (core_bfd, descdata + KF_FD) == fd)
{
char *path = (char *) descdata + KF_PATH;
- return gdb::unique_xmalloc_ptr<char> (xstrdup (path));
+ return make_unique_xstrdup (path);
}
descdata += structsize;
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index a769b15..bc554bd 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2019-06-04 Pedro Alves <palves@redhat.com>
+
+ * server.c (captured_main): Use make_unique_xstrdup.
+
2019-06-02 Tom Tromey <tom@tromey.com>
* gdbreplay.c (fromhex): Remove.
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index fae5b24..5e93a58 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -3802,7 +3802,7 @@ captured_main (int argc, char *argv[])
int i, n;
n = argc - (next_arg - argv);
- program_path.set (gdb::unique_xmalloc_ptr<char> (xstrdup (next_arg[0])));
+ program_path.set (make_unique_xstrdup (next_arg[0]));
for (i = 1; i < n; i++)
program_args.push_back (xstrdup (next_arg[i]));
program_args.push_back (NULL);
diff --git a/gdb/guile/scm-safe-call.c b/gdb/guile/scm-safe-call.c
index 86e3bbc..14eace5 100644
--- a/gdb/guile/scm-safe-call.c
+++ b/gdb/guile/scm-safe-call.c
@@ -404,7 +404,7 @@ gdbscm_safe_eval_string (const char *string, int display_result)
result = gdbscm_with_guile (scscm_eval_scheme_string, (void *) &data);
if (result != NULL)
- return gdb::unique_xmalloc_ptr<char> (xstrdup (result));
+ return make_unique_xstrdup (result);
return NULL;
}
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 1dfbe23..00b55c8 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -421,7 +421,7 @@ strip_bg_char (const char *args, int *bg_char_p)
}
*bg_char_p = 0;
- return gdb::unique_xmalloc_ptr<char> (xstrdup (args));
+ return make_unique_xstrdup (args);
}
/* Common actions to take after creating any sort of inferior, by any
diff --git a/gdb/linespec.c b/gdb/linespec.c
index f418e03..f0afe1b 100644
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -555,7 +555,7 @@ copy_token_string (linespec_token token)
const char *str, *s;
if (token.type == LSTOKEN_KEYWORD)
- return gdb::unique_xmalloc_ptr<char> (xstrdup (LS_TOKEN_KEYWORD (token)));
+ return make_unique_xstrdup (LS_TOKEN_KEYWORD (token));
str = LS_TOKEN_STOKEN (token).ptr;
s = remove_trailing_whitespace (str, str + LS_TOKEN_STOKEN (token).length);
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 4921c13..13c310d 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -695,7 +695,7 @@ static void
output_cores (struct ui_out *uiout, const char *field_name, const char *xcores)
{
ui_out_emit_list list_emitter (uiout, field_name);
- gdb::unique_xmalloc_ptr<char> cores (xstrdup (xcores));
+ auto cores = make_unique_xstrdup (xcores);
char *p = cores.get ();
for (p = strtok (p, ","); p; p = strtok (NULL, ","))
diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index 78a4699..6cc7566 100644
--- a/gdb/psymtab.c
+++ b/gdb/psymtab.c
@@ -647,7 +647,7 @@ psymtab_search_name (const char *name)
break;
}
- return gdb::unique_xmalloc_ptr<char> (xstrdup (name));
+ return make_unique_xstrdup (name);
}
/* Look, in partial_symtab PST, for symbol whose natural name is NAME.
diff --git a/gdb/symfile.c b/gdb/symfile.c
index af99da1..26762d2 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -3877,7 +3877,7 @@ test_set_ext_lang_command ()
SELF_CHECK (lang == language_unknown);
/* Test adding a new extension using the CLI command. */
- gdb::unique_xmalloc_ptr<char> args_holder (xstrdup (".hello rust"));
+ auto args_holder = make_unique_xstrdup (".hello rust");
ext_args = args_holder.get ();
set_ext_lang_command (NULL, 1, NULL);
diff --git a/gdb/target.c b/gdb/target.c
index 752e62b..1c04095 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -3106,7 +3106,7 @@ target_fileio_read_stralloc (struct inferior *inf, const char *filename)
return gdb::unique_xmalloc_ptr<char> (nullptr);
if (transferred == 0)
- return gdb::unique_xmalloc_ptr<char> (xstrdup (""));
+ return make_unique_xstrdup ("");
bufstr[transferred] = 0;
diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index 91b40f5..e6aeedd 100644
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -676,7 +676,7 @@ tui_reggroup_completer (struct cmd_list_element *ignore,
for (tmp = extra; *tmp != NULL; ++tmp)
{
if (strncmp (word, *tmp, len) == 0)
- tracker.add_completion (gdb::unique_xmalloc_ptr<char> (xstrdup (*tmp)));
+ tracker.add_completion (make_unique_xstrdup (*tmp));
}
}
diff --git a/gdb/value.c b/gdb/value.c
index dad9f07..71030ef 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -2014,11 +2014,7 @@ complete_internalvar (completion_tracker &tracker, const char *name)
for (var = internalvars; var; var = var->next)
if (strncmp (var->name, name, len) == 0)
- {
- gdb::unique_xmalloc_ptr<char> copy (xstrdup (var->name));
-
- tracker.add_completion (std::move (copy));
- }
+ tracker.add_completion (make_unique_xstrdup (var->name));
}
/* Create an internal variable with name NAME and with a void value.
generated by cgit v1.1 at 2024-10-15 06:35:06 +0000