[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105360: * src/regex.c (re_comp): Pro
From: |
Andreas Schwab |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105360: * src/regex.c (re_comp): Protoize. |
Date: |
Sat, 30 Jul 2011 15:20:04 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 105360
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sat 2011-07-30 15:20:04 +0200
message:
* src/regex.c (re_comp): Protoize.
(re_exec): Fix return type.
(regexec): Fix type of `ret'.
modified:
src/ChangeLog
src/regex.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-07-29 07:05:17 +0000
+++ b/src/ChangeLog 2011-07-30 13:20:04 +0000
@@ -1,3 +1,9 @@
+2011-07-30 Andreas Schwab <address@hidden>
+
+ * regex.c (re_comp): Protoize.
+ (re_exec): Fix return type.
+ (regexec): Fix type of `ret'. (Bug#9203)
+
2011-07-29 Paul Eggert <address@hidden>
* image.c (check_image_size): Use 1024x1024 if unknown frame (Bug#9189).
=== modified file 'src/regex.c'
--- a/src/regex.c 2011-07-28 09:34:13 +0000
+++ b/src/regex.c 2011-07-30 13:20:04 +0000
@@ -6381,8 +6381,7 @@
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 @@
}
-regoff_t
+int
# ifdef _LIBC
weak_function
# endif
@@ -6558,7 +6557,7 @@
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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105360: * src/regex.c (re_comp): Protoize.,
Andreas Schwab <=