This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 3/3] Remove usage of VEC(char_ptr) in gdbscm_parse_function_args
- From: Simon Marchi <simon dot marchi at ericsson dot com>
- To: <gdb-patches at sourceware dot org>
- Cc: Simon Marchi <simon dot marchi at polymtl dot ca>
- Date: Wed, 21 Mar 2018 17:25:09 -0400
- Subject: [PATCH 3/3] Remove usage of VEC(char_ptr) in gdbscm_parse_function_args
- References: <1521667509-303-1-git-send-email-simon.marchi@ericsson.com>
- Spamdiagnosticmetadata: NSPM
- Spamdiagnosticoutput: 1:99
From: Simon Marchi <simon.marchi@polymtl.ca>
This is a straightforward replacement, no change in behavior are
intended/expected.
This is the last usage of VEC(char_ptr), so it can now be removed.
gdb/ChangeLog:
* guile/scm-utils.c (gdbscm_parse_function_args): Replace VEC
with std::vector.
* common/gdb_vecs.h (DEF_VEC_P (char_ptr)): Remove.
---
gdb/common/gdb_vecs.h | 2 --
gdb/guile/scm-utils.c | 13 ++++---------
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/gdb/common/gdb_vecs.h b/gdb/common/gdb_vecs.h
index 7318e53..8bb7015 100644
--- a/gdb/common/gdb_vecs.h
+++ b/gdb/common/gdb_vecs.h
@@ -25,8 +25,6 @@
typedef char *char_ptr;
typedef const char *const_char_ptr;
-DEF_VEC_P (char_ptr);
-
DEF_VEC_P (const_char_ptr);
/* Split STR, a list of DELIMITER-separated fields, into a char pointer vector.
diff --git a/gdb/guile/scm-utils.c b/gdb/guile/scm-utils.c
index c31afc6..73b0dec 100644
--- a/gdb/guile/scm-utils.c
+++ b/gdb/guile/scm-utils.c
@@ -386,7 +386,7 @@ gdbscm_parse_function_args (const char *func_name,
SCM status;
SCM rest = SCM_EOL;
/* Keep track of malloc'd strings. We need to free them upon error. */
- VEC (char_ptr) *allocated_strings = NULL;
+ std::vector<char *> allocated_strings;
char *ptr;
have_rest = validate_arg_format (format);
@@ -419,7 +419,7 @@ gdbscm_parse_function_args (const char *func_name,
if (!gdbscm_is_false (status))
goto fail;
if (*p == 's')
- VEC_safe_push (char_ptr, allocated_strings, *(char **) arg_ptr);
+ allocated_strings.push_back (*(char **) arg_ptr);
}
++p;
++position;
@@ -485,10 +485,7 @@ gdbscm_parse_function_args (const char *func_name,
if (!gdbscm_is_false (status))
goto fail;
if (p[i] == 's')
- {
- VEC_safe_push (char_ptr, allocated_strings,
- *(char **) arg_ptr);
- }
+ allocated_strings.push_back (*(char **) arg_ptr);
}
}
}
@@ -516,14 +513,12 @@ gdbscm_parse_function_args (const char *func_name,
}
va_end (args);
- VEC_free (char_ptr, allocated_strings);
return;
fail:
va_end (args);
- for (i = 0; VEC_iterate (char_ptr, allocated_strings, i, ptr); ++i)
+ for (char *ptr : allocated_strings)
xfree (ptr);
- VEC_free (char_ptr, allocated_strings);
gdbscm_throw (status);
}
--
2.7.4