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 ff0cf0137e39fca7663ee0270fd31d9583469ea2..216b8e71b12799bf3985c506a7acc0cd6d4a77b0 100644 (file)
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -35,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).

  *
  */
 
  *
  */
 


@@ -352,7 +352,7 @@ 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++;
     }


@@ -376,7 +376,7 @@ compile_error(char *str, char *cp)
 
     inform("\"%s\": format compile error - %s",
           &usr_fstring[errpos-errctx], str);
 
     inform("\"%s\": format compile error - %s",
           &usr_fstring[errpos-errctx], str);

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

 }
 
 /*
 }
 
 /*


@@ -390,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 = mh_xstrdup(fstring);
     usr_fstring = fstring;
 
     if (reset_comptable || !comptable_initialized) {
        free_comptable();
 
     format_string = mh_xstrdup(fstring);
     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


@@ -419,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 *


@@ -444,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 '%':


@@ -456,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);


@@ -488,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') {


@@ -531,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;

 }
 
 /*
 }
 
 /*


@@ -545,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 == '_')
        ;


@@ -575,7 +573,7 @@ do_name(char *sp, int preprocess)
     case FT_GETMYADDR:
        if (!primed) {
            ismymbox(NULL);
     case FT_GETMYADDR:
        if (!primed) {
            ismymbox(NULL);

-           primed++;
+           primed = true;

        }
        /* FALLTHRU */
     case FT_PARSEADDR:
        }
        /* FALLTHRU */
     case FT_PARSEADDR:


@@ -595,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;

 }
 
 /*
 }
 
 /*


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

-    return (cp);
+    return cp;

 }
 
 /*
 }
 
 /*


@@ -778,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;

 }
 
 /*
 }
 
 /*


@@ -856,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 (;;) {


@@ -897,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;


@@ -921,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;

 }
 
 /*
 }
 
 /*


@@ -969,7 +967,7 @@ fmt_freecomptext(void)
 
     for (i = 0; i < DIM(wantcomp); i++)
         for (cm = wantcomp[i]; cm; cm = cm->c_next) {
 
     for (i = 0; i < DIM(wantcomp); i++)
         for (cm = wantcomp[i]; cm; cm = cm->c_next) {

-            mh_xfree(cm->c_text);
+            free(cm->c_text);

             cm->c_text = NULL;
         }
 }
             cm->c_text = NULL;
         }
 }


@@ -1046,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) {
        if (strcasecmp(component, FENDNULL(cptr->c_name)) == 0) {
     struct comp *cptr = wantcomp[bucket];
     char *cp;
 
     while (cptr) {
        if (strcasecmp(component, FENDNULL(cptr->c_name)) == 0) {

-           found++;
+           found = true;

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


@@ -1143,8 +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 ... */

-        mh_xfree(cm->c_name);
-        mh_xfree(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)