X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/eca05e65abb3a1c9491c4294ab2600d2cec8615b..fe86b6d55ac470e6e832c53ea2c71e680efe5274:/mts/smtp/smtp.c

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 77bcb6e5..c8bea5b8 100644
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -457,7 +457,7 @@ sm_winit (char *from, int smtputf8, int eightbit)
         if (EHLOset ("8BITMIME")  &&  EHLOset ("SMTPUTF8")) {
             mail_parameters = " BODY=8BITMIME SMTPUTF8";
         } else {
-            advise (NULL, "SMTP server does not support %s, not sending.\n"
+            inform("SMTP server does not support %s, not sending.\n"
                     "Rebuild message with 7-bit headers, WITHOUT -headerencoding utf-8.",
                     EHLOset ("SMTPUTF8") ? "8BITMIME" : "SMTPUTF8");
             sm_end (NOTOK);
@@ -469,7 +469,7 @@ sm_winit (char *from, int smtputf8, int eightbit)
         if (EHLOset ("8BITMIME")) {
             mail_parameters = " BODY=8BITMIME";
         } else {
-            advise (NULL, "SMTP server does not support 8BITMIME, not sending.\n"
+            inform("SMTP server does not support 8BITMIME, not sending.\n"
                     "Suggest encoding message for 7-bit transport by setting your\n"
                     "locale to C, and/or specifying *b64 in mhbuild directives.");
             sm_end (NOTOK);
@@ -623,7 +623,8 @@ sm_end (int type)
 	case NOTOK: 
 	    sm_note.code = sm_reply.code;
 	    sm_note.length = sm_reply.length;
-	    memcpy (sm_note.text, sm_reply.text, sm_reply.length + 1);/* fall */
+	    memcpy (sm_note.text, sm_reply.text, sm_reply.length + 1);
+	    /* FALLTHRU */
 	case DONE: 
 	    if (smtalk (SM_RSET, "RSET") == 250 && type == DONE)
 		return RP_OK;
@@ -764,7 +765,8 @@ sm_wstream (char *buffer, int len)
 		    if (netsec_write(nsc, ".", 1, &errstr) != OK) {
 		    sm_nerror(errstr);
 		    return NOTOK;
-		} /* FALL THROUGH */
+		}
+		/* FALLTHRU */
 
 	    default: 
 		sm_nl = FALSE;