* lib/regex_internal.h (re_sub_match_top_t): Remove unused member

next_last_offset.
(struct re_dfa_t): Remove unused member states_alloc.
* lib/regcomp.c (init_dfa): Don't initialize unused members.
* config/srclist.txt: Add glibc bug 1273.

diff --git a/config/ChangeLog b/config/ChangeLog
index 0c8cb68b9f3dc1b9cfd2bac28eb29e52ff73c492..1fce8ca38819a6f73ee5d0c2d9c95ea6744564f7 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * srclist.txt: Add glibc bug 1273.
+
 2005-08-25  Paul Eggert  <eggert@cs.ucla.edu>
 
        * srclist.txt: Add glibc bugs 1241, 1245.

diff --git a/config/srclist.txt b/config/srclist.txt
index 1f31dba11887729a56da1863fd5b4b7239e3417b..f7e9fad63db1b42a28f5d13b703061bc0e9dcf28 100644 (file)
--- a/config/srclist.txt
+++ b/config/srclist.txt
@@ -1,4 +1,4 @@
-# $Id: srclist.txt,v 1.88 2005-08-26 21:47:51 eggert Exp $
+# $Id: srclist.txt,v 1.89 2005-08-31 18:08:34 eggert Exp $
 # Files for which we are not the source.  See ./srclistvars.sh for the
 # variable definitions.
 
@@ -102,6 +102,7 @@ $LIBCSRC/stdlib/getsubopt.c         lib gpl
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1237
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1240
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1241
+# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1273
 #$LIBCSRC/posix/regcomp.c              lib gpl
 #
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1238
@@ -132,6 +133,7 @@ $LIBCSRC/stdlib/getsubopt.c         lib gpl
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1241
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1245
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1248
+# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1273
 #$LIBCSRC/posix/regex_internal.h               lib gpl
 #
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1216

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 5d5737164d5d5f398c5d619a1e5df4ac63de9a22..5b19a88228ff0e4e8914cedcc6290a04141ba857 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * regex_internal.h (re_sub_match_top_t): Remove unused member
+       next_last_offset.
+       (struct re_dfa_t): Remove unused member states_alloc.
+       * regcomp.c (init_dfa): Don't initialize unused members.
+
 2005-08-31  Bruno Haible  <bruno@clisp.org>
 
        * strstr.c: Include <stddef.h>, for NULL.

diff --git a/lib/regcomp.c b/lib/regcomp.c
index 28e677bb4a2e36861edb05bc89080c200607be81..ed71051afc4a5ff7991b4362c955f67c1eb7be29 100644 (file)
--- a/lib/regcomp.c
+++ b/lib/regcomp.c
@@ -811,8 +811,6 @@ init_dfa (re_dfa_t *dfa, int pat_len)
   dfa->nodes_alloc = pat_len + 1;
   dfa->nodes = re_malloc (re_token_t, dfa->nodes_alloc);
 
-  dfa->states_alloc = pat_len + 1;
-
   /*  table_size = 2 ^ ceil(log pat_len) */
   for (table_size = 1; table_size > 0; table_size <<= 1)
     if (table_size > pat_len)

diff --git a/lib/regex_internal.h b/lib/regex_internal.h
index cadafddff9c99b746467781a9035c68daad6520d..2aba16aca083b913f49f3fc05ebe98c7cb316b3f 100644 (file)
--- a/lib/regex_internal.h
+++ b/lib/regex_internal.h
@@ -529,7 +529,6 @@ typedef struct
 {
   int str_idx;
   int node;
-  int next_last_offset;
   state_array_t *path;
   int alasts; /* Allocation size of LASTS.  */
   int nlasts; /* The number of LASTS.  */
@@ -620,7 +619,6 @@ struct re_dfa_t
 
   /* number of subexpressions `re_nsub' is in regex_t.  */
   unsigned int state_hash_mask;
-  int states_alloc;
   int init_node;
   int nbackref; /* The number of backreference in this dfa.  */