X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/337b4e616e8f53ba06285b1645e1df9918ed5c16..d253d4786c1712e9015474fae318e4e0a239ba88:/uip/fmttest.c

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 90df1e9e..b0c869cb 100644
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -351,7 +351,7 @@ main (int argc, char **argv)
 	if (trace) {
 	    struct trace_context *ctx;
 
-	    ctx = mh_xmalloc(sizeof(*ctx));
+	    NEW(ctx);
 	    ctx->num = -1;
 	    ctx->str = dummy;
 	    ctx->outbuf = getcpy(NULL);
@@ -420,8 +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)
-	    	adios (NULL, "unable to allocate pqpair memory");
+	    NEW0(p);
 	    if ((mp = getm(cp, NULL, 0, error, sizeof(error))) == NULL) {
 	    	p->pq_text = getcpy(cp);
 		p->pq_error = getcpy(error);
@@ -778,7 +777,7 @@ fmt_dump (char *nfs, struct format *fmth)
 static void
 dumpone(struct format *fmt)
 {
-	register int i;
+	int i;
 
 	if ((i = findlabel(fmt)) >= 0)
 		printf("L%d:", i);
@@ -846,6 +845,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)
@@ -918,6 +919,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);
@@ -987,7 +989,7 @@ initlabels(struct format *fmth)
 static int
 findlabel(struct format *addr)
 {
-	register int i;
+	int i;
 
 	for (i = 0; i < lused; ++i)
 		if (addr == lvec[i])
@@ -1042,6 +1044,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");
@@ -1086,6 +1089,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
@@ -1218,13 +1223,13 @@ static unsigned int bufsiz=0;	/* current size of buf */
 static char *
 test_formataddr (char *orig, char *str)
 {
-    register int len;
+    int len;
     char error[BUFSIZ];
-    register int isgroup;
-    register char *dst;
-    register char *cp;
-    register char *sp;
-    register struct mailname *mp = NULL;
+    int isgroup;
+    char *dst;
+    char *cp;
+    char *sp;
+    struct mailname *mp = NULL;
 
     /* if we don't have a buffer yet, get one */
     if (bufsiz == 0) {
@@ -1334,8 +1339,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);
     }
 }