Optimise scanning config for macros

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

diff --git a/src/src/exim.c b/src/src/exim.c
index 88e119778cf66ec3ff830bcdcc0daaacc0397d3d..0285e162a2bfad4a08206ce2ad1bcdefda266f8d 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -1443,10 +1443,9 @@ for (m = macros; m; m = m->next) if (m->command_line)
       }
   if (!found)
     return FALSE;
-  if (m->replacement == NULL)
+  if (!m->replacement)
     continue;
-  len = Ustrlen(m->replacement);
-  if (len == 0)
+  if ((len = m->replen) == 0)
     continue;
   n = pcre_exec(regex_whitelisted_macro, NULL, CS m->replacement, len,
    0, PCRE_EOPT, NULL, 0);
@@ -2457,7 +2456,7 @@ for (i = 1; i < argc; i++)
           exit(EXIT_FAILURE);
           }
 
-      m = macro_create(name, s, TRUE, FALSE);
+      m = macro_create(string_copy(name), string_copy(s), TRUE);
 
       if (clmacro_count >= MAX_CLMACROS)
         {