git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tidying: CCSS macro
[users/jgh/exim.git]
/
src
/
src
/
malware.c
diff --git
a/src/src/malware.c
b/src/src/malware.c
index 481b46acc2ee4d5971b22b175124003b61d97bb2..ef27daf377b2d336ef354979dae2e62f23138dfa 100644
(file)
--- a/
src/src/malware.c
+++ b/
src/src/malware.c
@@
-302,8
+302,7
@@
const uschar * rerror;
int roffset;
const pcre * cre;
int roffset;
const pcre * cre;
-cre = pcre_compile(CS re, PCRE_COPT, (const char **)&rerror, &roffset, NULL);
-if (!cre)
+if (!(cre = pcre_compile(CS re, PCRE_COPT, CCSS &rerror, &roffset, NULL)))
*errstr= string_sprintf("regular expression error in '%s': %s at offset %d",
re, rerror, roffset);
return cre;
*errstr= string_sprintf("regular expression error in '%s': %s at offset %d",
re, rerror, roffset);
return cre;
@@
-317,7
+316,7
@@
int i = pcre_exec(cre, NULL, CS text, Ustrlen(text), 0, 0,
ovector, nelem(ovector));
uschar * substr = NULL;
if (i >= 2) /* Got it */
ovector, nelem(ovector));
uschar * substr = NULL;
if (i >= 2) /* Got it */
- pcre_get_substring(CS text, ovector, i, 1,
(const char **)
&substr);
+ pcre_get_substring(CS text, ovector, i, 1,
CCSS
&substr);
return substr;
}
return substr;
}