diff mbox

ada: Use std::string in print_dynamic_range_bound

Message ID 1507902347-7971-1-git-send-email-simon.marchi@ericsson.com
State New
Headers show

Commit Message

Simon Marchi Oct. 13, 2017, 1:45 p.m. UTC
Replace this usage of GROW_VECT with an std::string.  I don't think
there's a reason for this variable to be static, other than it was
cumbersome to manage its lifetime (i.e. use a cleanup) before.

Tested by comparing the gdb.ada/*.exp test results before and after the
patch.

gdb/ChangeLog:

	* ada-typeprint.c (print_dynamic_range_bound): Use std::string.
---
 gdb/ada-typeprint.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

Comments

Yao Qi Oct. 13, 2017, 8:29 p.m. UTC | #1
On 17-10-13 09:45:47, Simon Marchi wrote:
> Replace this usage of GROW_VECT with an std::string.  I don't think
> there's a reason for this variable to be static, other than it was
> cumbersome to manage its lifetime (i.e. use a cleanup) before.
> 
> Tested by comparing the gdb.ada/*.exp test results before and after the
> patch.
> 
> gdb/ChangeLog:
> 
> 	* ada-typeprint.c (print_dynamic_range_bound): Use std::string.

Patch is good to me.
Simon Marchi Oct. 14, 2017, 2:46 a.m. UTC | #2
On 2017-10-13 16:29, Yao Qi wrote:
> On 17-10-13 09:45:47, Simon Marchi wrote:
>> Replace this usage of GROW_VECT with an std::string.  I don't think
>> there's a reason for this variable to be static, other than it was
>> cumbersome to manage its lifetime (i.e. use a cleanup) before.
>> 
>> Tested by comparing the gdb.ada/*.exp test results before and after 
>> the
>> patch.
>> 
>> gdb/ChangeLog:
>> 
>> 	* ada-typeprint.c (print_dynamic_range_bound): Use std::string.
> 
> Patch is good to me.

Thanks, pushed.
diff mbox

Patch

diff --git a/gdb/ada-typeprint.c b/gdb/ada-typeprint.c
index 2224bb3..0d1f9dc 100644
--- a/gdb/ada-typeprint.c
+++ b/gdb/ada-typeprint.c
@@ -253,15 +253,11 @@  static void
 print_dynamic_range_bound (struct type *type, const char *name, int name_len,
 			   const char *suffix, struct ui_file *stream)
 {
-  static char *name_buf = NULL;
-  static size_t name_buf_len = 0;
   LONGEST B;
+  std::string name_buf (name, name_len);
+  name_buf += suffix;
 
-  GROW_VECT (name_buf, name_buf_len, name_len + strlen (suffix) + 1);
-  strncpy (name_buf, name, name_len);
-  strcpy (name_buf + name_len, suffix);
-
-  if (get_int_var_value (name_buf, B))
+  if (get_int_var_value (name_buf.c_str (), B))
     ada_print_scalar (type, B, stream);
   else
     fprintf_filtered (stream, "?");