X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/47e4d2685ab31e71336a7806fdc3dcd2a107f60f..5977791e005446f4cd8b2f04bfb14c8cd265df8a:/sbr/fmt_compile.c

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index 33f34efe..3930f8ca 100644
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -46,6 +46,7 @@
 #include <h/fmt_compile.h>
 #include <h/mts.h>
 #include <h/utils.h>
+#include "terminal.h"
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
@@ -296,9 +297,8 @@ static struct colormap colortable[] = {
 	wantcomp[i] = cm; \
 	} while (0)
 
-#define NEWFMT (next_fp++)
 #define NEW_FP(type,fill,wid) do {\
-	fp=NEWFMT; fp->f_type=(type); fp->f_fill=(fill); fp->f_width=(wid); \
+	fp=next_fp++; fp->f_type=(type); fp->f_fill=(fill); fp->f_width=(wid); \
 	} while (0)
 
 /* Add (possibly new) component to the hash table */
@@ -355,7 +355,7 @@ lookup(char *name)
 
 	t++;
     }
-    return (struct ftable *) 0;
+    return NULL;
 }
 
 
@@ -560,7 +560,7 @@ do_name(char *sp, int preprocess)
 	    CERROR("component used as both date and address");
 	}
 	if (cm->c_tws) {
-	    memset (cm->c_tws, 0, sizeof *cm->c_tws);
+	    ZERO(cm->c_tws);
 	} else {
 	    NEW0(cm->c_tws);
 	}
@@ -573,7 +573,7 @@ do_name(char *sp, int preprocess)
     case FT_GETMYMBOX:
     case FT_GETMYADDR:
 	if (!primed) {
-	    ismymbox ((struct mailname *) 0);
+	    ismymbox(NULL);
 	    primed++;
 	}
 	/* FALLTHRU */
@@ -733,7 +733,7 @@ do_func(char *sp)
     }
 
     case TF_NOW:
-	LV(t->f_type, time((time_t *) 0));
+	LV(t->f_type, time(NULL));
 	break;
 
     case TF_EXPR_SV:
@@ -966,7 +966,7 @@ fmt_freecomptext(void)
     unsigned int i;
     struct comp *cm;
 
-    for (i = 0; i < sizeof(wantcomp)/sizeof(wantcomp[0]); i++)
+    for (i = 0; i < DIM(wantcomp); i++)
         for (cm = wantcomp[i]; cm; cm = cm->c_next) {
             mh_xfree(cm->c_text);
             cm->c_text = NULL;
@@ -998,7 +998,7 @@ fmt_findcasecomp(char *component)
     struct comp *cm;
 
     for (cm = wantcomp[CHASH(component)]; cm; cm = cm->c_next)
-	if (strcasecmp(component, cm->c_name ? cm->c_name : "") == 0)
+	if (strcasecmp(component, FENDNULL(cm->c_name)) == 0)
 	    break;
 
     return cm;
@@ -1050,7 +1050,7 @@ fmt_addcomptext(char *component, char *text)
     char *cp;
 
     while (cptr) {
-	if (strcasecmp(component, cptr->c_name ? cptr->c_name : "") == 0) {
+	if (strcasecmp(component, FENDNULL(cptr->c_name)) == 0) {
 	    found++;
 	    if (! cptr->c_text) {
 		cptr->c_text = getcpy(text);
@@ -1085,7 +1085,7 @@ fmt_appendcomp(int bucket, char *component, char *text)
 
     if (bucket != -1) {
     	for (cptr = wantcomp[bucket]; cptr; cptr = cptr->c_next)
-	    if (strcasecmp(component, cptr->c_name ? cptr->c_name : "") == 0)
+	    if (strcasecmp(component, FENDNULL(cptr->c_name)) == 0)
 	    	cptr->c_text = add(text, cptr->c_text);
     }
 }
@@ -1102,7 +1102,7 @@ fmt_nextcomp(struct comp *comp, unsigned int *bucket)
     else
 	comp = comp->c_next;
 
-    while (comp == NULL && *bucket < sizeof(wantcomp)/sizeof(wantcomp[0])) {
+    while (comp == NULL && *bucket < DIM(wantcomp)) {
 	comp = wantcomp[(*bucket)++];
     }
 
@@ -1119,7 +1119,7 @@ free_comptable(void)
     unsigned int i;
     struct comp *cm, *cm2;
 
-    for (i = 0; i < sizeof(wantcomp)/sizeof(wantcomp[0]); i++) {
+    for (i = 0; i < DIM(wantcomp); i++) {
     	cm = wantcomp[i];
 	while (cm != NULL) {
 	    cm2 = cm->c_next;