X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/592b3e1bc2a812515c5e2d01f087ec0aa2d4e8e4..f345b9b480296b4b6a8469d6221752893c5d1420:/uip/fmttest.c

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 850e2d08..712d7df2 100644
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -420,7 +420,7 @@ process_addresses(struct format *fmt, struct msgs_array *addrs,
     for (i = 0; i < addrs->size; i++) {
     	(q = &pq)->pq_next = NULL;
 	while ((cp = getname(addrs->msgs[i]))) {
-	    if ((p = (struct pqpair *) calloc ((size_t) 1, sizeof(*p))) == NULL)
+	    if ((p = (struct pqpair *) mh_xcalloc ((size_t) 1, sizeof(*p))) == NULL)
 	    	adios (NULL, "unable to allocate pqpair memory");
 	    if ((mp = getm(cp, NULL, 0, error, sizeof(error))) == NULL) {
 	    	p->pq_text = getcpy(cp);
@@ -625,7 +625,7 @@ process_single_file(FILE *in, struct msgs_array *comps, int *dat, int msgsize,
      * Read in the message and process the components
      */
 
-    for (state = FLD;;) {
+    for (;;) {
 	bufsz = sizeof(rbuf);
 	state = m_getfld(&gstate, name, rbuf, &bufsz, in);
 	switch (state) {
@@ -650,8 +650,7 @@ process_single_file(FILE *in, struct msgs_array *comps, int *dat, int msgsize,
 	    if (fmt_findcomp("body")) {
 		if ((i = strlen(rbuf)) < outwidth) {
 		    bufsz = min (outwidth, (int) sizeof rbuf - i);
-		    state = m_getfld(&gstate, name, rbuf + i,
-				     &bufsz, in);
+		    m_getfld(&gstate, name, rbuf + i, &bufsz, in);
 		}
 
 		fmt_addcomptext("body", rbuf);
@@ -847,6 +846,8 @@ dumpone(struct format *fmt)
 	case FT_LS_FRIENDLY:
 	case FT_PARSEADDR:
 	case FT_MYMBOX:
+	case FT_GETMYMBOX:
+	case FT_GETMYADDR:
 		printf(", c_name ");
 		litputs(fmt->f_comp->c_name);
 		if (fmt->f_comp->c_type)
@@ -919,6 +920,7 @@ dumpone(struct format *fmt)
 	case FT_LV_LIT:
 	case FT_LV_PLUS_L:
 	case FT_LV_MINUS_L:
+	case FT_LV_MULTIPLY_L:
 	case FT_LV_DIVIDE_L:
 	case FT_LV_MODULO_L:
 		printf(" value %d", fmt->f_value);
@@ -1043,6 +1045,7 @@ f_typestr(int t)
 	case FT_LV_STRLEN: return("LV_STRLEN");
 	case FT_LV_PLUS_L: return("LV_PLUS_L");
 	case FT_LV_MINUS_L: return("LV_MINUS_L");
+	case FT_LV_MULTIPLY_L: return("LV_MULTIPLY_L");
 	case FT_LV_DIVIDE_L: return("LV_DIVIDE_L");
 	case FT_LV_MODULO_L: return("LV_MODULO_L");
 	case FT_LV_CHAR_LEFT: return("LV_CHAR_LEFT");
@@ -1087,6 +1090,8 @@ f_typestr(int t)
 	case FT_FORMATADDR: return("FORMATADDR");
 	case FT_CONCATADDR: return("CONCATADDR");
 	case FT_MYMBOX: return("MYMBOX");
+	case FT_GETMYMBOX: return("GETMYMBOX");
+	case FT_GETMYADDR: return("GETMYADDR");
 #ifdef	FT_ADDTOSEQ
 	case FT_ADDTOSEQ: return("ADDTOSEQ");
 #endif
@@ -1335,8 +1340,8 @@ mlistfree(void)
 {
     struct mailname *mp, *mp2;
 
-    for (mp = mq.m_next; mp; mp = mp2->m_next) {
-    	mp2 = mp;
+    for (mp = mq.m_next; mp; mp = mp2) {
+	mp2 = mp->m_next;
 	mnfree(mp);
     }
 }