* config/srclist.txt: Add glibc bug 1223.

* lib/regcomp.c (create_initial_state): Remove duplicate decl.

diff --git a/config/ChangeLog b/config/ChangeLog
index 6eebce9e9be5d2114e09c773adf1c46eb518dcc5..2131a32a26fc92842e7f8f571e874a51637b4e62 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,6 +1,6 @@
 2005-08-20  Paul Eggert  <eggert@cs.ucla.edu>
 
 2005-08-20  Paul Eggert  <eggert@cs.ucla.edu>
 

-       * srclist.txt: Add glibc bugs 1220, 1221, 1222.
+       * srclist.txt: Add glibc bugs 1220, 1221, 1222, 1223.

 
 2005-08-19  Paul Eggert  <eggert@cs.ucla.edu>
 
 
 2005-08-19  Paul Eggert  <eggert@cs.ucla.edu>
 

diff --git a/config/srclist.txt b/config/srclist.txt
index 3b9bd0069f2dfad453853bfa44b82ab33c3d68d0..4092744d90c49fcbe8e64c70515f1d32cd25ea93 100644 (file)
--- a/config/srclist.txt
+++ b/config/srclist.txt
@@ -1,4 +1,4 @@
-# $Id: srclist.txt,v 1.73 2005-08-20 07:42:15 eggert Exp $
+# $Id: srclist.txt,v 1.74 2005-08-20 22:26:51 eggert Exp $

 # Files for which we are not the source.  See ./srclistvars.sh for the
 # variable definitions.
 
 # Files for which we are not the source.  See ./srclistvars.sh for the
 # variable definitions.
 


@@ -97,6 +97,7 @@ $LIBCSRC/stdlib/getsubopt.c           lib gpl
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1057
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1217
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1220
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1057
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1217
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1220

+# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1223

 #$LIBCSRC/posix/regcomp.c              lib gpl
 #
 $LIBCSRC/posix/regex.c                 lib gpl
 #$LIBCSRC/posix/regcomp.c              lib gpl
 #
 $LIBCSRC/posix/regex.c                 lib gpl

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 2dca0123152fdae6e3388b963f54313c4a3367fb..dea9edc13678bc435b0edf41f2970c9dbfc48fed 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,7 @@
 2005-08-20  Paul Eggert  <eggert@cs.ucla.edu>
 
 2005-08-20  Paul Eggert  <eggert@cs.ucla.edu>
 

+       * regcomp.c (create_initial_state): Remove duplicate decl.
+

        * regcomp.c:
        (re_compile_pattern, re_set_syntax, re_compile_fastmap):
        (re_compile_fastmap_iter, regcomp, regerror, regfree):
        * regcomp.c:
        (re_compile_pattern, re_set_syntax, re_compile_fastmap):
        (re_compile_fastmap_iter, regcomp, regerror, regfree):


@@ -15,6 +17,7 @@
        (build_charclass, build_charclass_op, fetch_number, create_tree):
        (create_token_tree, mark_opt_subexp, duplicate_tree):
        Use prototypes rather than old-style definitions.
        (build_charclass, build_charclass_op, fetch_number, create_tree):
        (create_token_tree, mark_opt_subexp, duplicate_tree):
        Use prototypes rather than old-style definitions.

+

        * regex_internal.c:
        (re_string_allocate, re_string_construct, re_string_realloc_buffers):
        (re_string_construct_common, build_wcs_buffer, build_wcs_upper_buffer):
        * regex_internal.c:
        (re_string_allocate, re_string_construct, re_string_realloc_buffers):
        (re_string_construct_common, build_wcs_buffer, build_wcs_upper_buffer):

diff --git a/lib/regcomp.c b/lib/regcomp.c
index aa4f08db1e578baba5ef57a7d34a8744d805d3d8..ade91595ea158bdc2002dbb1ecae452c1db6b1ac 100644 (file)
--- a/lib/regcomp.c
+++ b/lib/regcomp.c
@@ -33,7 +33,6 @@ static reg_errcode_t create_initial_state (re_dfa_t *dfa);
 static void optimize_utf8 (re_dfa_t *dfa);
 #endif
 static reg_errcode_t analyze (regex_t *preg);
 static void optimize_utf8 (re_dfa_t *dfa);
 #endif
 static reg_errcode_t analyze (regex_t *preg);

-static reg_errcode_t create_initial_state (re_dfa_t *dfa);

 static reg_errcode_t preorder (bin_tree_t *root,
                               reg_errcode_t (fn (void *, bin_tree_t *)),
                               void *extra);
 static reg_errcode_t preorder (bin_tree_t *root,
                               reg_errcode_t (fn (void *, bin_tree_t *)),
                               void *extra);