git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
char signedness
[exim.git]
/
src
/
src
/
expand.c
diff --git
a/src/src/expand.c
b/src/src/expand.c
index 2419161002e2865d8a111f8bfb6c5b7e80d41e08..fbbc56316356329f86ec99a2eab68c97c9f799f3 100644
(file)
--- a/
src/src/expand.c
+++ b/
src/src/expand.c
@@
-3851,8
+3851,8
@@
expand_string_internal(const uschar *string, BOOL ket_ends, const uschar **left,
{
int ptr = 0;
int size = Ustrlen(string)+ 64;
{
int ptr = 0;
int size = Ustrlen(string)+ 64;
-int item_type;
uschar *yield = store_get(size);
uschar *yield = store_get(size);
+int item_type;
const uschar *s = string;
uschar *save_expand_nstring[EXPAND_MAXN+1];
int save_expand_nlength[EXPAND_MAXN+1];
const uschar *s = string;
uschar *save_expand_nstring[EXPAND_MAXN+1];
int save_expand_nlength[EXPAND_MAXN+1];
@@
-5409,7
+5409,7
@@
while (*s != 0)
if (*s++ != '}')
{
expand_string_message = string_sprintf(
if (*s++ != '}')
{
expand_string_message = string_sprintf(
-
US
"missing '}' closing arg %d of extract", i+1);
+ "missing '}' closing arg %d of extract", i+1);
goto EXPAND_FAILED_CURLY;
}
goto EXPAND_FAILED_CURLY;
}
@@
-5455,7
+5455,7
@@
while (*s != 0)
else
{
expand_string_message = string_sprintf(
else
{
expand_string_message = string_sprintf(
-
US
"missing '{' for arg %d of extract", i+1);
+ "missing '{' for arg %d of extract", i+1);
goto EXPAND_FAILED_CURLY;
}
}
goto EXPAND_FAILED_CURLY;
}
}
@@
-5512,7
+5512,7
@@
while (*s != 0)
if (*s != '{') /*}*/
{
expand_string_message = string_sprintf(
if (*s != '{') /*}*/
{
expand_string_message = string_sprintf(
-
US
"missing '{' for arg %d of listextract", i+1);
+ "missing '{' for arg %d of listextract", i+1);
goto EXPAND_FAILED_CURLY;
}
goto EXPAND_FAILED_CURLY;
}
@@
-5521,7
+5521,7
@@
while (*s != 0)
if (*s++ != '}')
{
expand_string_message = string_sprintf(
if (*s++ != '}')
{
expand_string_message = string_sprintf(
-
US
"missing '}' closing arg %d of listextract", i+1);
+ "missing '}' closing arg %d of listextract", i+1);
goto EXPAND_FAILED_CURLY;
}
goto EXPAND_FAILED_CURLY;
}