From 083768e30add2d4c53372b98ae64092d1b97ee4b Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 25 Aug 2005 05:08:59 +0000 Subject: [PATCH] * config/srclist.txt: Add glibc bug 1240. * lib/regcomp.c (regerror): 2nd arg is 'restrict', as per POSIX. * lib/regex.h (regerror): Likewise. --- config/ChangeLog | 2 +- config/srclist.txt | 4 +++- lib/ChangeLog | 3 +++ lib/regcomp.c | 3 ++- lib/regex.h | 4 ++-- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index 7b99b72b3c..46a59f5c3f 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,7 +1,7 @@ 2005-08-24 Paul Eggert * srclist.txt: Remove glibc bug 1233 and add 1236, which supersedes it. - Add glibc bugs 1237 and 1238. Comment out lib/regex.c. + Add glibc bugs 1237, 1238, 1240. Comment out lib/regex.c. 2005-08-23 Paul Eggert diff --git a/config/srclist.txt b/config/srclist.txt index 725b3ad914..5889f2df88 100644 --- a/config/srclist.txt +++ b/config/srclist.txt @@ -1,4 +1,4 @@ -# $Id: srclist.txt,v 1.84 2005-08-24 23:43:00 eggert Exp $ +# $Id: srclist.txt,v 1.85 2005-08-25 05:09:01 eggert Exp $ # Files for which we are not the source. See ./srclistvars.sh for the # variable definitions. @@ -100,6 +100,7 @@ $LIBCSRC/stdlib/getsubopt.c lib gpl # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1223 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1224 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1237 +# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1240 #$LIBCSRC/posix/regcomp.c lib gpl # # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1238 @@ -110,6 +111,7 @@ $LIBCSRC/stdlib/getsubopt.c lib gpl # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1222 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1232 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1236 +# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1240 #$LIBCSRC/posix/regex.h lib gpl # # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1215 diff --git a/lib/ChangeLog b/lib/ChangeLog index 21ed46e663..50ec523adf 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,5 +1,8 @@ 2005-08-24 Paul Eggert + * regcomp.c (regerror): 2nd arg is 'restrict', as per POSIX. + * regex.h (regerror): Likewise. + * regex.c: Do not include , as POSIX no longer requires this. (The code never needed it.) diff --git a/lib/regcomp.c b/lib/regcomp.c index d9c4511ee3..6c8aea48a0 100644 --- a/lib/regcomp.c +++ b/lib/regcomp.c @@ -496,7 +496,8 @@ weak_alias (__regcomp, regcomp) from either regcomp or regexec. We don't use PREG here. */ size_t -regerror (int errcode, const regex_t *preg, char *errbuf, size_t errbuf_size) +regerror (int errcode, const regex_t *__restrict preg, + char *__restrict errbuf, size_t errbuf_size) { const char *msg; size_t msg_size; diff --git a/lib/regex.h b/lib/regex.h index d1b689798a..5c957c067d 100644 --- a/lib/regex.h +++ b/lib/regex.h @@ -614,8 +614,8 @@ extern int regexec (const regex_t *__restrict __preg, regmatch_t __pmatch[__restrict_arr], int __eflags); -extern size_t regerror (int __errcode, const regex_t *__preg, - char *__errbuf, size_t __errbuf_size); +extern size_t regerror (int __errcode, const regex_t *__restrict __preg, + char *__restrict __errbuf, size_t __errbuf_size); extern void regfree (regex_t *__preg); -- 2.30.2