Changes to m4/lib/Attic/regex.c,v [branch]

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Branch:         branch
Changes by:     Eric Blake <ericb>      06/06/07 03:54:09

Index: lib/regex.c
===================================================================
RCS file: /sources/m4/m4/lib/Attic/regex.c,v
retrieving revision 1.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -u -b -r1.1.1.1.2.4 -r1.1.1.1.2.5
--- lib/regex.c 28 May 2006 04:24:01 -0000      1.1.1.1.2.4
+++ lib/regex.c 7 Jun 2006 03:54:09 -0000       1.1.1.1.2.5
@@ -3421,7 +3421,7 @@
      stopped matching the regnum-th subexpression.  (The zeroth register
      keeps track of what the whole pattern matches.)  */
 #ifdef MATCH_MAY_ALLOCATE /* otherwise, these are global.  */
-  const char **regstart, **regend;
+  const char **regstart = NULL, **regend = NULL;
 #endif
 
   /* If a group that's operated upon by a repetition operator fails to
@@ -3430,7 +3430,7 @@
      are when we last see its open-group operator.  Similarly for a
      register's end.  */
 #ifdef MATCH_MAY_ALLOCATE /* otherwise, these are global.  */
-  const char **old_regstart, **old_regend;
+  const char **old_regstart = NULL, **old_regend = NULL;
 #endif
 
   /* The is_active field of reg_info helps us keep track of which (possibly
@@ -3440,7 +3440,7 @@
      subexpression.  These two fields get reset each time through any
      loop their register is in.  */
 #ifdef MATCH_MAY_ALLOCATE /* otherwise, this is global.  */
-  register_info_type *reg_info;
+  register_info_type *reg_info = NULL;
 #endif
 
   /* The following record the register info as found in the above
@@ -3449,7 +3449,7 @@
      turn happens only if we have not yet matched the entire string. */
   unsigned best_regs_set = false;
 #ifdef MATCH_MAY_ALLOCATE /* otherwise, these are global.  */
-  const char **best_regstart, **best_regend;
+  const char **best_regstart = NULL, **best_regend = NULL;
 #endif
 
   /* Logically, this is `best_regend[0]'.  But we don't want to have to
@@ -3464,8 +3464,8 @@
 
   /* Used when we pop values we don't care about.  */
 #ifdef MATCH_MAY_ALLOCATE /* otherwise, these are global.  */
-  const char **reg_dummy;
-  register_info_type *reg_info_dummy;
+  const char **reg_dummy = NULL;
+  register_info_type *reg_info_dummy = NULL;
 #endif
 
 #ifdef DEBUG
@@ -4890,11 +4890,11 @@
 
 static int
 bcmp_translate (s1, s2, len, translate)
-     unsigned char *s1, *s2;
+     unsigned const char *s1, *s2;
      register int len;
      char *translate;
 {
-  register unsigned char *p1 = s1, *p2 = s2;
+  register const unsigned char *p1 = s1, *p2 = s2;
   while (len)
     {
       if (translate[*p1++] != translate[*p2++]) return 1;