consification

[exim.git] / src / src / expand.c

diff --git a/src/src/expand.c b/src/src/expand.c
index 0ae2aea92568aa80569993a13c1d0d802d98e87d..4fb935528e49b1c6fe9ab3a959d0aa113bbc8336 100644 (file)
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -4484,7 +4484,7 @@ f.expand_string_forcedfail = FALSE;
 expand_string_message = US"";
 
 { uschar *m;
-if (m = is_tainted2(string, LOG_MAIN|LOG_PANIC, "Tainted string '%s' in expansion", s))
+if ((m = is_tainted2(string, LOG_MAIN|LOG_PANIC, "Tainted string '%s' in expansion", s)))
   {
   expand_string_message = m;
   goto EXPAND_FAILED;
@@ -7645,10 +7645,12 @@ while (*s)
        /* Manually track tainting, as we deal in individual chars below */
 
        if (is_tainted(sub))
+          {
          if (yield->s && yield->ptr)
            gstring_rebuffer(yield);
          else
            yield->s = store_get(yield->size = Ustrlen(sub), TRUE);
+          }
 
        /* Check the UTF-8, byte-by-byte */
 
@@ -8209,6 +8211,7 @@ that is a bad idea, because expand_string_message is in dynamic store. */
 EXPAND_FAILED:
 if (left) *left = s;
 DEBUG(D_expand)
+  {
   DEBUG(D_noutf8)
     {
     debug_printf_indent("|failed to expand: %s\n", string);
@@ -8228,6 +8231,7 @@ DEBUG(D_expand)
     if (f.expand_string_forcedfail)
       debug_printf_indent(UTF8_UP_RIGHT "failure was forced\n");
     }
+  }
 if (resetok_p && !resetok) *resetok_p = FALSE;
 expand_level--;
 return NULL;