tidying

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

diff --git a/src/src/environment.c b/src/src/environment.c
index b768a0fd6e158a383e2eb489a67cd16c1b280cd8..9d3d126a693629ad7358ac9963dcf39ff4d96fe2 100644 (file)
--- a/src/src/environment.c
+++ b/src/src/environment.c
@@ -37,18 +37,17 @@ if (!keep_environment || *keep_environment == '\0')
 
   }
 else if (Ustrcmp(keep_environment, "*") != 0)
-  {
-  uschar **p;
-  if (environ) for (p = USS environ; *p; /* see below */)
+  if (environ) for (uschar ** p = USS environ; *p; /* see below */)
     {
     /* It's considered broken if we do not find the '=', according to
     Florian Weimer. For now we ignore such strings. unsetenv() would complain,
     getenv() would complain. */
-    uschar *eqp = Ustrchr(*p, '=');
+    uschar * eqp = Ustrchr(*p, '=');
 
     if (eqp)
       {
-      uschar *name = string_copyn(*p, eqp - *p);
+      uschar * name = string_copyn(*p, eqp - *p);
+
       if (OK != match_isinlist(name, CUSS &keep_environment,
           0, NULL, NULL, MCL_NOEXPAND, FALSE, NULL))
         if (os_unsetenv(name) < 0) return FALSE;
@@ -57,14 +56,13 @@ else if (Ustrcmp(keep_environment, "*") != 0)
       store_reset(name);
       }
     }
-  }
 if (add_environment)
   {
-    uschar *p;
+    uschar * p;
     int sep = 0;
-    const uschar* envlist = add_environment;
-    while ((p = string_nextinlist(&envlist, &sep, NULL, 0)))
-        putenv(CS p);
+    const uschar * envlist = add_environment;
+
+    while ((p = string_nextinlist(&envlist, &sep, NULL, 0))) putenv(CS p);
   }
 
   return TRUE;