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

[nmh] / uip / folder.c

diff --git a/uip/folder.c b/uip/folder.c
index 3989a42c6e63da5f0f1a2298e46f5cdba31573b3..2141f32dc9732879829e9f7b063f63b46b945577 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -54,7 +54,7 @@ static int fverb    = 0;      /* print actions taken while packing folder */
 static int fheader  = 0;       /* should we output a header?               */
 static int frecurse = 0;       /* recurse through subfolders               */
 static int ftotal   = 0;       /* should we output the totals?             */
-static int all      = 0;       /* should we output all folders             */
+static bool all;               /* should we output all folders             */
 
 static int total_folders = 0;  /* total number of folders                  */
 
@@ -100,19 +100,21 @@ static
 void
 nonexistent_folder (int status) {
     NMH_UNUSED (status);
-    adios (NULL, "folder %s does not exist", folder);
+    die("folder %s does not exist", folder);
 }
 
 
 int
 main (int argc, char **argv)
 {
-    int printsw = 0, listsw = 0;
-    int pushsw = 0, popsw = 0;
+    bool printsw = false;
+    bool listsw = false;
+    bool pushsw = false;
+    bool popsw = false;
     char *cp, *dp, *msg = NULL, *argfolder = NULL;
     char **ap, **argp, buf[BUFSIZ], **arguments;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     /*
      * If program was invoked with name ending
@@ -130,7 +132,7 @@ main (int argc, char **argv)
                    ambigsw (cp, switches);
                    done (1);
                case UNKWNSW: 
-                   adios (NULL, "-%s unknown", cp);
+                   die("-%s unknown", cp);
 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [+folder] [msg] [switches]",
@@ -142,11 +144,11 @@ main (int argc, char **argv)
                    done (0);
 
                case ALLSW: 
-                   all = 1;
+                   all = true;
                    continue;
 
                case NALLSW:
-                   all = 0;
+                   all = false;
                    continue;
 
                case CREATSW: 
@@ -199,38 +201,38 @@ main (int argc, char **argv)
                    continue;
 
                case PRNTSW: 
-                   printsw = 1;
+                   printsw = true;
                    continue;
                case NPRNTSW: 
-                   printsw = 0;
+                   printsw = false;
                    continue;
 
                case LISTSW: 
-                   listsw = 1;
+                   listsw = true;
                    continue;
                case NLISTSW: 
-                   listsw = 0;
+                   listsw = false;
                    continue;
 
                case PUSHSW: 
-                   pushsw = 1;
-                   listsw = 1;
-                   popsw  = 0;
+                   pushsw = true;
+                   listsw = true;
+                   popsw  = false;
                    continue;
                case POPSW: 
-                   popsw  = 1;
-                   listsw = 1;
-                   pushsw = 0;
+                   popsw  = true;
+                   listsw = true;
+                   pushsw = false;
                    continue;
            }
        }
        if (*cp == '+' || *cp == '@') {
            if (argfolder)
-               adios (NULL, "only one folder at a time!");
+               die("only one folder at a time!");
             argfolder = pluspath (cp);
        } else {
            if (msg)
-               adios (NULL, "only one (current) message at a time!");
+               die("only one (current) message at a time!");
             msg = cp;
        }
     }
@@ -243,8 +245,8 @@ main (int argc, char **argv)
      * If we aren't working with the folder stack
      * (-push, -pop, -list) then the default is to print.
      */
-    if (pushsw == 0 && popsw == 0 && listsw == 0)
-       printsw++;
+    if (!pushsw && !popsw && !listsw)
+       printsw = true;
 
     /* Pushing a folder onto the folder stack */
     if (pushsw) {
@@ -256,7 +258,7 @@ main (int argc, char **argv)
                ap = brkstring (dp, " ", "\n");
                argfolder = getcpy(*ap++);
            } else {
-               adios (NULL, "no other folder");
+               die("no other folder");
            }
            for (cp = mh_xstrdup(getfolder(1)); *ap; ap++)
                cp = add (*ap, add (" ", cp));
@@ -274,13 +276,13 @@ main (int argc, char **argv)
     /* Popping a folder off of the folder stack */
     if (popsw) {
        if (argfolder)
-           adios (NULL, "sorry, no folders allowed with -pop");
+           die("sorry, no folders allowed with -pop");
        if ((cp = context_find (stack))) {
            dp = mh_xstrdup(cp);
            ap = brkstring (dp, " ", "\n");
            argfolder = getcpy(*ap++);
        } else {
-           adios (NULL, "folder stack empty");
+           die("folder stack empty");
        }
        if (*ap) {
            /* if there's anything left in the stack */
@@ -474,7 +476,9 @@ get_folder_info (char *fold, char *msg)
 static void
 print_folders (void)
 {
-    int i, len, hasempty = 0, curprinted;
+    int i, len;
+    bool hasempty = false;
+    bool curprinted;
     int maxlen = 0, maxnummsg = 0, maxlowmsg = 0;
     int maxhghmsg = 0, maxcurmsg = 0, total_msgs = 0;
     int nummsgdigits, lowmsgdigits;
@@ -518,7 +522,7 @@ print_folders (void)
 
        /* check for empty folders */
        if (fi[i].nummsg == 0)
-           hasempty = 1;
+           hasempty = true;
     }
     nummsgdigits = num_digits (maxnummsg);
     lowmsgdigits = num_digits (maxlowmsg);
@@ -562,7 +566,7 @@ print_folders (void)
 
            printf ("%-*s ", maxlen+1, tmpname);
 
-           curprinted = 0; /* remember if we print cur */
+           curprinted = false; /* remember if we print cur */
            if (fi[i].nummsg == 0) {
                printf ("has %*s messages%*s",
                        nummsgdigits, "no",
@@ -574,7 +578,7 @@ print_folders (void)
                        lowmsgdigits, fi[i].lowmsg,
                        hghmsgdigits, fi[i].hghmsg);
                if (fi[i].curmsg >= fi[i].lowmsg && fi[i].curmsg <= fi[i].hghmsg) {
-                   curprinted = 1;
+                   curprinted = true;
                    printf ("; cur=%*d", curmsgdigits, fi[i].curmsg);
                }
            }