From: Ralph Corderoy Date: Tue, 31 Oct 2017 23:33:34 +0000 (+0000) Subject: Replace some ints that are only ever 0 or 1 with bool. X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/8c6e995a43e71e012ae133ff8ebea5719d9117fe?ds=inline;hp=6319a50c4be2bcfad3e9cfcce034e9b5adccf0a8 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 eadf1d07..e55c15aa 100644 --- a/sbr/addrsbr.c +++ b/sbr/addrsbr.c @@ -270,7 +270,7 @@ auxformat (struct mailname *mp, int extras) bool ismymbox (struct mailname *np) { - int oops; + bool oops; 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; - static int localmailbox = 0; + static bool localmailbox; /* * If this is the first call, initialize @@ -290,7 +290,7 @@ ismymbox (struct mailname *np) if ((am = context_find ("local-mailbox"))) { - localmailbox++; + localmailbox = true; 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; - 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); - oops++; + oops = true; } else { mp = mp->m_next; mp->m_type = W_NIL; diff --git a/sbr/encode_rfc2047.c b/sbr/encode_rfc2047.c index e7ccd308..be74c67c 100644 --- 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; - 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; @@ -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); - errflag++; + errflag = true; continue; } - reformat = 0; + reformat = false; /* * 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)) { - errflag++; + errflag = true; 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)) { - errflag++; + errflag = true; goto out; } break; default: inform("Internal error: unknown RFC-2047 encoding type"); - errflag++; + errflag = true; goto out; } - reformat++; + reformat = true; } 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); - errflag++; + errflag = true; 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)) { - errflag++; + errflag = true; 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)) { - errflag++; + errflag = true; goto out; } break; default: inform("Internal error: unknown RFC-2047 encoding type"); - errflag++; + errflag = true; goto out; } - reformat++; + reformat = true; /* * Make sure the size of tmpbuf is correct (it always gets @@ -803,7 +807,7 @@ out: free(tmpbuf); free(output); - return errflag > 0; + return errflag; } /* diff --git a/sbr/fmt_addr.c b/sbr/fmt_addr.c index 2c7b58e4..4684fa7f 100644 --- a/sbr/fmt_addr.c +++ b/sbr/fmt_addr.c @@ -50,7 +50,7 @@ char * formataddr (char *orig, char *str) { int len; - int isgroup; + bool isgroup; char *dst; char *cp; char *sp; @@ -79,13 +79,13 @@ formataddr (char *orig, char *str) } /* 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++ = ';'; - isgroup = 0; + isgroup = false; } /* 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); - isgroup++; + isgroup = true; } sp = adrformat (mp); CHECKMEM (sp); diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c index ce32414f..216b8e71 100644 --- a/sbr/fmt_compile.c +++ b/sbr/fmt_compile.c @@ -488,13 +488,13 @@ do_spec(char *sp) { char *cp = sp; int c; - int ljust = 0; + bool ljust = false; int wid = 0; char fill = ' '; c = *cp++; if (c == '-') { - ljust++; + ljust = true; c = *cp++; } if (c == '0') { @@ -543,7 +543,7 @@ do_name(char *sp, int preprocess) char *cp = sp; int c; int i; - static int primed = 0; + static bool primed; while (isalnum(c = *cp++) || c == '-' || c == '_') ; @@ -573,7 +573,7 @@ do_name(char *sp, int preprocess) case FT_GETMYADDR: if (!primed) { ismymbox(NULL); - primed++; + primed = true; } /* FALLTHRU */ case FT_PARSEADDR: @@ -1044,13 +1044,15 @@ fmt_addcompentry(char *component) 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) { - found++; + found = true; if (! cptr->c_text) { cptr->c_text = getcpy(text); } else { diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c index 2e547286..3c93a5a7 100644 --- 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 */ - int rjust; + bool rjust; 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 */ - rjust = 0; + rjust = false; if ((remaining = wid) < 0) { remaining = -remaining; - rjust++; + rjust = true; } 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]; - int i, c, rjust; + int i, c; + bool rjust; 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; - rjust = 0; + rjust = false; 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); @@ -723,10 +724,10 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat, str = buffer; while (isspace((unsigned char) *str)) str++; - rjust = 0; + rjust = false; if ((i = fmt->f_width) < 0) { i = -i; - rjust++; + rjust = true; } if (!rjust && i > 0 && (int) strlen(str) > i) diff --git a/sbr/netsec.c b/sbr/netsec.c index ab490467..1fe8f1ae 100644 --- 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 sasl_initialized = 0; +static bool sasl_initialized; #define SASL_MAXRECVBUF 65536 #endif /* CYRUS_SASL */ @@ -39,7 +39,7 @@ static int sasl_initialized = 0; #include #include -static int tls_initialized = 0; +static bool tls_initialized; 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_initialized++; + sasl_initialized = true; } /* @@ -1550,7 +1550,7 @@ netsec_set_tls(netsec_context *nsc, int tls, int noverify, char **errstr) return NOTOK; } - tls_initialized++; + tls_initialized = true; } if (nsc->ns_readfd == -1 || nsc->ns_writefd == -1) { diff --git a/sbr/print_sw.c b/sbr/print_sw.c index ad92b882..cf5cda74 100644 --- 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) { - int len, optno; + int len; + bool optno; 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)) { - 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))) - optno++; + optno = true; } if (swp->minchars > 0) { diff --git a/uip/burst.c b/uip/burst.c index dd1970ce..82822c6e 100644 --- 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 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); @@ -68,7 +68,10 @@ static void cpybrst (FILE *, FILE *, char *, char *, int, int); 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; @@ -100,10 +103,10 @@ main (int argc, char **argv) done (0); case INPLSW: - inplace++; + inplace = true; continue; case NINPLSW: - inplace = 0; + inplace = false; continue; case MIMESW: @@ -117,17 +120,17 @@ main (int argc, char **argv) continue; case QIETSW: - quietsw++; + quietsw = true; continue; case NQIETSW: - quietsw = 0; + quietsw = false; continue; case VERBSW: - verbosw++; + verbosw = true; continue; case NVERBSW: - verbosw = 0; + verbosw = false; 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, - int inplace, int verbosw, char *maildir, int mimesw) + bool inplace, bool verbosw, char *maildir, int mimesw) { int i, j, mode; char *msgnam; diff --git a/uip/comp.c b/uip/comp.c index 1aba2808..fb1051e7 100644 --- a/uip/comp.c +++ b/uip/comp.c @@ -70,7 +70,10 @@ static struct swit aqrul[] = { 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; @@ -109,23 +112,23 @@ main (int argc, char **argv) case EDITRSW: if (!(ed = *argp++) || *ed == '-') die("missing argument to %s", argp[-2]); - nedit = 0; + nedit = false; continue; case NEDITSW: - nedit++; + nedit = true; continue; case WHATSW: if (!(whatnowproc = *argp++) || *whatnowproc == '-') die("missing argument to %s", argp[-2]); - nwhat = 0; + nwhat = false; continue; case BILDSW: - build++; + build = true; /* FALLTHRU */ case NWHATSW: - nwhat++; + nwhat = true; continue; case FORMSW: diff --git a/uip/dist.c b/uip/dist.c index 4fb33bf1..d42cfef5 100644 --- a/uip/dist.c +++ b/uip/dist.c @@ -71,10 +71,14 @@ static struct swit aqrl[] = { 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 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]; @@ -107,28 +111,28 @@ main (int argc, char **argv) done (0); case ANNOSW: - anot++; + anot = true; continue; case NANNOSW: - anot = 0; + anot = false; continue; case EDITRSW: if (!(ed = *argp++) || *ed == '-') die("missing argument to %s", argp[-2]); - nedit = 0; + nedit = false; continue; case NEDITSW: - nedit++; + nedit = true; continue; case WHATSW: if (!(whatnowproc = *argp++) || *whatnowproc == '-') die("missing argument to %s", argp[-2]); - nwhat = 0; + nwhat = false; continue; case NWHATSW: - nwhat++; + nwhat = true; continue; case FILESW: @@ -144,10 +148,10 @@ main (int argc, char **argv) continue; case INPLSW: - inplace++; + inplace = true; continue; case NINPLSW: - inplace = 0; + inplace = false; continue; case DFOLDSW: @@ -198,10 +202,10 @@ main (int argc, char **argv) continue; case ATFILESW: - atfile++; + atfile = true; continue; case NOATFILESW: - atfile = 0; + atfile = false; continue; } } @@ -259,7 +263,7 @@ try_it_again: /* * 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 diff --git a/uip/fmttest.c b/uip/fmttest.c index 446d5b0b..568b5597 100644 --- 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 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"; @@ -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}; - 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]; @@ -185,10 +189,10 @@ main (int argc, char **argv) continue; case TRACESW: - trace++; + trace = true; continue; case NTRACESW: - trace = 0; + trace = false; continue; case ADDRSW: @@ -201,7 +205,7 @@ main (int argc, char **argv) case MESSAGESW: mode = MESSAGE; defformat = FORMAT; - dupaddrs = 0; + dupaddrs = false; continue; case DATESW: mode = DATE; @@ -216,17 +220,17 @@ main (int argc, char **argv) continue; case DUPADDRSW: - dupaddrs++; + dupaddrs = true; continue; case NDUPADDRSW: - dupaddrs = 0; + dupaddrs = false; continue; case CCMESW: - ccme++; + ccme = true; continue; case NCCMESW: - ccme = 0; + ccme = false; continue; case WIDTHSW: @@ -256,10 +260,10 @@ main (int argc, char **argv) continue; case DUMPSW: - dump++; + dump = true; continue; case NDUMPSW: - dump = 0; + dump = false; continue; } @@ -336,11 +340,11 @@ main (int argc, char **argv) * callback, do that now. Also, prime ismymbox if we use it. */ - if (dupaddrs == 0 || trace) { + if (!dupaddrs || trace) { ZERO(&cb); cbp = &cb; - if (dupaddrs == 0) { + if (!dupaddrs) { 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; - int changed = 0; + bool changed = false; dumpone(fmt); if (num != ctx->num) { printf("num=%d", num); ctx->num = num; - changed++; + changed = true; } if (str != ctx->str) { - if (changed++) + if (changed) putchar(' '); + changed = true; fputs("str=", stdout); litputs(str); ctx->str = str; @@ -1210,7 +1215,7 @@ test_formataddr (char *orig, char *str) { int len; char error[BUFSIZ]; - int isgroup; + bool isgroup; char *dst; char *cp; char *sp; @@ -1239,14 +1244,14 @@ test_formataddr (char *orig, char *str) } /* 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++ = ';'; - isgroup = 0; + isgroup = false; } 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); - isgroup++; + isgroup = true; } sp = adrformat (mp); CHECKMEM (sp);