Patchwork [RFA,7/9] Use std::vector in find_source_lines

login
register
mail settings
Submitter Tom Tromey
Date Feb. 7, 2018, 10:04 p.m.
Message ID <20180207220434.6045-8-tom@tromey.com>
Download mbox | patch
Permalink /patch/25870/
State New
Headers show

Comments

Tom Tromey - Feb. 7, 2018, 10:04 p.m.
This replaces an explicit malloc and a cleanup with a std::vector.

2018-02-07  Tom Tromey  <tom@tromey.com>

	* source.c (find_source_lines): Use std::vector.
---
 gdb/ChangeLog |  4 ++++
 gdb/source.c  | 20 ++++++++------------
 2 files changed, 12 insertions(+), 12 deletions(-)

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f0ec664d23..8bd04e47c7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@ 
 2018-02-07  Tom Tromey  <tom@tromey.com>
 
+	* source.c (find_source_lines): Use std::vector.
+
+2018-02-07  Tom Tromey  <tom@tromey.com>
+
 	* macrocmd.c (struct temporary_macro_definition): New.
 	(macro_define_command): Use temporary_macro_definition.  Remove
 	cleanups.
diff --git a/gdb/source.c b/gdb/source.c
index 1f136f4cfb..0e871be8ca 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -1186,7 +1186,7 @@  void
 find_source_lines (struct symtab *s, int desc)
 {
   struct stat st;
-  char *data, *p, *end;
+  char *p, *end;
   int nlines = 0;
   int lines_allocated = 1000;
   int *line_charpos;
@@ -1207,23 +1207,20 @@  find_source_lines (struct symtab *s, int desc)
     warning (_("Source file is more recent than executable."));
 
   {
-    struct cleanup *old_cleanups;
-
     /* st_size might be a large type, but we only support source files whose 
        size fits in an int.  */
     size = (int) st.st_size;
 
-    /* Use malloc, not alloca, because this may be pretty large, and we may
-       run into various kinds of limits on stack size.  */
-    data = (char *) xmalloc (size);
-    old_cleanups = make_cleanup (xfree, data);
+    /* Use the heap, not the stack, because this may be pretty large,
+       and we may run into various kinds of limits on stack size.  */
+    std::vector<char> data (size);
 
     /* Reassign `size' to result of read for systems where \r\n -> \n.  */
-    size = myread (desc, data, size);
+    size = myread (desc, data.data (), size);
     if (size < 0)
       perror_with_name (symtab_to_filename_for_display (s));
-    end = data + size;
-    p = data;
+    end = &data[size];
+    p = &data[0];
     line_charpos[0] = 0;
     nlines = 1;
     while (p != end)
@@ -1239,10 +1236,9 @@  find_source_lines (struct symtab *s, int desc)
 		  (int *) xrealloc ((char *) line_charpos,
 				    sizeof (int) * lines_allocated);
 	      }
-	    line_charpos[nlines++] = p - data;
+	    line_charpos[nlines++] = p - data.data ();
 	  }
       }
-    do_cleanups (old_cleanups);
   }
 
   s->nlines = nlines;