diff options
author | Andrew Burgess <aburgess@redhat.com> | 2021-11-08 14:58:46 +0000 |
---|---|---|
committer | Andrew Burgess <aburgess@redhat.com> | 2021-11-16 17:45:45 +0000 |
commit | 8579fd136a614985bd27f20539c7bb7c5a51287d (patch) | |
tree | fb84850409a44e13e832cbadc9025d40c1d33d9f /gdb/guile | |
parent | 2bb7589ddf61e163f2e414e7033fad56ea17e784 (diff) | |
download | gdb-8579fd136a614985bd27f20539c7bb7c5a51287d.zip gdb-8579fd136a614985bd27f20539c7bb7c5a51287d.tar.gz gdb-8579fd136a614985bd27f20539c7bb7c5a51287d.tar.bz2 |
gdb/gdbsupport: make xstrprintf and xstrvprintf return a unique_ptr
The motivation is to reduce the number of places where unmanaged
pointers are returned from allocation type routines. All of the
callers are updated.
There should be no user visible changes after this commit.
Diffstat (limited to 'gdb/guile')
-rw-r--r-- | gdb/guile/scm-breakpoint.c | 2 | ||||
-rw-r--r-- | gdb/guile/scm-cmd.c | 33 | ||||
-rw-r--r-- | gdb/guile/scm-exception.c | 12 | ||||
-rw-r--r-- | gdb/guile/scm-gsmob.c | 7 | ||||
-rw-r--r-- | gdb/guile/scm-ports.c | 6 |
5 files changed, 25 insertions, 35 deletions
diff --git a/gdb/guile/scm-breakpoint.c b/gdb/guile/scm-breakpoint.c index ab1ddb1..15ac45a 100644 --- a/gdb/guile/scm-breakpoint.c +++ b/gdb/guile/scm-breakpoint.c @@ -968,7 +968,7 @@ gdbscm_set_breakpoint_stop_x (SCM self, SCM newvalue) = xstrprintf (_("Only one stop condition allowed. There is" " currently a %s stop condition defined for" " this breakpoint."), - ext_lang_capitalized_name (extlang)); + ext_lang_capitalized_name (extlang)).release (); scm_dynwind_begin ((scm_t_dynwind_flags) 0); gdbscm_dynwind_xfree (error_text); diff --git a/gdb/guile/scm-cmd.c b/gdb/guile/scm-cmd.c index 6764285..619c89c 100644 --- a/gdb/guile/scm-cmd.c +++ b/gdb/guile/scm-cmd.c @@ -475,9 +475,7 @@ gdbscm_parse_command_name (const char *name, struct cmd_list_element *elt; int len = strlen (name); int i, lastchar; - char *prefix_text; - const char *prefix_text2; - char *result, *msg; + char *msg; /* Skip trailing whitespace. */ for (i = len - 1; i >= 0 && (name[i] == ' ' || name[i] == '\t'); --i) @@ -493,9 +491,9 @@ gdbscm_parse_command_name (const char *name, /* Find first character of the final word. */ for (; i > 0 && valid_cmd_char_p (name[i - 1]); --i) ; - result = (char *) xmalloc (lastchar - i + 2); - memcpy (result, &name[i], lastchar - i + 1); - result[lastchar - i + 1] = '\0'; + gdb::unique_xmalloc_ptr<char> result ((char *) xmalloc (lastchar - i + 2)); + memcpy (result.get (), &name[i], lastchar - i + 1); + result.get ()[lastchar - i + 1] = '\0'; /* Skip whitespace again. */ for (--i; i >= 0 && (name[i] == ' ' || name[i] == '\t'); --i) @@ -503,20 +501,19 @@ gdbscm_parse_command_name (const char *name, if (i < 0) { *base_list = start_list; - return result; + return result.release (); } - prefix_text = (char *) xmalloc (i + 2); - memcpy (prefix_text, name, i + 1); - prefix_text[i + 1] = '\0'; + gdb::unique_xmalloc_ptr<char> prefix_text ((char *) xmalloc (i + 2)); + memcpy (prefix_text.get (), name, i + 1); + prefix_text.get ()[i + 1] = '\0'; - prefix_text2 = prefix_text; + const char *prefix_text2 = prefix_text.get (); elt = lookup_cmd_1 (&prefix_text2, *start_list, NULL, NULL, 1); if (elt == NULL || elt == CMD_LIST_AMBIGUOUS) { - msg = xstrprintf (_("could not find command prefix '%s'"), prefix_text); - xfree (prefix_text); - xfree (result); + msg = xstrprintf (_("could not find command prefix '%s'"), + prefix_text.get ()).release (); scm_dynwind_begin ((scm_t_dynwind_flags) 0); gdbscm_dynwind_xfree (msg); gdbscm_out_of_range_error (func_name, arg_pos, @@ -525,14 +522,12 @@ gdbscm_parse_command_name (const char *name, if (elt->is_prefix ()) { - xfree (prefix_text); *base_list = elt->subcommands; - return result; + return result.release (); } - msg = xstrprintf (_("'%s' is not a prefix command"), prefix_text); - xfree (prefix_text); - xfree (result); + msg = xstrprintf (_("'%s' is not a prefix command"), + prefix_text.get ()).release (); scm_dynwind_begin ((scm_t_dynwind_flags) 0); gdbscm_dynwind_xfree (msg); gdbscm_out_of_range_error (func_name, arg_pos, diff --git a/gdb/guile/scm-exception.c b/gdb/guile/scm-exception.c index b62eaeb..0c9cb5d 100644 --- a/gdb/guile/scm-exception.c +++ b/gdb/guile/scm-exception.c @@ -234,7 +234,7 @@ SCM gdbscm_make_type_error (const char *subr, int arg_pos, SCM bad_value, const char *expected_type) { - char *msg; + gdb::unique_xmalloc_ptr<char> msg; SCM result; if (arg_pos > 0) @@ -262,9 +262,8 @@ gdbscm_make_type_error (const char *subr, int arg_pos, SCM bad_value, msg = xstrprintf (_("Wrong type argument: ~S")); } - result = gdbscm_make_error (scm_arg_type_key, subr, msg, + result = gdbscm_make_error (scm_arg_type_key, subr, msg.get (), scm_list_1 (bad_value), scm_list_1 (bad_value)); - xfree (msg); return result; } @@ -279,7 +278,7 @@ static SCM gdbscm_make_arg_error (SCM key, const char *subr, int arg_pos, SCM bad_value, const char *error_prefix, const char *error) { - char *msg; + gdb::unique_xmalloc_ptr<char> msg; SCM result; if (error_prefix != NULL) @@ -300,9 +299,8 @@ gdbscm_make_arg_error (SCM key, const char *subr, int arg_pos, SCM bad_value, msg = xstrprintf (_("%s: ~S"), error); } - result = gdbscm_make_error (key, subr, msg, - scm_list_1 (bad_value), scm_list_1 (bad_value)); - xfree (msg); + result = gdbscm_make_error (key, subr, msg.get (), scm_list_1 (bad_value), + scm_list_1 (bad_value)); return result; } diff --git a/gdb/guile/scm-gsmob.c b/gdb/guile/scm-gsmob.c index 72a96a7..110c1e6 100644 --- a/gdb/guile/scm-gsmob.c +++ b/gdb/guile/scm-gsmob.c @@ -191,16 +191,13 @@ gdbscm_gsmob_kind (SCM self) SCM smob, result; scm_t_bits smobnum; const char *name; - char *kind; smob = gsscm_get_gsmob_arg_unsafe (self, SCM_ARG1, FUNC_NAME); smobnum = SCM_SMOBNUM (smob); name = SCM_SMOBNAME (smobnum); - kind = xstrprintf ("<%s>", name); - result = scm_from_latin1_symbol (kind); - xfree (kind); - + gdb::unique_xmalloc_ptr<char> kind = xstrprintf ("<%s>", name); + result = scm_from_latin1_symbol (kind.get ()); return result; } diff --git a/gdb/guile/scm-ports.c b/gdb/guile/scm-ports.c index 6251e69..41ccf30 100644 --- a/gdb/guile/scm-ports.c +++ b/gdb/guile/scm-ports.c @@ -139,7 +139,7 @@ static const unsigned min_memory_port_buf_size = 1; static const unsigned max_memory_port_buf_size = 4096; /* "out of range" error message for buf sizes. */ -static char *out_of_range_buf_size; +static gdb::unique_xmalloc_ptr<char> out_of_range_buf_size; #else @@ -1447,7 +1447,7 @@ gdbscm_set_memory_port_read_buffer_size_x (SCM port, SCM size) max_memory_port_buf_size)) { gdbscm_out_of_range_error (FUNC_NAME, SCM_ARG2, size, - out_of_range_buf_size); + out_of_range_buf_size.get ()); } iomem = (ioscm_memory_port *) SCM_STREAM (port); @@ -1497,7 +1497,7 @@ gdbscm_set_memory_port_write_buffer_size_x (SCM port, SCM size) max_memory_port_buf_size)) { gdbscm_out_of_range_error (FUNC_NAME, SCM_ARG2, size, - out_of_range_buf_size); + out_of_range_buf_size.get ()); } iomem = (ioscm_memory_port *) SCM_STREAM (port); |