if (*ss == '!')
{
yield = FAIL;
- while (isspace((*(++ss))));
+ while (isspace(*++ss)) ;
}
else
yield = OK;
while (Ufgets(filebuffer, sizeof(filebuffer), f) != NULL)
{
- uschar *error;
- uschar *sss = filebuffer;
+ uschar * error, * sss = filebuffer;
while ((ss = Ustrchr(sss, '#')) != NULL)
{
if ((type != MCL_ADDRESS && type != MCL_LOCALPART) ||
ss == filebuffer || isspace(ss[-1]))
{
- *ss = 0;
+ *ss = '\0';
break;
}
sss = ss + 1;
ss = filebuffer + Ustrlen(filebuffer); /* trailing space */
while (ss > filebuffer && isspace(ss[-1])) ss--;
- *ss = 0;
+ *ss = '\0';
ss = filebuffer;
- while (isspace(*ss)) ss++; /* leading space */
-
- if (!*ss) continue; /* ignore empty */
+ if (!Uskip_whitespace(&ss)) /* leading space */
+ continue; /* ignore empty */
file_yield = yield; /* positive yield */
sss = ss; /* for debugging */
if (*ss == '!') /* negation */
{
- file_yield = (file_yield == OK)? FAIL : OK;
- while (isspace((*(++ss))));
+ file_yield = file_yield == OK ? FAIL : OK;
+ while (isspace(*++ss)) ;
}
switch ((func)(arg, ss, valueptr, &error))
log_write(0, LOG_MAIN, "%s: accepted by +include_defer", error);
goto OK_RETURN;
- case ERROR: /* host name lookup failed - this can only */
- if (ignore_unknown) /* be for an incoming host (not outgoing) */
+ /* The ERROR return occurs when checking hosts, when either a forward
+ or reverse lookup has failed. It can also occur in a match_ip list if a
+ non-IP address item is encountered. The error string gives details of
+ which it was. */
+
+ case ERROR:
+ if (ignore_unknown)
{
HDEBUG(D_lists) debug_printf_indent("%s: item ignored by +ignore_unknown\n",
error);
}
else
- {
+ {
HDEBUG(D_lists) debug_printf_indent("%s %s (%s)\n", ot,
include_unknown? "yes":"no", error);
(void)fclose(f);
if (*ss == '!')
{
local_yield = FAIL;
- while (isspace((*(++ss))));
+ while (isspace(*++ss)) ;
}
else local_yield = OK;