From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 12 Oct 2014 17:18:51 +0000 (+0100)
Subject: Quieten noisy compiler
X-Git-Tag: exim-4_85_RC1~40^2~3
X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/8fa0a4d42bcf892375dafa2d8e4cc7f532a41145?ds=sidebyside;hp=8bc732e8b03ebb4309f4b42626917148d176db49

Quieten noisy compiler

As usual, gcc whining that perfectly valid C coding is
"ambiguous".  Wrongly.
---

diff --git a/src/src/deliver.c b/src/src/deliver.c
index 2ee69d37e..881c97733 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -2988,16 +2988,15 @@ while (!done)
      to get all available data from pipe. unfinished has to be true 
      as well. */
   if (remaining < required)
+    {
     if (unfinished)
       continue;
-    else
-      {
-      msg = string_sprintf("failed to read pipe from transport process "
-        "%d for transport %s: required size=%d > remaining size=%d and unfinished=false", 
-        pid, addr->transport->driver_name, required, remaining);
-      done = TRUE;
-      break;
-      }
+    msg = string_sprintf("failed to read pipe from transport process "
+      "%d for transport %s: required size=%d > remaining size=%d and unfinished=false", 
+      pid, addr->transport->driver_name, required, remaining);
+    done = TRUE;
+    break;
+    }
 
   /* step behind the header */
   ptr += PIPE_HEADER_SIZE;