* src/regex.c (re_comp): Protoize.

(re_exec): Fix return type.
(regexec): Fix type of `ret'.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6039a54c559bfc344a2c99b8f5a0a43f8e617e6d..623ccc6f4bec4ba11970140f1a06ebd224b643aa 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-30  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * regex.c (re_comp): Protoize.
+       (re_exec): Fix return type.
+       (regexec): Fix type of `ret'.  (Bug#9203)
+
 2011-07-29  Paul Eggert  <eggert@cs.ucla.edu>
 
        * image.c (check_image_size): Use 1024x1024 if unknown frame (Bug#9189).

diff --git a/src/regex.c b/src/regex.c
index 862f848976c3a98981041358f723ecf4d1024f40..545a198acd7b93b0567a1295cdf4cf93c4b11bce 100644 (file)
--- 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);