X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/90bd3832bc0ff090ac5e37dfc66b30cabb9cfc1a..4687a69c269ee3f2a7f0625e0147a503fd9d3d0b:/src/src/routers/manualroute.c diff --git a/src/src/routers/manualroute.c b/src/src/routers/manualroute.c index 200e0206e..ed497336b 100644 --- a/src/src/routers/manualroute.c +++ b/src/src/routers/manualroute.c @@ -9,6 +9,8 @@ #include "../exim.h" + +#ifdef ROUTER_MANUALROUTE #include "rf_functions.h" #include "manualroute.h" @@ -154,17 +156,17 @@ static BOOL 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); - while (*s && isspace(*s)) s++; + Uskip_whitespace(&s); } *hostlist = string_dequote(&s); -while (*s && isspace(*s)) s++; +Uskip_whitespace(&s); *options = s; return TRUE; } @@ -331,8 +333,9 @@ lookup_type = LK_DEFAULT; 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; @@ -366,7 +369,7 @@ while (*options) if (*options) { options++; - while (*options != 0 && isspace(*options)) options++; + while (*options && isspace(*options)) options++; } } @@ -488,5 +491,6 @@ addr->transport = transport; return OK; } -#endif /*!MACRO_PREDEF*/ +#endif /*!MACRO_PREDEF*/ +#endif /*ROUTER_MANUALROUTE*/ /* End of routers/manualroute.c */