[exim-cvs] Compiler quietening

Gitweb: https://git.exim.org/exim.git/commitdiff/839287b7fc870dc61755101d28c7ba959632d7df

Commit:     839287b7fc870dc61755101d28c7ba959632d7df
Parent:     90315b85f88beec520dad795442d5ba806093ab4
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Jun 20 14:20:32 2021 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Mon Jun 21 20:23:41 2021 +0100

    Compiler quietening

    Stupid static analysis failing to track crontrol dependencies
---
 src/src/lookups/readsock.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/src/lookups/readsock.c b/src/src/lookups/readsock.c
index 1b6f8ad..f7e04d1 100644
--- a/src/src/lookups/readsock.c
+++ b/src/src/lookups/readsock.c
@@ -180,7 +180,6 @@ struct {
} lf = {.do_shutdown = TRUE};
uschar * eol = NULL;
int timeout = 5;
-FILE * fp;
gstring * yield;
int ret = DEFER;

@@ -248,16 +247,23 @@ that reads a file can be used. If we're using a stdio buffered read,
and might need later write ops on the socket, the stdio must be in
writable mode or the underlying socket goes non-writable. */

-if (!cctx->tls_ctx)
-  fp = fdopen(cctx->sock, lf.do_shutdown ? "rb" : "wb");
-
 sigalrm_seen = FALSE;
-ALARM(timeout);
-yield =
-#ifndef DISABLE_TLS
-  cctx->tls_ctx ? cat_file_tls(cctx->tls_ctx, NULL, eol) :
+#ifdef DISABLE_TLS
+if (TRUE)
+#else
+if (!cctx->tls_ctx)
 #endif
-          cat_file(fp, NULL, eol);
+  {
+  FILE * fp = fdopen(cctx->sock, lf.do_shutdown ? "rb" : "wb");
+  ALARM(timeout);
+  yield = cat_file(fp, NULL, eol);
+  }
+else
+  {
+  ALARM(timeout);
+  yield = cat_file_tls(cctx->tls_ctx, NULL, eol);
+  }
+
 ALARM_CLR(0);

if (sigalrm_seen)