X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/177f020f122827214159c46dcfe7ded1e3c8d1c3..d3e11c5e9:/uip/fmttest.c?ds=sidebyside

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 8aa74e45..ccfe25c0 100644
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -11,6 +11,7 @@
 #include <h/utils.h>
 #include <h/scansbr.h>
 #include <h/addrsbr.h>
+#include "../sbr/m_maildir.h"
 
 #define FMTTEST_SWITCHES \
     X("form formatfile", 0, FORMSW) \
@@ -510,7 +511,7 @@ process_messages(struct format *fmt, struct msgs_array *comps,
 	    done(1);
     seq_setprev(mp);			/* set the Previous-Sequence */
 
-    context_replace(pfolder, folder);	/* update curren folder */
+    context_replace(pfolder, folder);	/* update current folder */
     seq_save(mp);			/* synchronize message sequences */
     context_save();			/* save the context file */
 
@@ -571,7 +572,6 @@ process_messages(struct format *fmt, struct msgs_array *comps,
 
     ivector_free (seqnum);
     folder_free(mp);
-    return;
 }
 
 /*
@@ -603,7 +603,7 @@ process_single_file(FILE *in, struct msgs_array *comps, int *dat, int msgsize,
     }
 
     /*
-     * Initialize everyting else
+     * Initialize everything else
      */
 
     if (dat[0] == -1)
@@ -647,7 +647,7 @@ process_single_file(FILE *in, struct msgs_array *comps, int *dat, int msgsize,
 
 		fmt_addcomptext("body", rbuf);
 	    }
-	    /* FALLTHRU */
+	    goto finished;
 
 	default:
 	    goto finished;
@@ -1303,10 +1303,10 @@ insert (struct mailname *np)
 	return 0;
 
     for (mp = &mq; mp->m_next; mp = mp->m_next) {
-	if (!strcasecmp (np->m_host ? np->m_host : "",
-			 mp->m_next->m_host ? mp->m_next->m_host : "") &&
-	    !strcasecmp (np->m_mbox ? np->m_mbox : "",
-			 mp->m_next->m_mbox ? mp->m_next->m_mbox : ""))
+	if (!strcasecmp (FENDNULL(np->m_host),
+			 FENDNULL(mp->m_next->m_host)) &&
+	    !strcasecmp (FENDNULL(np->m_mbox),
+			 FENDNULL(mp->m_next->m_mbox)))
 	    return 0;
     }
     if (!ccme && ismymbox (np))