tidying

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

diff --git a/src/src/exim.c b/src/src/exim.c
index 92f5623d23af304dbd3ee9c4de7c59fc7f7a1c70..9424b95f7bd464eb2a3df2dc4fec3f3768e6bdd9 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -110,7 +110,7 @@ if (use_malloc)
   pcre_free = function_store_free;
   }
 if (caseless) options |= PCRE_CASELESS;
-yield = pcre_compile(CCS pattern, options, (const char **)&error, &offset, NULL);
+yield = pcre_compile(CCS pattern, options, CCSS &error, &offset, NULL);
 pcre_malloc = function_store_get;
 pcre_free = function_dummy_free;
 if (yield == NULL)
@@ -4366,7 +4366,7 @@ if (msg_action_arg > 0 && msg_action != MSG_DELIVER && msg_action != MSG_LOAD)
         yield = EXIT_FAILURE;
     switch (msg_action)
       {
-      case MSG_REMOVE: MSG_DELETE: case MSG_FREEZE: case MSG_THAW: break;
+      case MSG_REMOVE: case MSG_FREEZE: case MSG_THAW: break;
       default: printf("\n"); break;
       }
     }
@@ -5027,9 +5027,9 @@ if (host_checking)
   if (!sender_ident_set)
     {
     sender_ident = NULL;
-    if (f.running_in_test_harness && sender_host_port != 0 &&
-        interface_address != NULL && interface_port != 0)
-      verify_get_ident(1413);
+    if (f.running_in_test_harness && sender_host_port
+       && interface_address && interface_port)
+      verify_get_ident(1223);          /* note hardwired port number */
     }
 
   /* In case the given address is a non-canonical IPv6 address, canonicalize