From af36f47f7663cb1715a89bbaadcfe56d54c25d14 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 31 Aug 2005 18:08:34 +0000 Subject: [PATCH] * 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. --- config/ChangeLog | 4 ++++ config/srclist.txt | 4 +++- lib/ChangeLog | 7 +++++++ lib/regcomp.c | 2 -- lib/regex_internal.h | 2 -- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index 0c8cb68b9..1fce8ca38 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2005-08-31 Paul Eggert + + * srclist.txt: Add glibc bug 1273. + 2005-08-25 Paul Eggert * srclist.txt: Add glibc bugs 1241, 1245. diff --git a/config/srclist.txt b/config/srclist.txt index 1f31dba11..f7e9fad63 100644 --- 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 5d5737164..5b19a8822 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,10 @@ +2005-08-31 Paul Eggert + + * 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 * strstr.c: Include , for NULL. diff --git a/lib/regcomp.c b/lib/regcomp.c index 28e677bb4..ed71051af 100644 --- 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 cadafddff..2aba16aca 100644 --- 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. */ -- 2.11.0