Compiler quietening.

diff --git a/src/src/receive.c b/src/src/receive.c
index 7b0a22f5c5c4dd39e04228e53d3b60f15f4631e6..e0c1c73939325ad31668a735ced5eb0a8d259916 100644 (file)
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -3265,22 +3265,22 @@ else
          switch (rc)
             {
             case OK: case DISCARD:
-              msg = string_sprintf(msg, addr, "acceptance");        break;
+              msg = string_sprintf(CS msg, addr, "acceptance");        break;
             case DEFER:
-              msg = string_sprintf(msg, addr, "temporary refusal"); break;
+              msg = string_sprintf(CS msg, addr, "temporary refusal"); break;
             default:
-              msg = string_sprintf(msg, addr, "refusal");           break;
+              msg = string_sprintf(CS msg, addr, "refusal");           break;
             }
           smtp_user_msg(code, msg);
          }
        if (log_msg)       log_write(0, LOG_MAIN, "PRDR %s %s", addr, log_msg);
        else if (user_msg) log_write(0, LOG_MAIN, "PRDR %s %s", addr, user_msg);
-       else               log_write(0, LOG_MAIN, msg);
+       else               log_write(0, LOG_MAIN, CS msg);
 
        if (rc != OK) { receive_remove_recipient(addr); c--; }
         }
-        /* Set up final message, used if data acl gives OK */
-        smtp_reply = string_sprintf("%s id=%s message %s",
+      /* Set up final message, used if data acl gives OK */
+      smtp_reply = string_sprintf("%s id=%s message %s",
                       all_fail == FAIL ? US"550" : US"250",
                       message_id,
                        all_fail == FAIL
@@ -3288,11 +3288,11 @@ else
                         : all_pass == OK
                           ? US"accepted"
                           : US"accepted for some recipients");
-        if (recipients_count == 0)
-         {
-          message_id[0] = 0;       /* Indicate no message accepted */
-         goto TIDYUP;
-         }
+      if (recipients_count == 0)
+        {
+        message_id[0] = 0;       /* Indicate no message accepted */
+       goto TIDYUP;
+       }
       }
     else
       prdr_requested = FALSE;

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index b4dba3f101d593612b63655da4a4da50e493df7e..753f0955b19812db4c59657761e04a7e34696623 100644 (file)
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -3576,7 +3576,7 @@ BAD_MAIL_ARGS:
         {
       #ifdef EXPERIMENTAL_PRDR
         if ( prdr_requested == TRUE )
-           user_msg = string_sprintf(US"%s%s", user_msg, US", PRDR Requested");
+           user_msg = string_sprintf("%s%s", user_msg, US", PRDR Requested");
       #endif
         smtp_user_msg(US"250",user_msg);
         }