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

* lib/regexec.c (regexec, re_search_stub) [!_LIBC]: Omit declaration
of unused local, dfa.

diff --git a/config/ChangeLog b/config/ChangeLog
index 16536ae7b5c019462ffa73ca44b5530a0569adb9..04ec036c9c58678d6e9f49d541ff4c9dfebfc47d 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,6 +1,6 @@
 2005-08-20  Paul Eggert  <eggert@cs.ucla.edu>
 
-       * srclist.txt: Add glibc bugs 1220, 1221, 1222, 1223, 1224.
+       * srclist.txt: Add glibc bugs 1220, 1221, 1222, 1223, 1224, 1225.
 
 2005-08-19  Paul Eggert  <eggert@cs.ucla.edu>
 

diff --git a/config/srclist.txt b/config/srclist.txt
index c5a203c09a6672f8df658cae111c567cc0ef56fa..62a228e15482e6953c3e15ca1e3a2489499eedcc 100644 (file)
--- a/config/srclist.txt
+++ b/config/srclist.txt
@@ -1,4 +1,4 @@
-# $Id: srclist.txt,v 1.75 2005-08-21 00:29:47 eggert Exp $
+# $Id: srclist.txt,v 1.76 2005-08-21 00:43:34 eggert Exp $
 # Files for which we are not the source.  See ./srclistvars.sh for the
 # variable definitions.
 
@@ -119,6 +119,7 @@ $LIBCSRC/posix/regex.c                      lib gpl
 #
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1216
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1220
+# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1225
 #$LIBCSRC/posix/regexec.c              lib gpl
 #
 # c89 changes $LIBCSRC/string/strdup.c         lib gpl

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 7034ebdfbfe27af350b88d30a17806a306ccaa4d..341580d21eea829edf9a8bc9ff2a12bb99b2cb4b 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-20  Jim Meyering  <jim@meyering.net>
+
+       * regexec.c (regexec, re_search_stub) [!_LIBC]: Omit declaration
+       of unused local, dfa.
+
 2005-08-20  Paul Eggert  <eggert@cs.ucla.edu>
 
        * regcomp.c (create_initial_state): Remove duplicate decl.

diff --git a/lib/regexec.c b/lib/regexec.c
index 00867aa9dd28a384290f681d6c7ca17b93120888..6ca15bb547412993d56d345c223786efa5300510 100644 (file)
--- a/lib/regexec.c
+++ b/lib/regexec.c
@@ -214,7 +214,9 @@ regexec (const regex_t *__restrict preg, const char *__restrict string,
 {
   reg_errcode_t err;
   int start, length;
+#ifdef _LIBC
   re_dfa_t *dfa = (re_dfa_t *)preg->buffer;
+#endif
 
   if (eflags & ~(REG_NOTBOL | REG_NOTEOL | REG_STARTEND))
     return REG_BADPAT;
@@ -393,7 +395,9 @@ re_search_stub (struct re_pattern_buffer *bufp,
   regmatch_t *pmatch;
   int nregs, rval;
   int eflags = 0;
+#ifdef _LIBC
   re_dfa_t *dfa = (re_dfa_t *)bufp->buffer;
+#endif
 
   /* Check for out-of-range.  */
   if (BE (start < 0 || start > length, 0))