tidying

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 925b96324bd4d8c373376523e91f7fe683fa71d4..ca5b2ea2967d98db3d5f91792c6c4a7cceb8e9e5 100644 (file)
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -30909,6 +30909,7 @@ need to use this option unless you know that the called hosts make use of the
 sender when checking recipients. If used indiscriminately, it reduces the
 usefulness of callout caching.
 
 sender when checking recipients. If used indiscriminately, it reduces the
 usefulness of callout caching.
 

+.new

 .vitem &*hold*&
 This option applies to recipient callouts only. For example:
 .code
 .vitem &*hold*&
 This option applies to recipient callouts only. For example:
 .code


@@ -30923,6 +30924,7 @@ The advantage is only gained if there are no callout cache hits
 if the use_sender option is used,
 if neither the random nor the use_postmaster option is used,
 and if no other callouts intervene.
 if the use_sender option is used,
 if neither the random nor the use_postmaster option is used,
 and if no other callouts intervene.

+.wen

 .endlist
 
 If you use any of the parameters that set a non-empty sender for the MAIL
 .endlist
 
 If you use any of the parameters that set a non-empty sender for the MAIL

diff --git a/src/src/daemon.c b/src/src/daemon.c
index 187378684f39ce3f4f67a897c0125f2a32fb24b0..e31de1518db668c45393005795221eeefd450f46 100644 (file)
--- a/src/src/daemon.c
+++ b/src/src/daemon.c
@@ -1967,10 +1967,8 @@ for (;;)
       errno = EINTR;
       }
     else
       errno = EINTR;
       }
     else

-      {

       lcount = select(max_socket + 1, (SELECT_ARG2_TYPE *)&select_listen,
         NULL, NULL, NULL);
       lcount = select(max_socket + 1, (SELECT_ARG2_TYPE *)&select_listen,
         NULL, NULL, NULL);

-      }

 
     if (lcount < 0)
       {
 
     if (lcount < 0)
       {


@@ -1996,10 +1994,9 @@ for (;;)
     while (lcount-- > 0)
       {
       int accept_socket = -1;
     while (lcount-- > 0)
       {
       int accept_socket = -1;

+

       if (!select_failed)
       if (!select_failed)

-        {

         for (sk = 0; sk < listen_socket_count; sk++)
         for (sk = 0; sk < listen_socket_count; sk++)

-          {

           if (FD_ISSET(listen_sockets[sk], &select_listen))
             {
             len = sizeof(accepted);
           if (FD_ISSET(listen_sockets[sk], &select_listen))
             {
             len = sizeof(accepted);


@@ -2008,8 +2005,6 @@ for (;;)
             FD_CLR(listen_sockets[sk], &select_listen);
             break;
             }
             FD_CLR(listen_sockets[sk], &select_listen);
             break;
             }

-          }
-        }

 
       /* If select or accept has failed and this was not caused by an
       interruption, log the incident and try again. With asymmetric TCP/IP
 
       /* If select or accept has failed and this was not caused by an
       interruption, log the incident and try again. With asymmetric TCP/IP

diff --git a/src/src/functions.h b/src/src/functions.h
index 3314801887f576d33b582e5961d7cdb0a42c8aa3..d99e1ca4006b5d9b098111f6b6ca1ed0da690a58 100644 (file)
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -116,8 +116,8 @@ extern uschar **child_exec_exim(int, BOOL, int *, BOOL, int, ...);
 extern pid_t   child_open_uid(const uschar **, const uschar **, int,
                 uid_t *, gid_t *, int *, int *, uschar *, BOOL);
 extern BOOL    cleanup_environment(void);
 extern pid_t   child_open_uid(const uschar **, const uschar **, int,
                 uid_t *, gid_t *, int *, int *, uschar *, BOOL);
 extern BOOL    cleanup_environment(void);

-extern BOOL    cutthrough_data_puts(uschar *, int);
-extern BOOL    cutthrough_data_put_nl(void);
+extern void    cutthrough_data_puts(uschar *, int);
+extern void    cutthrough_data_put_nl(void);

 extern uschar *cutthrough_finaldot(void);
 extern BOOL    cutthrough_flush_send(void);
 extern BOOL    cutthrough_headers_send(void);
 extern uschar *cutthrough_finaldot(void);
 extern BOOL    cutthrough_flush_send(void);
 extern BOOL    cutthrough_headers_send(void);

diff --git a/src/src/hash.c b/src/src/hash.c
index 7590d55b7f16356ff91ad7eda23c7c07db841287..bde22b26a7a05c1fa60c1788a697f3d07517d802 100644 (file)
--- a/src/src/hash.c
+++ b/src/src/hash.c
@@ -51,7 +51,7 @@ switch (h->method)
   case HASH_SHA1:   SHA1_Update  (&h->u.sha1, data, len); break;
   case HASH_SHA256: SHA256_Update(&h->u.sha2, data, len); break;
   /* should be blocked by init not handling these, but be explicit to
   case HASH_SHA1:   SHA1_Update  (&h->u.sha1, data, len); break;
   case HASH_SHA256: SHA256_Update(&h->u.sha2, data, len); break;
   /* should be blocked by init not handling these, but be explicit to

-   * guard against accidents later (and hush up clang -Wswitch) */
+  guard against accidents later (and hush up clang -Wswitch) */

   default: assert(0);
   }
 }
   default: assert(0);
   }
 }

