diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-09-03 16:03:38 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-09-03 16:03:38 -0700 |
| commit | b49e353d9d01adbe60bc5d0b1658b4ef978b0b06 (patch) | |
| tree | 9f2ffa6f7a6562abf661a4951012b488ad8b1ae7 /src/regex.c | |
| parent | 74b880cbc18bd0194c7b1fc44c4a983ee05adae2 (diff) | |
| parent | bc3200871917d5c54c8c4299a06bf8f8ba2ea02d (diff) | |
| download | emacs-b49e353d9d01adbe60bc5d0b1658b4ef978b0b06.tar.gz | |
Merge from trunk.
Diffstat (limited to 'src/regex.c')
| -rw-r--r-- | src/regex.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/regex.c b/src/regex.c index 862f848976c..d1b835621d9 100644 --- a/src/regex.c +++ b/src/regex.c @@ -2106,9 +2106,9 @@ re_iswctype (int ch, re_wctype_t cc) case RECC_UPPER: return ISUPPER (ch) != 0; case RECC_XDIGIT: return ISXDIGIT (ch) != 0; case RECC_ASCII: return IS_REAL_ASCII (ch) != 0; - case RECC_NONASCII: return !IS_REAL_ASCII (ch) != 0; + case RECC_NONASCII: return !IS_REAL_ASCII (ch); case RECC_UNIBYTE: return ISUNIBYTE (ch) != 0; - case RECC_MULTIBYTE: return !ISUNIBYTE (ch) != 0; + case RECC_MULTIBYTE: return !ISUNIBYTE (ch); case RECC_WORD: return ISWORD (ch) != 0; case RECC_ERROR: return false; default: @@ -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); |