X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/00796ec24ea3589cce262fcad15a23b70576de47..d247f1cf67f3e579ccddfa986c603dd91880cbe7:/sbr/fmt_compile.c

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index 6173be33..ff0cf013 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>
@@ -279,11 +280,12 @@ static struct colormap colortable[] = {
 /*
  * Find a component in the hash table.
  */
-#define FINDCOMP(comp,name) \
-		for (comp = wantcomp[CHASH(name)]; \
-		     comp && strcmp(comp->c_name,name); \
-		     comp = comp->c_next) \
-		;
+#define FINDCOMP(comp,name) do { \
+        for (comp = wantcomp[CHASH(name)]; \
+            comp && strcmp(comp->c_name,name); \
+            comp = comp->c_next) \
+        ; \
+    } while (0)
 
 /* Add new component to the hash table */
 #define NEWCOMP(cm,name) do { \
@@ -354,7 +356,7 @@ lookup(char *name)
 
 	t++;
     }
-    return (struct ftable *) 0;
+    return NULL;
 }
 
 
@@ -559,7 +561,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);
 	}
@@ -572,7 +574,7 @@ do_name(char *sp, int preprocess)
     case FT_GETMYMBOX:
     case FT_GETMYADDR:
 	if (!primed) {
-	    ismymbox ((struct mailname *) 0);
+	    ismymbox(NULL);
 	    primed++;
 	}
 	/* FALLTHRU */
@@ -732,7 +734,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:
@@ -965,7 +967,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;
@@ -1101,7 +1103,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)++];
     }
 
@@ -1118,7 +1120,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;