diff --git a/src/src/receive.c b/src/src/receive.c
index 33c60e08db71c88aad40e104fd050ee872c3b5f9..aaf9215e97354d96335b255c1f5a37d974b772cf 100644 (file)
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -831,7 +831,7 @@ while ((ch = (receive_getc)(GETC_BUFFER_UNLIMITED)) != EOF)
       {
       message_size++;
       if (fout != NULL && fputc('\n', fout) == EOF) return END_WERROR;
       {
       message_size++;
       if (fout != NULL && fputc('\n', fout) == EOF) return END_WERROR;

-      (void) cutthrough_data_put_nl();
+      cutthrough_data_put_nl();

       if (ch != '\r') ch_state = 1; else continue;
       }
     break;
       if (ch != '\r') ch_state = 1; else continue;
       }
     break;


@@ -850,7 +850,7 @@ while ((ch = (receive_getc)(GETC_BUFFER_UNLIMITED)) != EOF)
     if (ch == '.')
       {
       uschar c= ch;
     if (ch == '.')
       {
       uschar c= ch;

-      (void) cutthrough_data_puts(&c, 1);
+      cutthrough_data_puts(&c, 1);

       }
     ch_state = 1;
     break;
       }
     ch_state = 1;
     break;


@@ -860,7 +860,7 @@ while ((ch = (receive_getc)(GETC_BUFFER_UNLIMITED)) != EOF)
     message_size++;
     body_linecount++;
     if (fout != NULL && fputc('\n', fout) == EOF) return END_WERROR;
     message_size++;
     body_linecount++;
     if (fout != NULL && fputc('\n', fout) == EOF) return END_WERROR;

-    (void) cutthrough_data_put_nl();
+    cutthrough_data_put_nl();

     if (ch == '\r')
       {
       ch_state = 2;
     if (ch == '\r')
       {
       ch_state = 2;


@@ -881,11 +881,11 @@ while ((ch = (receive_getc)(GETC_BUFFER_UNLIMITED)) != EOF)
     if (message_size > thismessage_size_limit) return END_SIZE;
     }
   if(ch == '\n')
     if (message_size > thismessage_size_limit) return END_SIZE;
     }
   if(ch == '\n')

-    (void) cutthrough_data_put_nl();
+    cutthrough_data_put_nl();

   else
     {
     uschar c = ch;
   else
     {
     uschar c = ch;

-    (void) cutthrough_data_puts(&c, 1);
+    cutthrough_data_puts(&c, 1);

     }
   }
 
     }
   }
 


@@ -991,7 +991,7 @@ for(;;)
        {
        message_size++;
        if (fout && fputc('\n', fout) == EOF) return END_WERROR;
        {
        message_size++;
        if (fout && fputc('\n', fout) == EOF) return END_WERROR;

-       (void) cutthrough_data_put_nl();
+       cutthrough_data_put_nl();

        if (ch == '\r') continue;       /* don't write CR */
        ch_state = MID_LINE;
        }
        if (ch == '\r') continue;       /* don't write CR */
        ch_state = MID_LINE;
        }


@@ -1008,11 +1008,11 @@ for(;;)
     if (message_size > thismessage_size_limit) return END_SIZE;
     }
   if(ch == '\n')
     if (message_size > thismessage_size_limit) return END_SIZE;
     }
   if(ch == '\n')

-    (void) cutthrough_data_put_nl();
+    cutthrough_data_put_nl();

   else
     {
     uschar c = ch;
   else
     {
     uschar c = ch;

-    (void) cutthrough_data_puts(&c, 1);
+    cutthrough_data_puts(&c, 1);

     }
   }
 /*NOTREACHED*/
     }
   }
 /*NOTREACHED*/

diff --git a/src/src/verify.c b/src/src/verify.c
index 59add8c0004e1338c8320f736ca9a31c542f3639..b28d15a71e164caab892313000c3be2b8236f80c 100644 (file)
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -1217,10 +1217,10 @@ cancel_cutthrough_connection(TRUE, US"transmit failed");
 return FALSE;
 }
 
 return FALSE;
 }
 

-BOOL
+void

 cutthrough_data_puts(uschar * cp, int n)
 {
 cutthrough_data_puts(uschar * cp, int n)
 {

-if (cutthrough.delivery) cutthrough_puts(cp, n);
+if (cutthrough.delivery) (void) cutthrough_puts(cp, n);

 }
 
 
 }
 
 


@@ -1253,10 +1253,10 @@ return cutthrough_puts(US"\r\n", 2);
 }
 
 
 }
 
 

-BOOL
+void

 cutthrough_data_put_nl(void)
 {
 cutthrough_data_put_nl(void)
 {

-return cutthrough_data_puts(US"\r\n", 2);
+cutthrough_data_puts(US"\r\n", 2);

 }
 
 
 }
 
 

diff --git a/test/stderr/4520 b/test/stderr/4520
index c2a856bb18b6b2134e201bf11b484f16c45da134..1642af78baf57a789b0b24c2809ef93af5ce1642 100644 (file)
--- a/test/stderr/4520
+++ b/test/stderr/4520
@@ -3,6 +3,7 @@ configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 admin user
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss

+release cutthrough conn: msg passed for delivery

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user