[exim-cvs] tidying

Commit:     9b62f401ae723894ac123c555a02390e061d24e6
Parent:     fe74809cb55b3d3162bdf7f8323b4422fe1475f9
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Sep 29 15:55:16 2019 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Mon Sep 30 16:50:54 2019 +0100

    tidying
---
 src/src/functions.h |   2 +-
 test/src/client.c   | 127 +++++++++++++++++++++++++++-------------------------
 2 files changed, 66 insertions(+), 63 deletions(-)

diff --git a/src/src/functions.h b/src/src/functions.h
index 0cd0a0d..31c0057 100644
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -892,7 +892,7 @@ return string_sprintf("%s/%s/%s/%s/%s%s",
     spool_directory, queue_name, purpose, subdir, fname, suffix);
 }

-static void
+static inline void
 set_subdir_str(uschar * subdir_str, const uschar * name,
     int search_sequence)
 {
diff --git a/test/src/client.c b/test/src/client.c
index d56a33f..1cec2cb 100644
--- a/test/src/client.c
+++ b/test/src/client.c
@@ -569,76 +569,79 @@ while (fgets(CS outbuffer, sizeof(outbuffer), f) != NULL)
 nextinput:
     if (*inptr == 0)   /* Refill input buffer */
       {
-      alarm(timeout);
       unsigned char *inbufferp = inbuffer;
-      for (;;) {
-      if (srv->tls_active)
-        {
+
+      alarm(timeout);
+      for (;;)
+    {
+    if (srv->tls_active)
+      {
 #ifdef HAVE_OPENSSL
-    int error;
-    DEBUG { printf("call SSL_read\n"); fflush(stdout); }
-        rc = SSL_read(srv->ssl, inbufferp, bsiz - (inbufferp - inbuffer) - 1);
-    DEBUG { printf("SSL_read: %d\n", rc); fflush(stdout); }
-    if (rc <= 0)
-          switch (error = SSL_get_error(srv->ssl, rc))
-        {
-        case SSL_ERROR_ZERO_RETURN:
-          break;
-        case SSL_ERROR_SYSCALL:
-          printf("%s\n", ERR_error_string(ERR_get_error(), NULL));
-          rc = -1;
-          break;
-        case SSL_ERROR_SSL:
-          printf("%s\nTLS terminated\n", ERR_error_string(ERR_get_error(), NULL));
-          SSL_shutdown(srv->ssl);
-          SSL_free(srv->ssl);
-          srv->tls_active = FALSE;
-          {    /* OpenSSL leaves it in restartsys mode */
-          struct sigaction act = {.sa_handler = sigalrm_handler_flag, .sa_flags = 0};
-          sigalrm_seen = 1;
-          sigaction(SIGALRM, &act, NULL);
+      int error;
+      DEBUG { printf("call SSL_read\n"); fflush(stdout); }
+      rc = SSL_read(srv->ssl, inbufferp, bsiz - (inbufferp - inbuffer) - 1);
+      DEBUG { printf("SSL_read: %d\n", rc); fflush(stdout); }
+      if (rc <= 0)
+        switch (error = SSL_get_error(srv->ssl, rc))
+          {
+          case SSL_ERROR_ZERO_RETURN:
+        break;
+          case SSL_ERROR_SYSCALL:
+        printf("%s\n", ERR_error_string(ERR_get_error(), NULL));
+        rc = -1;
+        break;
+          case SSL_ERROR_SSL:
+        printf("%s\nTLS terminated\n", ERR_error_string(ERR_get_error(), NULL));
+        SSL_shutdown(srv->ssl);
+        SSL_free(srv->ssl);
+        srv->tls_active = FALSE;
+        {    /* OpenSSL leaves it in restartsys mode */
+        struct sigaction act = {.sa_handler = sigalrm_handler_flag, .sa_flags = 0};
+        sigalrm_seen = 1;
+        sigaction(SIGALRM, &act, NULL);
+        }
+        *inptr = 0;
+        DEBUG { printf("go round\n"); fflush(stdout); }
+        goto nextinput;
+          default:
+        printf("SSL error code %d\n", error);
           }
-          *inptr = 0;
-          DEBUG { printf("go round\n"); fflush(stdout); }
-          goto nextinput;
-        default:
-          printf("SSL error code %d\n", error);
-        }
 #endif
 #ifdef HAVE_GNUTLS
-      retry1:
-    DEBUG { printf("call gnutls_record_recv\n"); fflush(stdout); }
-        rc = gnutls_record_recv(tls_session, CS inbufferp, bsiz - (inbufferp - inbuffer) - 1);
-    if (rc < 0)
+    retry1:
+      DEBUG { printf("call gnutls_record_recv\n"); fflush(stdout); }
+      rc = gnutls_record_recv(tls_session, CS inbufferp, bsiz - (inbufferp - inbuffer) - 1);
+      if (rc < 0)
+        {
+        DEBUG { printf("gnutls_record_recv: %s\n", gnutls_strerror(rc)); fflush(stdout); }
+        if (rc == GNUTLS_E_INTERRUPTED || rc == GNUTLS_E_AGAIN)
+          goto retry1;
+        printf("%s\n", gnutls_strerror(rc));
+        srv->tls_active = FALSE;
+        *inptr = 0;
+        DEBUG { printf("go round\n"); fflush(stdout); }
+        goto nextinput;
+        }
+      DEBUG { printf("gnutls_record_recv: %d\n", rc); fflush(stdout); }
+#endif
+      }
+    else
       {
-      DEBUG { printf("gnutls_record_recv: %s\n", gnutls_strerror(rc)); fflush(stdout); }
-      if (rc == GNUTLS_E_INTERRUPTED || rc == GNUTLS_E_AGAIN)
-        goto retry1;
-      printf("%s\n", gnutls_strerror(rc));
-      srv->tls_active = FALSE;
-      *inptr = 0;
-      DEBUG { printf("go round\n"); fflush(stdout); }
-      goto nextinput;
+      DEBUG { printf("call read\n"); fflush(stdout); }
+      rc = read(srv->sock, inbufferp, bsiz - (inbufferp - inbuffer) - 1);
+      DEBUG { printf("read: %d\n", rc); fflush(stdout); }
       }
-    DEBUG { printf("gnutls_record_recv: %d\n", rc); fflush(stdout); }
-#endif
-        }
-      else
-    {
-    DEBUG { printf("call read\n"); fflush(stdout); }
-    rc = read(srv->sock, inbufferp, bsiz - (inbufferp - inbuffer) - 1);
-    DEBUG { printf("read: %d\n", rc); fflush(stdout); }
-    }

-        if (rc > 0) inbufferp[rc] = '\0';
-        if (rc <= 0 || strchr(inbufferp, '\n')) break;
-        inbufferp += rc;
-        if (inbufferp >= inbuffer + bsiz) {
-          printf("Input buffer overrun, need more than %d bytes input buffer\n", bsiz);
-          exit(73);
-        }
-        DEBUG { printf("read more\n"); }
-      }
+      if (rc > 0) inbufferp[rc] = '\0';
+      if (rc <= 0 || strchr(inbufferp, '\n')) break;
+      inbufferp += rc;
+      if (inbufferp >= inbuffer + bsiz)
+        {
+        printf("Input buffer overrun, need more than %d bytes input buffer\n", bsiz);
+        exit(73);
+        }
+      DEBUG { printf("read more\n"); }
+    }
       alarm(0);

       if (rc < 0)