* macroexp.c (init_buffer): Remove testing code that overrides the

caller's length guess.
(gather_arguments): Use a larger initial size, now that the vector
growth code has been exercised.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fa5740009d6f33631d9afd860519f386a3610ca0..f7f00b936483dc4f9206fa00f8c7ad1504748ddd 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-05  Jim Blandy  <jimb@codesourcery.com>
+
+       * macroexp.c (init_buffer): Remove testing code that overrides the
+       caller's length guess.
+       (gather_arguments): Use a larger initial size, now that the vector
+       growth code has been exercised.
+
 2007-08-05  Pedro Alves  <pedro_alves@portugalmail.pt>
 
        * solib-target.c (solib_target_relocate_section_addresses): Add

diff --git a/gdb/macroexp.c b/gdb/macroexp.c
index a0ac7cc5924f256c5de1487a4a05ddb9ca700d69..68b38629b2f2871ed3bd4fdbfe247b37b8dd347a 100644 (file)
--- a/gdb/macroexp.c
+++ b/gdb/macroexp.c
@@ -81,9 +81,6 @@ struct macro_buffer
 static void
 init_buffer (struct macro_buffer *b, int n)
 {
-  /* Small value for initial testing.  */
-  n = 1;
-
   b->size = n;
   if (n > 0)
     b->text = (char *) xmalloc (n);
@@ -715,7 +712,7 @@ gather_arguments (const char *name, struct macro_buffer *src, int *argc_p)
   get_token (&tok, src);
 
   args_len = 0;
-  args_size = 1;                /* small for initial testing */
+  args_size = 6;
   args = (struct macro_buffer *) xmalloc (sizeof (*args) * args_size);
 
   for (;;)