From 31011111a14e0e16ef8ace01d60efd0afc70494a Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sat, 30 Jul 2011 15:20:04 +0200 Subject: [PATCH] * src/regex.c (re_comp): Protoize. (re_exec): Fix return type. (regexec): Fix type of `ret'. --- src/ChangeLog | 6 ++++++ src/regex.c | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 6039a54c55..623ccc6f4b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2011-07-30 Andreas Schwab + + * regex.c (re_comp): Protoize. + (re_exec): Fix return type. + (regexec): Fix type of `ret'. (Bug#9203) + 2011-07-29 Paul Eggert * image.c (check_image_size): Use 1024x1024 if unknown frame (Bug#9189). diff --git a/src/regex.c b/src/regex.c index 862f848976..545a198acd 100644 --- a/src/regex.c +++ b/src/regex.c @@ -6381,8 +6381,7 @@ char * regcomp/regexec below without link errors. */ weak_function # endif -re_comp (s) - const char *s; +re_comp (const char *s) { reg_errcode_t ret; @@ -6421,7 +6420,7 @@ re_comp (s) } -regoff_t +int # ifdef _LIBC weak_function # endif @@ -6558,7 +6557,7 @@ reg_errcode_t regexec (const regex_t *__restrict preg, const char *__restrict string, size_t nmatch, regmatch_t pmatch[__restrict_arr], int eflags) { - reg_errcode_t ret; + regoff_t ret; struct re_registers regs; regex_t private_preg; size_t len = strlen (string); -- 2.20.1