uip: Replace some ints that are only ever 0 or 1 with bool.

[nmh] / sbr / fmt_compile.c

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index 4f60cebbd4ea880e5f57db84b52fc2085293cfd1..216b8e71b12799bf3985c506a7acc0cd6d4a77b0 100644 (file)
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -1,6 +1,4 @@
-
-/*
- * fmt_compile.c -- "compile" format strings for fmt_scan
+/* fmt_compile.c -- "compile" format strings for fmt_scan

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -37,7 +35,7 @@
  *
  * - Add code to fmttest.c to display your new function.
  *
  *
  * - Add code to fmttest.c to display your new function.
  *

- * - Document the new function in the mh-format(5) man page.
+ * - Document the new function in mh-format(5).

  *
  */
 
  *
  */
 


@@ -48,6 +46,7 @@
 #include <h/fmt_compile.h>
 #include <h/mts.h>
 #include <h/utils.h>
 #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>
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>


@@ -281,16 +280,17 @@ static struct colormap colortable[] = {
 /*
  * Find a component in the hash table.
  */
 /*
  * 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 { \
        NEW0(cm);\
 
 /* Add new component to the hash table */
 #define NEWCOMP(cm,name) do { \
        NEW0(cm);\

-       cm->c_name = getcpy(name);\
+       cm->c_name = mh_xstrdup(name);\

        cm->c_refcount++;\
        ncomp++;\
        i = CHASH(name);\
        cm->c_refcount++;\
        ncomp++;\
        i = CHASH(name);\


@@ -298,9 +298,8 @@ static struct colormap colortable[] = {
        wantcomp[i] = cm; \
        } while (0)
 
        wantcomp[i] = cm; \
        } while (0)
 

-#define NEWFMT (next_fp++)

 #define NEW_FP(type,fill,wid) do {\
 #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 */
        } while (0)
 
 /* Add (possibly new) component to the hash table */


@@ -353,11 +352,11 @@ lookup(char *name)
 
     while ((nm = t->name)) {
        if (*nm == c && strcmp (nm, name) == 0)
 
     while ((nm = t->name)) {
        if (*nm == c && strcmp (nm, name) == 0)

-           return (ftbl = t);
+           return ftbl = t;

 
        t++;
     }
 
        t++;
     }

-    return (struct ftable *) 0;
+    return NULL;

 }
 
 
 }
 
 


@@ -367,7 +366,7 @@ compile_error(char *str, char *cp)
     int i, errpos, errctx;
 
     errpos = cp - format_string;
     int i, errpos, errctx;
 
     errpos = cp - format_string;

-    errctx = errpos > 20 ? 20 : errpos;
+    errctx = min(errpos, 20);

     usr_fstring[errpos] = '\0';
 
     for (i = errpos-errctx; i < errpos; i++) {
     usr_fstring[errpos] = '\0';
 
     for (i = errpos-errctx; i < errpos; i++) {


@@ -375,9 +374,9 @@ compile_error(char *str, char *cp)
            usr_fstring[i] = '_';
     }
 
            usr_fstring[i] = '_';
     }
 

-    advise(NULL, "\"%s\": format compile error - %s",
+    inform("\"%s\": format compile error - %s",

           &usr_fstring[errpos-errctx], str);
           &usr_fstring[errpos-errctx], str);

