Mercurial > hg > octave-lojdl > gnulib-hg
changeset 6079:221ad521f976
* config/srclist.txt: Add glibc bug 1225.
* lib/regexec.c (regexec, re_search_stub) [!_LIBC]: Omit declaration
of unused local, dfa.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Sun, 21 Aug 2005 00:43:34 +0000 |
| parents | fff77cf0b47f |
| children | 371903e6dfee |
| files | config/ChangeLog config/srclist.txt lib/ChangeLog lib/regexec.c |
| diffstat | 4 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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>
--- 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 @@ # # 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
--- 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.
--- a/lib/regexec.c +++ b/lib/regexec.c @@ -214,7 +214,9 @@ { 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 @@ 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))