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

Knowing the domain of the variable is Boolean aids comprehension of the
variable's name and purpose.

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index eadf1d07443e71a1bc3399e33b4181d3017cd0a5..e55c15aadd4d59e67426303d9d69a94fa26d3a4c 100644 (file)
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -270,7 +270,7 @@ auxformat (struct mailname *mp, int extras)
 bool
 ismymbox (struct mailname *np)
 {
 bool
 ismymbox (struct mailname *np)
 {

-    int oops;
+    bool oops;

     int len, i;
     char *cp;
     char *pp;
     int len, i;
     char *cp;
     char *pp;


@@ -278,7 +278,7 @@ ismymbox (struct mailname *np)
     struct mailname *mp;
     static char *am = NULL;
     static struct mailname mq;
     struct mailname *mp;
     static char *am = NULL;
     static struct mailname mq;

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

 
     /*
      * If this is the first call, initialize
 
     /*
      * If this is the first call, initialize


@@ -290,7 +290,7 @@ ismymbox (struct mailname *np)
 
        if ((am = context_find ("local-mailbox"))) {
 
 
        if ((am = context_find ("local-mailbox"))) {
 

-           localmailbox++;
+           localmailbox = true;

 
            if ((cp = getname(am)) == NULL) {
                inform("Unable to find address in local-mailbox, continuing...");
 
            if ((cp = getname(am)) == NULL) {
                inform("Unable to find address in local-mailbox, continuing...");


@@ -312,11 +312,11 @@ ismymbox (struct mailname *np)
            am = getusername();
        else {
            mp = mq.m_next ? mq.m_next : &mq;
            am = getusername();
        else {
            mp = mq.m_next ? mq.m_next : &mq;

-           oops = 0;
+           oops = false;

            while ((cp = getname (am))) {
                if ((mp->m_next = getm (cp, NULL, 0, NULL, 0)) == NULL) {
                    inform("illegal address: %s, continuing...", cp);
            while ((cp = getname (am))) {
                if ((mp->m_next = getm (cp, NULL, 0, NULL, 0)) == NULL) {
                    inform("illegal address: %s, continuing...", cp);

-                   oops++;
+                   oops = true;

                } else {
                    mp = mp->m_next;
                    mp->m_type = W_NIL;
                } else {
                    mp = mp->m_next;
                    mp->m_type = W_NIL;

diff --git a/sbr/encode_rfc2047.c b/sbr/encode_rfc2047.c
index e7ccd308ab0bd962be121558a90948742bb0ddb4..be74c67ceeaf4be346ede546e86476a25add7199 100644 (file)
--- a/sbr/encode_rfc2047.c
+++ b/sbr/encode_rfc2047.c
@@ -552,7 +552,11 @@ field_encode_address(const char *name, char **value, int encoding,
                     const char *charset)
 {
     int prefixlen = strlen(name) + 2, column = prefixlen, groupflag;
                     const char *charset)
 {
     int prefixlen = strlen(name) + 2, column = prefixlen, groupflag;

-    int asciichars, specialchars, eightbitchars, reformat = 0, errflag = 0;
+    int asciichars;
+    int specialchars;
+    int eightbitchars;
+    bool reformat = false;
+    bool errflag = false;

     size_t len;
     char *mp, *cp = NULL, *output = NULL;
     char *tmpbuf = NULL;
     size_t len;
     char *mp, *cp = NULL, *output = NULL;
     char *tmpbuf = NULL;


@@ -577,11 +581,11 @@ field_encode_address(const char *name, char **value, int encoding,
     for (groupflag = 0; (mp = getname(*value)); ) {
        if ((mn = getm(mp, NULL, 0, errbuf, sizeof(errbuf))) == NULL) {
            inform("%s: %s", errbuf, mp);
     for (groupflag = 0; (mp = getname(*value)); ) {
        if ((mn = getm(mp, NULL, 0, errbuf, sizeof(errbuf))) == NULL) {
            inform("%s: %s", errbuf, mp);

-           errflag++;
+           errflag = true;

            continue;
        }
 
            continue;
        }
 

-       reformat = 0;
+       reformat = false;

 
        /*
         * We only care if the phrase (m_pers) or any trailing comment
 
        /*
         * We only care if the phrase (m_pers) or any trailing comment


@@ -620,7 +624,7 @@ field_encode_address(const char *name, char **value, int encoding,
 
            case CE_BASE64:
                if (field_encode_base64(NULL, &mn->m_pers, charset)) {
 
            case CE_BASE64:
                if (field_encode_base64(NULL, &mn->m_pers, charset)) {

-                   errflag++;
+                   errflag = true;

                    goto out;
                }
                break;
                    goto out;
                }
                break;


@@ -628,18 +632,18 @@ field_encode_address(const char *name, char **value, int encoding,
            case CE_QUOTED:
                if (field_encode_quoted(NULL, &mn->m_pers, charset, asciichars,
                                        eightbitchars + specialchars, 1)) {
            case CE_QUOTED:
                if (field_encode_quoted(NULL, &mn->m_pers, charset, asciichars,
                                        eightbitchars + specialchars, 1)) {

-                   errflag++;
+                   errflag = true;

                    goto out;
                }
                break;
 
            default:
                inform("Internal error: unknown RFC-2047 encoding type");
                    goto out;
                }
                break;
 
            default:
                inform("Internal error: unknown RFC-2047 encoding type");

-               errflag++;
+               errflag = true;

                goto out;
            }
 
                goto out;
            }
 

-           reformat++;
+           reformat = true;

        }
 
        check_note:
        }
 
        check_note:


@@ -662,7 +666,7 @@ field_encode_address(const char *name, char **value, int encoding,
        if (mn->m_note[0] != '(' || mn->m_note[len - 1] != ')') {
            inform("Internal error: Invalid note field \"%s\"",
                   mn->m_note);
        if (mn->m_note[0] != '(' || mn->m_note[len - 1] != ')') {
            inform("Internal error: Invalid note field \"%s\"",
                   mn->m_note);

-           errflag++;
+           errflag = true;

            goto out;
        }
 
            goto out;
        }
 


@@ -683,7 +687,7 @@ field_encode_address(const char *name, char **value, int encoding,
 
            case CE_BASE64:
                if (field_encode_base64(NULL, &tmpbuf, charset)) {
 
            case CE_BASE64:
                if (field_encode_base64(NULL, &tmpbuf, charset)) {

-                   errflag++;
+                   errflag = true;

                    goto out;
                }
                break;
                    goto out;
                }
                break;


@@ -691,18 +695,18 @@ field_encode_address(const char *name, char **value, int encoding,
            case CE_QUOTED:
                if (field_encode_quoted(NULL, &tmpbuf, charset, asciichars,
                                        eightbitchars + specialchars, 1)) {
            case CE_QUOTED:
                if (field_encode_quoted(NULL, &tmpbuf, charset, asciichars,
                                        eightbitchars + specialchars, 1)) {

-                   errflag++;
+                   errflag = true;

                    goto out;
                }
                break;
 
            default:
                inform("Internal error: unknown RFC-2047 encoding type");
                    goto out;
                }
                break;
 
            default:
                inform("Internal error: unknown RFC-2047 encoding type");

-               errflag++;
+               errflag = true;

                goto out;
            }
 
                goto out;
            }
 

-           reformat++;
+           reformat = true;

 
            /*
             * Make sure the size of tmpbuf is correct (it always gets
 
            /*
             * Make sure the size of tmpbuf is correct (it always gets


@@ -803,7 +807,7 @@ out:
     free(tmpbuf);
     free(output);
 
     free(tmpbuf);
     free(output);
 

-    return errflag > 0;
+    return errflag;

 }
 
 /*
 }
 
 /*

diff --git a/sbr/fmt_addr.c b/sbr/fmt_addr.c
index 2c7b58e423579c442e4a5ef9058adf54b6254aa3..4684fa7f1a76ddc30f4164c1ef8485a4314079f6 100644 (file)
--- a/sbr/fmt_addr.c
+++ b/sbr/fmt_addr.c
@@ -50,7 +50,7 @@ char *
 formataddr (char *orig, char *str)
 {
     int len;
 formataddr (char *orig, char *str)
 {
     int len;

-    int isgroup;
+    bool isgroup;

     char *dst;
     char *cp;
     char *sp;
     char *dst;
     char *cp;
     char *sp;


@@ -79,13 +79,13 @@ formataddr (char *orig, char *str)
     }
 
     /* concatenate all the new addresses onto 'buf' */
     }
 
     /* concatenate all the new addresses onto 'buf' */

-    for (isgroup = 0; (cp = getname (str)); ) {
+    for (isgroup = false; (cp = getname (str)); ) {

        if ((mp = getm (cp, NULL, 0, NULL, 0)) == NULL)
            continue;
 
        if (isgroup && (mp->m_gname || !mp->m_ingrp)) {
            *dst++ = ';';
        if ((mp = getm (cp, NULL, 0, NULL, 0)) == NULL)
            continue;
 
        if (isgroup && (mp->m_gname || !mp->m_ingrp)) {
            *dst++ = ';';

-           isgroup = 0;
+           isgroup = false;

        }
        /* if we get here we're going to add an address */
        if (dst != buf) {
        }
        /* if we get here we're going to add an address */
        if (dst != buf) {


@@ -95,7 +95,7 @@ formataddr (char *orig, char *str)
        if (mp->m_gname) {
            CHECKMEM (mp->m_gname);
            CPY (mp->m_gname);
        if (mp->m_gname) {
            CHECKMEM (mp->m_gname);
            CPY (mp->m_gname);

-           isgroup++;
+           isgroup = true;

        }
        sp = adrformat (mp);
        CHECKMEM (sp);
        }
        sp = adrformat (mp);
        CHECKMEM (sp);

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index ce32414f13760aeb0f10f3783314314dce0a0994..216b8e71b12799bf3985c506a7acc0cd6d4a77b0 100644 (file)
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -488,13 +488,13 @@ do_spec(char *sp)
 {
     char *cp = sp;
     int c;
 {
     char *cp = sp;
     int c;

-    int ljust = 0;
+    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') {


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


@@ -573,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:


@@ -1044,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 {

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 2e547286fd81e3c1e3771a7806aa710a0167916c..3c93a5a70b856f7564e86306fa518cdb0b40d7fe 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -122,7 +122,7 @@ cpnumber(charstring_t dest, int num, int wid, char fill, size_t max) {
 void
 cptrimmed(charstring_t dest, char *str, int wid, char fill, size_t max) {
     int remaining;     /* remaining output width available */
 void
 cptrimmed(charstring_t dest, char *str, int wid, char fill, size_t max) {
     int remaining;     /* remaining output width available */

-    int rjust;
+    bool rjust;

     struct charstring *trimmed;
     size_t end;        /* number of input bytes remaining in str */
 #ifdef MULTIBYTE_SUPPORT
     struct charstring *trimmed;
     size_t end;        /* number of input bytes remaining in str */
 #ifdef MULTIBYTE_SUPPORT


@@ -134,10 +134,10 @@ cptrimmed(charstring_t dest, char *str, int wid, char fill, size_t max) {
     char *sp;          /* current position in source string */
 
     /* get alignment */
     char *sp;          /* current position in source string */
 
     /* get alignment */

-    rjust = 0;
+    rjust = false;

     if ((remaining = wid) < 0) {
        remaining = -remaining;
     if ((remaining = wid) < 0) {
        remaining = -remaining;

-       rjust++;
+       rjust = true;

     }
     if (remaining > (int) max) { remaining = max; }
 
     }
     if (remaining > (int) max) { remaining = max; }
 


@@ -396,7 +396,8 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
     char *sp;
     char *savestr, *str;
     char buffer[NMH_BUFSIZ], buffer2[NMH_BUFSIZ];
     char *sp;
     char *savestr, *str;
     char buffer[NMH_BUFSIZ], buffer2[NMH_BUFSIZ];

-    int i, c, rjust;
+    int i, c;
+    bool rjust;

     int value;
     time_t t;
     size_t max;
     int value;
     time_t t;
     size_t max;


@@ -464,11 +465,11 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
            break;
        case FT_LITF:
            sp = fmt->f_text;
            break;
        case FT_LITF:
            sp = fmt->f_text;

-           rjust = 0;
+           rjust = false;

            i = fmt->f_width;
            if (i < 0) {
                i = -i;
            i = fmt->f_width;
            if (i < 0) {
                i = -i;

-               rjust++;                /* XXX should do something with this */
+               rjust = true;           /* XXX should do something with this */

            }
            while ((c = *sp++) && --i >= 0 && charstring_chars (scanlp) < max) {
                charstring_push_back (scanlp, c);
            }
            while ((c = *sp++) && --i >= 0 && charstring_chars (scanlp) < max) {
                charstring_push_back (scanlp, c);


@@ -723,10 +724,10 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
                    str = buffer;
                    while (isspace((unsigned char) *str))
                            str++;
                    str = buffer;
                    while (isspace((unsigned char) *str))
                            str++;

-                   rjust = 0;
+                   rjust = false;

                    if ((i = fmt->f_width) < 0) {
                            i = -i;
                    if ((i = fmt->f_width) < 0) {
                            i = -i;

-                           rjust++;
+                           rjust = true;

                    }
 
                    if (!rjust && i > 0 && (int) strlen(str) > i)
                    }
 
                    if (!rjust && i > 0 && (int) strlen(str) > i)

diff --git a/sbr/netsec.c b/sbr/netsec.c
index ab49046745bbb4040e3ebb2053749950b323c040..1fe8f1ae5b04df7a6b2e84e43e3afa8e5c4134a8 100644 (file)
--- a/sbr/netsec.c
+++ b/sbr/netsec.c
@@ -30,7 +30,7 @@ static int netsec_get_user(void *context, int id, const char **result,
 static int netsec_get_password(sasl_conn_t *conn, void *context, int id,
                               sasl_secret_t **psecret);
 
 static int netsec_get_password(sasl_conn_t *conn, void *context, int id,
                               sasl_secret_t **psecret);
 

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

 
 #define SASL_MAXRECVBUF 65536
 #endif /* CYRUS_SASL */
 
 #define SASL_MAXRECVBUF 65536
 #endif /* CYRUS_SASL */


@@ -39,7 +39,7 @@ static int sasl_initialized = 0;
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 

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

 static SSL_CTX *sslctx = NULL;         /* SSL Context */
 
 #endif /* TLS_SUPPORT */
 static SSL_CTX *sslctx = NULL;         /* SSL Context */
 
 #endif /* TLS_SUPPORT */


@@ -1032,7 +1032,7 @@ netsec_set_sasl_params(netsec_context *nsc, const char *service,
                       sasl_errstring(retval, NULL, NULL));
            return NOTOK;
        }
                       sasl_errstring(retval, NULL, NULL));
            return NOTOK;
        }

-       sasl_initialized++;
+       sasl_initialized = true;

     }
 
     /*
     }
 
     /*


@@ -1550,7 +1550,7 @@ netsec_set_tls(netsec_context *nsc, int tls, int noverify, char **errstr)
                return NOTOK;
            }
 
                return NOTOK;
            }
 

-           tls_initialized++;
+           tls_initialized = true;

        }
 
        if (nsc->ns_readfd == -1 || nsc->ns_writefd == -1) {
        }
 
        if (nsc->ns_readfd == -1 || nsc->ns_writefd == -1) {

diff --git a/sbr/print_sw.c b/sbr/print_sw.c
index ad92b8827a3d79a532121b177a3ec60bc4b369a0..cf5cda740dee509683a75a2855aedf9362ea3f1e 100644 (file)
--- a/sbr/print_sw.c
+++ b/sbr/print_sw.c
@@ -11,7 +11,8 @@
 void
 print_sw (const char *substr, const struct swit *swp, char *prefix, FILE *fp)
 {
 void
 print_sw (const char *substr, const struct swit *swp, char *prefix, FILE *fp)
 {

-    int len, optno;
+    int len;
+    bool optno;

     int i;
     char *cp, *cp1, *sp;
     char buf[128];
     int i;
     char *cp, *cp1, *sp;
     char buf[128];


@@ -20,14 +21,14 @@ print_sw (const char *substr, const struct swit *swp, char *prefix, FILE *fp)
     for (; swp->sw; swp++) {
        /* null matches all strings */
        if (!*substr || (ssequal (substr, swp->sw) && len >= swp->minchars)) {
     for (; swp->sw; swp++) {
        /* null matches all strings */
        if (!*substr || (ssequal (substr, swp->sw) && len >= swp->minchars)) {

-           optno = 0;
+           optno = false;

            /* next switch */
            if ((sp = (&swp[1])->sw)) {
                if (!*substr && sp[0] == 'n' && sp[1] == 'o' &&
                        strcmp (&sp[2], swp->sw) == 0 && (
                        ((&swp[1])->minchars == 0 && swp->minchars == 0) ||
                        ((&swp[1])->minchars == (swp->minchars) + 2)))
            /* next switch */
            if ((sp = (&swp[1])->sw)) {
                if (!*substr && sp[0] == 'n' && sp[1] == 'o' &&
                        strcmp (&sp[2], swp->sw) == 0 && (
                        ((&swp[1])->minchars == 0 && swp->minchars == 0) ||
                        ((&swp[1])->minchars == (swp->minchars) + 2)))

-                   optno++;
+                   optno = true;

            }
 
            if (swp->minchars > 0) {
            }
 
            if (swp->minchars > 0) {

diff --git a/uip/burst.c b/uip/burst.c
index dd1970ce118ca051c96368a60153d133a8a7c288..82822c6e1251b3bb201c34c77b847dad2e691fc0 100644 (file)
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -50,7 +50,7 @@ int debugsw = 0;
  */
 static int find_delim (int, struct smsg *, int *);
 static void find_mime_parts (CT, struct smsg *, int *);
  */
 static int find_delim (int, struct smsg *, int *);
 static void find_mime_parts (CT, struct smsg *, int *);

-static void burst (struct msgs **, int, struct smsg *, int, int, int,
+static void burst(struct msgs **, int, struct smsg *, int, bool, bool,

                   char *, int);
 static void cpybrst (FILE *, FILE *, char *, char *, int, int);
 
                   char *, int);
 static void cpybrst (FILE *, FILE *, char *, char *, int, int);
 


@@ -68,7 +68,10 @@ static void cpybrst (FILE *, FILE *, char *, char *, int, int);
 int
 main (int argc, char **argv)
 {
 int
 main (int argc, char **argv)
 {

-    int inplace = 0, quietsw = 0, verbosw = 0, mimesw = 1;
+    bool inplace = false;
+    bool quietsw = false;
+    bool verbosw = false;
+    int mimesw = 1;

     int hi, msgnum, numburst;
     char *cp, *maildir, *folder = NULL, buf[BUFSIZ];
     char **argp, **arguments;
     int hi, msgnum, numburst;
     char *cp, *maildir, *folder = NULL, buf[BUFSIZ];
     char **argp, **arguments;


@@ -100,10 +103,10 @@ main (int argc, char **argv)
                done (0);
 
            case INPLSW: 
                done (0);
 
            case INPLSW: 

-               inplace++;
+               inplace = true;

                continue;
            case NINPLSW: 
                continue;
            case NINPLSW: 

-               inplace = 0;
+               inplace = false;

                continue;
 
            case MIMESW:
                continue;
 
            case MIMESW:


@@ -117,17 +120,17 @@ main (int argc, char **argv)
                continue;
 
            case QIETSW: 
                continue;
 
            case QIETSW: 

-               quietsw++;
+               quietsw = true;

                continue;
            case NQIETSW: 
                continue;
            case NQIETSW: 

-               quietsw = 0;
+               quietsw = false;

                continue;
 
            case VERBSW: 
                continue;
 
            case VERBSW: 

-               verbosw++;
+               verbosw = true;

                continue;
            case NVERBSW: 
                continue;
            case NVERBSW: 

-               verbosw = 0;
+               verbosw = false;

                continue;
            }
        }
                continue;
            }
        }


@@ -362,7 +365,7 @@ find_mime_parts (CT content, struct smsg *smsgs, int *msgp)
 
 static void
 burst (struct msgs **mpp, int msgnum, struct smsg *smsgs, int numburst,
 
 static void
 burst (struct msgs **mpp, int msgnum, struct smsg *smsgs, int numburst,

-       int inplace, int verbosw, char *maildir, int mimesw)
+    bool inplace, bool verbosw, char *maildir, int mimesw)

 {
     int i, j, mode;
     char *msgnam;
 {
     int i, j, mode;
     char *msgnam;

diff --git a/uip/comp.c b/uip/comp.c
index 1aba2808cc32045c7b5e05916799e7658eedecc7..fb1051e7577fcec2588ad2a91a6ac4a516a7fff6 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -70,7 +70,10 @@ static struct swit aqrul[] = {
 int
 main (int argc, char **argv)
 {
 int
 main (int argc, char **argv)
 {

-    int use = NOUSE, nedit = 0, nwhat = 0, build = 0;
+    int use = NOUSE;
+    bool nedit = false;
+    bool nwhat = false;
+    bool build = false;

     int i, in = NOTOK, isdf = 0, out, dat[5], format_len = 0;
     int outputlinelen = OUTPUTLINELEN;
     char *cp, *cwd, *maildir, *dfolder = NULL;
     int i, in = NOTOK, isdf = 0, out, dat[5], format_len = 0;
     int outputlinelen = OUTPUTLINELEN;
     char *cp, *cwd, *maildir, *dfolder = NULL;


@@ -109,23 +112,23 @@ main (int argc, char **argv)
                case EDITRSW: 
                    if (!(ed = *argp++) || *ed == '-')
                        die("missing argument to %s", argp[-2]);
                case EDITRSW: 
                    if (!(ed = *argp++) || *ed == '-')
                        die("missing argument to %s", argp[-2]);

-                   nedit = 0;
+                   nedit = false;

                    continue;
                case NEDITSW: 
                    continue;
                case NEDITSW: 

-                   nedit++;
+                   nedit = true;

                    continue;
 
                case WHATSW: 
                    if (!(whatnowproc = *argp++) || *whatnowproc == '-')
                        die("missing argument to %s", argp[-2]);
                    continue;
 
                case WHATSW: 
                    if (!(whatnowproc = *argp++) || *whatnowproc == '-')
                        die("missing argument to %s", argp[-2]);

-                   nwhat = 0;
+                   nwhat = false;

                    continue;
 
                case BILDSW:
                    continue;
 
                case BILDSW:

-                   build++;
+                   build = true;

                    /* FALLTHRU */
                case NWHATSW: 
                    /* FALLTHRU */
                case NWHATSW: 

-                   nwhat++;
+                   nwhat = true;

                    continue;
 
                case FORMSW: 
                    continue;
 
                case FORMSW: 

diff --git a/uip/dist.c b/uip/dist.c
index 4fb33bf10dd64b94c0fc5e7ca351ad9216c79908..d42cfef5e64d2fb7f379d989f06b16a111cc3113 100644 (file)
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -71,10 +71,14 @@ static struct swit aqrl[] = {
 int
 main (int argc, char **argv)
 {
 int
 main (int argc, char **argv)
 {

-    int anot = 0, inplace = 1, nedit = 0;
-    int nwhat = 0, i, in, isdf = 0, out;
+    bool anot = false;
+    bool inplace = true;
+    bool nedit = false;
+    bool nwhat = false;
+    int i, in, isdf = 0, out;

     int outputlinelen = OUTPUTLINELEN;
     int outputlinelen = OUTPUTLINELEN;

-    int dat[5], atfile = 0;
+    int dat[5];
+    bool atfile = false;

     char *cp, *cwd, *maildir, *msgnam, *dfolder = NULL;
     char *dmsg = NULL, *ed = NULL, *file = NULL, *folder = NULL;
     char *form = NULL, *msg = NULL, buf[BUFSIZ], drft[BUFSIZ];
     char *cp, *cwd, *maildir, *msgnam, *dfolder = NULL;
     char *dmsg = NULL, *ed = NULL, *file = NULL, *folder = NULL;
     char *form = NULL, *msg = NULL, buf[BUFSIZ], drft[BUFSIZ];


@@ -107,28 +111,28 @@ main (int argc, char **argv)
                    done (0);
 
                case ANNOSW: 
                    done (0);
 
                case ANNOSW: 

-                   anot++;
+                   anot = true;

                    continue;
                case NANNOSW: 
                    continue;
                case NANNOSW: 

-                   anot = 0;
+                   anot = false;

                    continue;
 
                case EDITRSW: 
                    if (!(ed = *argp++) || *ed == '-')
                        die("missing argument to %s", argp[-2]);
                    continue;
 
                case EDITRSW: 
                    if (!(ed = *argp++) || *ed == '-')
                        die("missing argument to %s", argp[-2]);

-                   nedit = 0;
+                   nedit = false;

                    continue;
                case NEDITSW:
                    continue;
                case NEDITSW:

-                   nedit++;
+                   nedit = true;

                    continue;
                    
                case WHATSW: 
                    if (!(whatnowproc = *argp++) || *whatnowproc == '-')
                        die("missing argument to %s", argp[-2]);
                    continue;
                    
                case WHATSW: 
                    if (!(whatnowproc = *argp++) || *whatnowproc == '-')
                        die("missing argument to %s", argp[-2]);

-                   nwhat = 0;
+                   nwhat = false;

                    continue;
                case NWHATSW: 
                    continue;
                case NWHATSW: 

-                   nwhat++;
+                   nwhat = true;

                    continue;
 
                case FILESW: 
                    continue;
 
                case FILESW: 


@@ -144,10 +148,10 @@ main (int argc, char **argv)
                    continue;
 
                case INPLSW: 
                    continue;
 
                case INPLSW: 

-                   inplace++;
+                   inplace = true;

                    continue;
                case NINPLSW: 
                    continue;
                case NINPLSW: 

-                   inplace = 0;
+                   inplace = false;

                    continue;
 
                case DFOLDSW: 
                    continue;
 
                case DFOLDSW: 


@@ -198,10 +202,10 @@ main (int argc, char **argv)
                    continue;
 
                case ATFILESW:
                    continue;
 
                case ATFILESW:

-                   atfile++;
+                   atfile = true;

                    continue;
                case NOATFILESW:
                    continue;
                case NOATFILESW:

-                   atfile = 0;
+                   atfile = false;

                    continue;
            }
        }
                    continue;
            }
        }


@@ -259,7 +263,7 @@ try_it_again:
        /*
         * Dist a file
         */
        /*
         * Dist a file
         */

-       anot = 0;       /* don't want to annotate a file */
+       anot = false;   /* don't want to annotate a file */

     } else {
        /*
         * Dist a message
     } else {
        /*
         * Dist a message

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 446d5b0b0b63f646c4f7de6a0de0ab07dadf6ceb..568b5597e9fff671a6098e3098b6a97b6ce7cc73 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -103,7 +103,7 @@ static int insert(struct mailname *);
 static void mlistfree(void);
 
 static bool nodupcheck;        /* If set, no check for duplicates */
 static void mlistfree(void);
 
 static bool nodupcheck;        /* If set, no check for duplicates */

-static int ccme = 0;           /* Should I cc myself? */
+static bool ccme;              /* Should I cc myself? */

 static struct mailname mq;     /* Mail addresses to check for duplicates */
 static char *dummy = "dummy";
 
 static struct mailname mq;     /* Mail addresses to check for duplicates */
 static char *dummy = "dummy";
 


@@ -116,8 +116,12 @@ main (int argc, char **argv)
     struct format *fmt;
     struct comp *cptr;
     struct msgs_array msgs = { 0, 0, NULL }, compargs = { 0, 0, NULL};
     struct format *fmt;
     struct comp *cptr;
     struct msgs_array msgs = { 0, 0, NULL }, compargs = { 0, 0, NULL};

-    int dump = 0, i;
-    int outputsize = 0, dupaddrs = 1, trace = 0, files = 0;
+    bool dump = false;
+    int i;
+    int outputsize = 0;
+    bool dupaddrs = true;
+    bool trace = false;
+    int files = 0;

     int colwidth = -1, msgnum = -1, msgcur = -1, msgsize = -1, msgunseen = -1;
     enum mode_t mode = MESSAGE;
     int dat[5];
     int colwidth = -1, msgnum = -1, msgcur = -1, msgsize = -1, msgunseen = -1;
     enum mode_t mode = MESSAGE;
     int dat[5];


@@ -185,10 +189,10 @@ main (int argc, char **argv)
                    continue;
 
                case TRACESW:
                    continue;
 
                case TRACESW:

-                   trace++;
+                   trace = true;

                    continue;
                case NTRACESW:
                    continue;
                case NTRACESW:

-                   trace = 0;
+                   trace = false;

                    continue;
 
                case ADDRSW:
                    continue;
 
                case ADDRSW:


@@ -201,7 +205,7 @@ main (int argc, char **argv)
                case MESSAGESW:
                    mode = MESSAGE;
                    defformat = FORMAT;
                case MESSAGESW:
                    mode = MESSAGE;
                    defformat = FORMAT;

-                   dupaddrs = 0;
+                   dupaddrs = false;

                    continue;
                case DATESW:
                    mode = DATE;
                    continue;
                case DATESW:
                    mode = DATE;


@@ -216,17 +220,17 @@ main (int argc, char **argv)
                    continue;
 
                case DUPADDRSW:
                    continue;
 
                case DUPADDRSW:

-                   dupaddrs++;
+                   dupaddrs = true;

                    continue;
                case NDUPADDRSW:
                    continue;
                case NDUPADDRSW:

-                   dupaddrs = 0;
+                   dupaddrs = false;

                    continue;
 
                case CCMESW:
                    continue;
 
                case CCMESW:

-                   ccme++;
+                   ccme = true;

                    continue;
                case NCCMESW:
                    continue;
                case NCCMESW:

-                   ccme = 0;
+                   ccme = false;

                    continue;
 
                case WIDTHSW:
                    continue;
 
                case WIDTHSW:


@@ -256,10 +260,10 @@ main (int argc, char **argv)
                    continue;
 
                case DUMPSW:
                    continue;
 
                case DUMPSW:

-                   dump++;
+                   dump = true;

                    continue;
                case NDUMPSW:
                    continue;
                case NDUMPSW:

-                   dump = 0;
+                   dump = false;

                    continue;
 
            }
                    continue;
 
            }


@@ -336,11 +340,11 @@ main (int argc, char **argv)
      * callback, do that now.  Also, prime ismymbox if we use it.
      */
 
      * callback, do that now.  Also, prime ismymbox if we use it.
      */
 

-    if (dupaddrs == 0 || trace) {
+    if (!dupaddrs || trace) {

        ZERO(&cb);
        cbp = &cb;
 
        ZERO(&cb);
        cbp = &cb;
 

-       if (dupaddrs == 0) {
+       if (!dupaddrs) {

            cb.formataddr = test_formataddr;
            cb.concataddr = test_concataddr;
            if (!ccme)
            cb.formataddr = test_formataddr;
            cb.concataddr = test_concataddr;
            if (!ccme)


@@ -721,19 +725,20 @@ test_trace(void *context, struct format *fmt, int num, char *str,
           const char *outbuf)
 {
     struct trace_context *ctx = (struct trace_context *) context;
           const char *outbuf)
 {
     struct trace_context *ctx = (struct trace_context *) context;

-    int changed = 0;
+    bool changed = false;

 
     dumpone(fmt);
 
     if (num != ctx->num) {
        printf("num=%d", num);
        ctx->num = num;
 
     dumpone(fmt);
 
     if (num != ctx->num) {
        printf("num=%d", num);
        ctx->num = num;

-       changed++;
+       changed = true;

     }
 
     if (str != ctx->str) {
     }
 
     if (str != ctx->str) {

-       if (changed++)
+       if (changed)

             putchar(' ');
             putchar(' ');

+        changed = true;

        fputs("str=", stdout);
        litputs(str);
        ctx->str = str;
        fputs("str=", stdout);
        litputs(str);
        ctx->str = str;


@@ -1210,7 +1215,7 @@ test_formataddr (char *orig, char *str)
 {
     int len;
     char error[BUFSIZ];
 {
     int len;
     char error[BUFSIZ];

-    int isgroup;
+    bool isgroup;

     char *dst;
     char *cp;
     char *sp;
     char *dst;
     char *cp;
     char *sp;


@@ -1239,14 +1244,14 @@ test_formataddr (char *orig, char *str)
     }
 
     /* concatenate all the new addresses onto 'buf' */
     }
 
     /* concatenate all the new addresses onto 'buf' */

-    for (isgroup = 0; (cp = getname (str)); ) {
+    for (isgroup = false; (cp = getname (str)); ) {

        if ((mp = getm (cp, NULL, 0, error, sizeof(error))) == NULL) {
            fprintf(stderr, "bad address \"%s\" -- %s\n", cp, error);
            continue;
        }
        if (isgroup && (mp->m_gname || !mp->m_ingrp)) {
            *dst++ = ';';
        if ((mp = getm (cp, NULL, 0, error, sizeof(error))) == NULL) {
            fprintf(stderr, "bad address \"%s\" -- %s\n", cp, error);
            continue;
        }
        if (isgroup && (mp->m_gname || !mp->m_ingrp)) {
            *dst++ = ';';

-           isgroup = 0;
+           isgroup = false;

        }
        if (insert (mp)) {
            /* if we get here we're going to add an address */
        }
        if (insert (mp)) {
            /* if we get here we're going to add an address */


@@ -1257,7 +1262,7 @@ test_formataddr (char *orig, char *str)
            if (mp->m_gname) {
                CHECKMEM (mp->m_gname);
                CPY (mp->m_gname);
            if (mp->m_gname) {
                CHECKMEM (mp->m_gname);
                CPY (mp->m_gname);

-               isgroup++;
+               isgroup = true;

            }
            sp = adrformat (mp);
            CHECKMEM (sp);
            }
            sp = adrformat (mp);
            CHECKMEM (sp);