-    adios (NULL, "%*s", errctx+1, "^");
+    die("%*s", errctx+1, "^");

 }
 
 /*
 }
 
 /*


@@ -391,14 +390,14 @@ fmt_compile(char *fstring, struct format **fmt, int reset_comptable)
 {
     char *cp;
     size_t i;
 {
     char *cp;
     size_t i;

-    static int comptable_initialized = 0;
+    static bool comptable_initialized;

 
 

-    format_string = getcpy (fstring);
+    format_string = mh_xstrdup(fstring);

     usr_fstring = fstring;
 
     if (reset_comptable || !comptable_initialized) {
        free_comptable();
     usr_fstring = fstring;
 
     if (reset_comptable || !comptable_initialized) {
        free_comptable();

-       comptable_initialized = 1;
+       comptable_initialized = true;

     }
 
     /* it takes at least 4 char to generate one format so we
     }
 
     /* it takes at least 4 char to generate one format so we


@@ -420,7 +419,7 @@ fmt_compile(char *fstring, struct format **fmt, int reset_comptable)
     *fmt = formatvec;
 
     free(format_string);
     *fmt = formatvec;
 
     free(format_string);

-    return (ncomp);
+    return ncomp;

 }
 
 static char *
 }
 
 static char *


@@ -445,7 +444,7 @@ compile (char *sp)
            break;
        }
        if (c == 0)
            break;
        }
        if (c == 0)

-           return (cp);
+           return cp;

 
        switch (c = *++cp) {
        case '%':
 
        switch (c = *++cp) {
        case '%':


@@ -457,7 +456,7 @@ compile (char *sp)
        case '>':
        case '?':
        case ']':
        case '>':
        case '?':
        case ']':

-           return (cp);
+           return cp;

 
        case '<':
            cp = do_if(++cp);
 
        case '<':
            cp = do_if(++cp);


@@ -489,15 +488,13 @@ do_spec(char *sp)
 {
     char *cp = sp;
     int c;
 {
     char *cp = sp;
     int c;

-#ifndef        lint
-    int ljust = 0;
-#endif /* not lint */
+    bool ljust = false;

     int wid = 0;
     char fill = ' ';
 
     c = *cp++;
     if (c == '-') {
     int wid = 0;
     char fill = ' ';
 
     c = *cp++;
     if (c == '-') {

-       ljust++;
+       ljust = true;

        c = *cp++;
     }
     if (c == '0') {
        c = *cp++;
     }
     if (c == '0') {


@@ -532,7 +529,7 @@ do_spec(char *sp)
     fp->f_width = wid;
     fp->f_fill = fill;
 
     fp->f_width = wid;
     fp->f_fill = fill;
 

-    return (cp);
+    return cp;

 }
 
 /*
 }
 
 /*


@@ -546,7 +543,7 @@ do_name(char *sp, int preprocess)
     char *cp = sp;
     int c;
     int i;
     char *cp = sp;
     int c;
     int i;

-    static int primed = 0;
+    static bool primed;

 
     while (isalnum(c = *cp++) || c == '-' || c == '_')
        ;
 
     while (isalnum(c = *cp++) || c == '-' || c == '_')
        ;


@@ -562,7 +559,7 @@ do_name(char *sp, int preprocess)
            CERROR("component used as both date and address");
        }
        if (cm->c_tws) {
            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);
        }
        } else {
            NEW0(cm->c_tws);
        }


@@ -575,10 +572,10 @@ do_name(char *sp, int preprocess)
     case FT_GETMYMBOX:
     case FT_GETMYADDR:
        if (!primed) {
     case FT_GETMYMBOX:
     case FT_GETMYADDR:
        if (!primed) {

-           ismymbox ((struct mailname *) 0);
-           primed++;
+           ismymbox(NULL);
+           primed = true;

        }
        }

-       /* fall through */
+       /* FALLTHRU */

     case FT_PARSEADDR:
        if (cm->c_type & CT_DATE) {
            CERROR("component used as both date and address");
     case FT_PARSEADDR:
        if (cm->c_type & CT_DATE) {
            CERROR("component used as both date and address");


@@ -596,7 +593,7 @@ do_name(char *sp, int preprocess)
        cm->c_type |= CT_ADDR;
        break;
     }
        cm->c_type |= CT_ADDR;
        break;
     }

-    return (cp);
+    return cp;

 }
 
 /*
 }
 
 /*


@@ -735,12 +732,12 @@ do_func(char *sp)
     }
 
     case TF_NOW:
     }
 
     case TF_NOW:

-       LV(t->f_type, time((time_t *) 0));
+       LV(t->f_type, time(NULL));

        break;
 
     case TF_EXPR_SV:
        LV(FT_SAVESTR, 0);
        break;
 
     case TF_EXPR_SV:
        LV(FT_SAVESTR, 0);

-       /* fall through */
+       /* FALLTHRU */

     case TF_EXPR:
        *--cp = c;
        cp = do_expr(cp, t->extra);
     case TF_EXPR:
        *--cp = c;
        cp = do_expr(cp, t->extra);


@@ -760,7 +757,7 @@ do_func(char *sp)
        CERROR("')' expected");
     }
     --infunction;
        CERROR("')' expected");
     }
     --infunction;

-    return (cp);
+    return cp;

 }
 
 /*
 }
 
 /*


@@ -779,13 +776,13 @@ do_expr (char *sp, int preprocess)
     } else if (c == '(') {
        cp = do_func (cp);
     } else if (c == ')') {
     } else if (c == '(') {
        cp = do_func (cp);
     } else if (c == ')') {

-       return (--cp);
+       return --cp;

     } else if (c == '%' && *cp == '<') {
        cp = do_if (cp+1);
     } else {
        CERROR ("'(', '{', '%<' or ')' expected");
     }
     } else if (c == '%' && *cp == '<') {
        cp = do_if (cp+1);
     } else {
        CERROR ("'(', '{', '%<' or ')' expected");
     }

-    return (cp);
+    return cp;

 }
 
 /*
 }
 
 /*


@@ -799,7 +796,7 @@ do_expr (char *sp, int preprocess)
  *
  * Okay, got some more information on this from John L. Romine!  From an
  * email he sent to the nmh-workers mailing list on December 2, 2010, he
  *
  * Okay, got some more information on this from John L. Romine!  From an
  * email he sent to the nmh-workers mailing list on December 2, 2010, he

- * explains it thusly:
+ * explains it so:

  *
  *    In this case (scan, formatsbr) it has to do with an extension to
  *    the mh-format syntax to allow for looping.
  *
  *    In this case (scan, formatsbr) it has to do with an extension to
  *    the mh-format syntax to allow for looping.


@@ -857,7 +854,7 @@ do_if(char *sp)
 {
     char *cp = sp;
     struct format *fexpr,
 {
     char *cp = sp;
     struct format *fexpr,

-                          *fif = (struct format *)NULL;
+        *fif = NULL;

     int c = '<';
 
     for (;;) {
     int c = '<';
 
     for (;;) {


@@ -898,7 +895,7 @@ do_if(char *sp)
            fif = fp;                   /* loc of GOTO */
            fexpr->f_skip = next_fp - fexpr;
 
            fif = fp;                   /* loc of GOTO */
            fexpr->f_skip = next_fp - fexpr;
 

