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
tidying
[exim.git]
/
src
/
src
/
expand.c
diff --git
a/src/src/expand.c
b/src/src/expand.c
index 6dcd450628d8d7c9599b224642af70551bb52a3d..fe0fd1469400a31d47534e98424682c51f9ca403 100644
(file)
--- a/
src/src/expand.c
+++ b/
src/src/expand.c
@@
-27,13
+27,6
@@
typedef unsigned esi_flags;
# ifndef SUPPORT_CRYPTEQ
# define SUPPORT_CRYPTEQ
# endif
# ifndef SUPPORT_CRYPTEQ
# define SUPPORT_CRYPTEQ
# endif
-#else
-
-/* Recursively called function */
-
-static uschar *expand_string_internal(const uschar *, esi_flags, const uschar **, BOOL *, BOOL *);
-static int_eximarith_t expanded_string_integer(const uschar *, BOOL);
-
#endif /*!STAND_ALONE*/
#ifdef LOOKUP_LDAP
#endif /*!STAND_ALONE*/
#ifdef LOOKUP_LDAP
@@
-942,6
+935,10
@@
static uschar *mtable_sticky[] =
#define FH_WANT_RAW BIT(1)
#define FH_WANT_LIST BIT(2)
#define FH_WANT_RAW BIT(1)
#define FH_WANT_LIST BIT(2)
+/* Recursively called function */
+static uschar *expand_string_internal(const uschar *, esi_flags, const uschar **, BOOL *, BOOL *);
+static int_eximarith_t expanded_string_integer(const uschar *, BOOL);
+
/*************************************************
* Tables for UTF-8 support *
/*************************************************
* Tables for UTF-8 support *
@@
-5630,7
+5627,6
@@
while (*s)
/* Handle options to the "run" */
while (*s == ',')
/* Handle options to the "run" */
while (*s == ',')
- {
if (Ustrncmp(++s, "preexpand", 9) == 0)
{ late_expand = FALSE; s += 9; }
else
if (Ustrncmp(++s, "preexpand", 9) == 0)
{ late_expand = FALSE; s += 9; }
else
@@
-5641,7
+5637,6
@@
while (*s)
(int)(t-s), s);
goto EXPAND_FAILED;
}
(int)(t-s), s);
goto EXPAND_FAILED;
}
- }
Uskip_whitespace(&s);
if (*s != '{') /*}*/
Uskip_whitespace(&s);
if (*s != '{') /*}*/