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
/
routers
/
manualroute.c
diff --git
a/src/src/routers/manualroute.c
b/src/src/routers/manualroute.c
index 45378ce3d820c81d1a5cea1fa1f7bcc832e10e75..ed497336bacfce1b45a709f0ff78965349f8d3d9 100644
(file)
--- a/
src/src/routers/manualroute.c
+++ b/
src/src/routers/manualroute.c
@@
-156,17
+156,17
@@
static BOOL
parse_route_item(const uschar *s, const uschar **domain, const uschar **hostlist,
const uschar **options)
{
parse_route_item(const uschar *s, const uschar **domain, const uschar **hostlist,
const uschar **options)
{
-
while (*s != 0 && isspace(*s)) s++
;
+
Uskip_whitespace(&s)
;
if (domain)
{
if (!*s) return FALSE; /* missing data */
*domain = string_dequote(&s);
if (domain)
{
if (!*s) return FALSE; /* missing data */
*domain = string_dequote(&s);
-
while (*s && isspace(*s)) s++
;
+
Uskip_whitespace(&s)
;
}
*hostlist = string_dequote(&s);
}
*hostlist = string_dequote(&s);
-
while (*s && isspace(*s)) s++
;
+
Uskip_whitespace(&s)
;
*options = s;
return TRUE;
}
*options = s;
return TRUE;
}
@@
-333,8
+333,9
@@
lookup_type = LK_DEFAULT;
while (*options)
{
unsigned n;
while (*options)
{
unsigned n;
- const uschar *s = options;
- while (*options != 0 && !isspace(*options)) options++;
+ const uschar * s = options;
+
+ while (*options && !isspace(*options)) options++;
n = options-s;
if (Ustrncmp(s, "randomize", n) == 0) randomize = TRUE;
n = options-s;
if (Ustrncmp(s, "randomize", n) == 0) randomize = TRUE;
@@
-368,7
+369,7
@@
while (*options)
if (*options)
{
options++;
if (*options)
{
options++;
- while (*options
!= 0
&& isspace(*options)) options++;
+ while (*options && isspace(*options)) options++;
}
}
}
}