-           fexpr = (struct format *)NULL;/* no extra ENDIF */
+           fexpr = NULL;               /* no extra ENDIF */

 
            cp = compile (cp);          /* compile ELSE stmts */
            fif->f_skip = next_fp - fif;
 
            cp = compile (cp);          /* compile ELSE stmts */
            fif->f_skip = next_fp - fif;


@@ -922,7 +919,7 @@ do_if(char *sp)
     if (fexpr)                         /* IF ... [ELSIF ...] ENDIF */
        fexpr->f_skip = next_fp - fexpr;
 
     if (fexpr)                         /* IF ... [ELSIF ...] ENDIF */
        fexpr->f_skip = next_fp - fexpr;
 

-    return (cp);
+    return cp;

 }
 
 /*
 }
 
 /*


@@ -968,12 +965,11 @@ fmt_freecomptext(void)
     unsigned int i;
     struct comp *cm;
 
     unsigned int i;
     struct comp *cm;
 

-    for (i = 0; i < sizeof(wantcomp)/sizeof(wantcomp[0]); i++)
-       for (cm = wantcomp[i]; cm; cm = cm->c_next)
-           if (cm->c_text) {
-               free(cm->c_text);
-               cm->c_text = NULL;
-           }
+    for (i = 0; i < DIM(wantcomp); i++)
+        for (cm = wantcomp[i]; cm; cm = cm->c_next) {
+            free(cm->c_text);
+            cm->c_text = NULL;
+        }

 }
 
 /*
 }
 
 /*


@@ -1001,7 +997,7 @@ fmt_findcasecomp(char *component)
     struct comp *cm;
 
     for (cm = wantcomp[CHASH(component)]; cm; cm = cm->c_next)
     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;
            break;
 
     return cm;


@@ -1048,13 +1044,15 @@ fmt_addcompentry(char *component)
 int
 fmt_addcomptext(char *component, char *text)
 {
 int
 fmt_addcomptext(char *component, char *text)
 {

-    int i, found = 0, bucket = CHASH(component);
+    int i;
+    bool found = false;
+    int bucket = CHASH(component);

     struct comp *cptr = wantcomp[bucket];
     char *cp;
 
     while (cptr) {
     struct comp *cptr = wantcomp[bucket];
     char *cp;
 
     while (cptr) {

-       if (strcasecmp(component, cptr->c_name ? cptr->c_name : "") == 0) {
-           found++;
+       if (strcasecmp(component, FENDNULL(cptr->c_name)) == 0) {
+           found = true;

            if (! cptr->c_text) {
                cptr->c_text = getcpy(text);
            } else {
            if (! cptr->c_text) {
                cptr->c_text = getcpy(text);
            } else {


@@ -1088,7 +1086,7 @@ fmt_appendcomp(int bucket, char *component, char *text)
 
     if (bucket != -1) {
        for (cptr = wantcomp[bucket]; cptr; cptr = cptr->c_next)
 
     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);
     }
 }
                cptr->c_text = add(text, cptr->c_text);
     }
 }


@@ -1105,7 +1103,7 @@ fmt_nextcomp(struct comp *comp, unsigned int *bucket)
     else
        comp = comp->c_next;
 
     else
        comp = comp->c_next;
 

-    while (comp == NULL && *bucket < sizeof(wantcomp)/sizeof(wantcomp[0])) {
+    while (comp == NULL && *bucket < DIM(wantcomp)) {

        comp = wantcomp[(*bucket)++];
     }
 
        comp = wantcomp[(*bucket)++];
     }
 


@@ -1122,7 +1120,7 @@ free_comptable(void)
     unsigned int i;
     struct comp *cm, *cm2;
 
     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;
        cm = wantcomp[i];
        while (cm != NULL) {
            cm2 = cm->c_next;


@@ -1145,10 +1143,8 @@ free_component(struct comp *cm)
 {
     if (--cm->c_refcount <= 0) {
        /* Shouldn't ever be NULL, but just in case ... */
 {
     if (--cm->c_refcount <= 0) {
        /* Shouldn't ever be NULL, but just in case ... */

-       if (cm->c_name)
-           free(cm->c_name);
-       if (cm->c_text)
-           free(cm->c_text);
+        free(cm->c_name);
+        free(cm->c_text);

        if (cm->c_type & CT_DATE)
            free(cm->c_tws);
        if (cm->c_type & CT_ADDR && cm->c_mn && cm->c_mn != &fmt_mnull)
        if (cm->c_type & CT_DATE)
            free(cm->c_tws);
        if (cm->c_type & CT_ADDR && cm->c_mn && cm->c_mn != &fmt_mnull)