Changes to m4/modules/gnu.c,v

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Changes by:     Eric Blake <ericb>      06/09/27 12:24:53

Index: modules/gnu.c
===================================================================
RCS file: /sources/m4/m4/modules/gnu.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- modules/gnu.c       26 Sep 2006 13:19:26 -0000      1.57
+++ modules/gnu.c       27 Sep 2006 12:24:53 -0000      1.58
@@ -267,7 +267,10 @@
 
       offset = buf->regs.end[0];
       if (buf->regs.start[0] == buf->regs.end[0])
-       obstack_1grow (obs, victim[offset++]);
+       {
+         obstack_1grow (obs, victim[offset]);
+         offset++;
+       }
     }
 
   if (!ignore_duplicates || subst)
@@ -641,7 +644,6 @@
       m4_pattern_buffer *buf;  /* compiled regular expression */
 
       m4_dump_symbol_data      data;
-      m4_obstack               data_obs;
       m4_obstack               rename_obs;
 
       int resyntax;
@@ -663,8 +665,7 @@
        return;
 
       obstack_init (&rename_obs);
-      obstack_init (&data_obs);
-      data.obs = &data_obs;
+      data.obs = obs;
 
       m4_dump_symbols (context, &data, 1, argv, false);
 
@@ -681,7 +682,6 @@
            }
        }
 
-      obstack_free (&data_obs, NULL);
       obstack_free (&rename_obs, NULL);
     }
   else