Don't need to `else' after adios() at end of then-block.

Only true of simple if-else rather than a chain.

diff --git a/sbr/context_read.c b/sbr/context_read.c
index a4c9820..8350b98 100644 (file)
--- a/sbr/context_read.c
+++ b/sbr/context_read.c
@@ -53,8 +53,7 @@ context_read (void)
     if ((mypath = getenv("HOME")) == NULL) {
        if ((pw = getpwuid(getuid())) == NULL || *pw->pw_dir == '\0')
            adios(NULL, "cannot determine your home directory");
-       else
-           mypath = pw->pw_dir;
+        mypath = pw->pw_dir;
     }
 
     /*

diff --git a/sbr/context_save.c b/sbr/context_save.c
index 9f53397..61aa736 100644 (file)
--- a/sbr/context_save.c
+++ b/sbr/context_save.c
@@ -40,11 +40,9 @@ context_save (void)
     sigprocmask (SIG_BLOCK, &set, &oset);
 
     if (!(out = lkfopendata (ctxpath, "w", &failed_to_lock))) {
-       if (failed_to_lock) {
+       if (failed_to_lock)
            adios (ctxpath, "failed to lock");
-       } else {
-           adios (ctxpath, "unable to write");
-       }
+        adios (ctxpath, "unable to write");
     }
     for (np = m_defs; np; np = np->n_next)
        if (np->n_context)

diff --git a/uip/anno.c b/uip/anno.c
index ef115dc..d074717 100644 (file)
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -194,8 +194,7 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
     }

diff --git a/uip/ap.c b/uip/ap.c
index 930d0ad..ea93fd6 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -95,8 +95,7 @@ main (int argc, char **argv)
        }
        if (addrp == NADDRS)
            adios (NULL, "more than %d addresses", NADDRS);
-       else
-           addrs[addrp++] = cp;
+        addrs[addrp++] = cp;
     }
     addrs[addrp] = NULL;
 

diff --git a/uip/burst.c b/uip/burst.c
index e5020cf..f188bf1 100644 (file)
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -133,8 +133,7 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else {
            app_msgarg(&msgs, cp);
        }
@@ -249,9 +248,9 @@ find_delim (int msgnum, struct smsg *smsgs, int *mimesw)
            msgp = 1;
            find_mime_parts(content, smsgs, &msgp);
            free_content(content);
-           if (msgp == 1 && *mimesw == 2) {
+           if (msgp == 1 && *mimesw == 2)
                adios (msgnam, "does not have any message/rfc822 parts");
-           } else if (msgp > 1) {
+           if (msgp > 1) {
                *mimesw = 1;
                return (msgp - 1);
            }

diff --git a/uip/comp.c b/uip/comp.c
index ae87209..e3d8780 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -211,13 +211,11 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else {
            if (msg)
                adios (NULL, "only one message at a time!");
-           else
-               msg = cp;
+            msg = cp;
        }
     }
 

diff --git a/uip/dist.c b/uip/dist.c
index 19158ba..de0ba43 100644 (file)
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -207,13 +207,11 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else {
            if (msg)
                adios (NULL, "only one message at a time!");
-           else
-               msg = cp;
+            msg = cp;
        }
     }
 

diff --git a/uip/dp.c b/uip/dp.c
index 1b0c628..56a0ae1 100644 (file)
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -90,8 +90,7 @@ main (int argc, char **argv)
        }
        if (datep == NDATES)
            adios (NULL, "more than %d dates", NDATES);
-       else
-           dates[datep++] = cp;
+        dates[datep++] = cp;
     }
     dates[datep] = NULL;
 

diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index 95a7792..430a42e 100644 (file)
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -87,8 +87,7 @@ main (int argc, char **argv)
        }
        if (form)
            adios (NULL, "only one form at a time!");
-       else
-           form = cp;
+        form = cp;
     }
 
     /*

diff --git a/uip/fmttest.c b/uip/fmttest.c
index e5323e6..d5d4731 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -270,8 +270,7 @@ main (int argc, char **argv)
        if (mode == MESSAGE && !files && (*cp == '+' || *cp == '@')) {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else
            app_msgarg(&msgs, cp);
     }

diff --git a/uip/folder.c b/uip/folder.c
index c2ad8b8..8db9e3e 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -226,13 +226,11 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (argfolder)
                adios (NULL, "only one folder at a time!");
-           else
-               argfolder = pluspath (cp);
+            argfolder = pluspath (cp);
        } else {
            if (msg)
                adios (NULL, "only one (current) message at a time!");
-           else
-               msg = cp;
+            msg = cp;
        }
     }
 

diff --git a/uip/forw.c b/uip/forw.c
index cb02554..5e7db30 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -290,8 +290,7 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else {
            app_msgarg(&msgs, cp);
        }

diff --git a/uip/inc.c b/uip/inc.c
index c337dde..2d6cd1e 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -376,8 +376,7 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else {
            adios (NULL, "usage: %s [+folder] [switches]", invo_name);
        }
@@ -556,7 +555,7 @@ main (int argc, char **argv)
            inform("Creating Receive-Audit: %s", audfile);
        if ((aud = fopen (audfile, "a")) == NULL)
            adios (audfile, "unable to append to");
-       else if (i == NOTOK)
+       if (i == NOTOK)
            chmod (audfile, m_gmprot ());
 
        if (from)

diff --git a/uip/install-mh.c b/uip/install-mh.c
index 9155b0a..359a78d 100644 (file)
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -84,8 +84,7 @@ main (int argc, char **argv)
     if ((mypath = getenv("HOME")) == NULL) {
        if ((pw = getpwuid(getuid())) == NULL || *pw->pw_dir == '\0')
            adios(NULL, "cannot determine your home directory");
-       else
-           mypath = pw->pw_dir;
+        mypath = pw->pw_dir;
     }
 
     /*
@@ -112,12 +111,10 @@ main (int argc, char **argv)
 
        else if (autof)
            adios (NULL, "invocation error");
-       else
-           adios (NULL, "You already have an nmh profile, use an editor to modify it");
+        adios (NULL, "You already have an nmh profile, use an editor to modify it");
     }
-    else if (check) {
+    if (check)
        done(1);
-    }
 
     if (!autof && read_switch ("Do you want help? ", anoyes)) {
        (void)printf(

diff --git a/uip/mark.c b/uip/mark.c
index bdfeecc..92957cd 100644 (file)
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -120,10 +120,9 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else
-               app_msgarg(&msgs, cp);
+            app_msgarg(&msgs, cp);
     }
 
     /*

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index b39cc80..d3761c0 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -117,8 +117,7 @@ main (int argc, char **argv)
        if (cp[0] == '-' && cp[1] == '\0') {
            if (compfile)
                adios (NULL, "cannot specify both standard input and a file");
-           else
-               compfile = cp;
+            compfile = cp;
            listsw = 0;         /* turn off -list if using standard in/out */
            verbosw = 0;        /* turn off -verbose listings */
            break;
@@ -282,8 +281,7 @@ main (int argc, char **argv)
        }
        if (compfile)
            adios (NULL, "only one composition file allowed");
-       else
-           compfile = cp;
+        compfile = cp;
     }
 
     /*

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 7fc0111..b1b0f83 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -566,8 +566,7 @@ finish_field:
         } else {
            if (*++cp == 0)
                adios (NULL, "giving up trying to find a unique delimiter string");
-           else
-               (*cp)++;
+            (*cp)++;
        }
     }
 
@@ -975,8 +974,7 @@ use_forw:
            if (*cp == '+' || *cp == '@') {
                if (folder)
                    adios (NULL, "only one folder per #forw directive");
-               else
-                   folder = pluspath (cp);
+                folder = pluspath (cp);
            }
        }
 

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 2737dac..909d21d 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -232,11 +232,10 @@ main (int argc, char **argv) {
                     adios (NULL, "missing argument to %s", argp[-2]);
                 }
                 if (! strncasecmp (cp, "multipart/", 10)  ||
-                    ! strncasecmp (cp, "message/", 8)) {
+                    ! strncasecmp (cp, "message/", 8))
                     adios (NULL, "-fixtype %s not allowed", cp);
-                } else if (! strchr (cp, '/')) {
+                if (! strchr (cp, '/'))
                     adios (NULL, "-fixtype requires type/subtype");
-                }
                 if (fx.fixtypes == NULL) { fx.fixtypes = svector_create (10); }
                 svector_push_back (fx.fixtypes, cp);
                 continue;
@@ -287,11 +286,9 @@ main (int argc, char **argv) {
             }
         }
         if (*cp == '+' || *cp == '@') {
-            if (folder) {
+            if (folder)
                 adios (NULL, "only one folder at a time!");
-            } else {
-                folder = pluspath (cp);
-            }
+            folder = pluspath (cp);
         } else {
             if (*cp == '/') {
                 /* Interpret a full path as a filename, not a message. */

diff --git a/uip/mhlist.c b/uip/mhlist.c
index a467a52..0f9a51e 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -227,8 +227,7 @@ do_cache:
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
     }

diff --git a/uip/mhn.c b/uip/mhn.c
index 6a1acc3..70da652 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -311,8 +311,7 @@ do_cache:
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
     }

diff --git a/uip/mhpath.c b/uip/mhpath.c
index 16425ac..1b5fd3b 100644 (file)
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -61,8 +61,7 @@ main(int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
     }

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 0759091..146b8bf 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -273,8 +273,7 @@ do_cache:
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
     }

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 265b203..d151df5 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -214,8 +214,7 @@ do_cache:
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
     }

diff --git a/uip/msgchk.c b/uip/msgchk.c
index 3bc7f23..f582920 100644 (file)
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -154,8 +154,7 @@ main (int argc, char **argv)
                        adios (NULL, "missing argument to %s", argp[-2]);
                    if (vecp >= MAXVEC-1)
                        adios (NULL, "you can only check %d users at a time", MAXVEC-1);
-                   else
-                       user = vec[vecp++] = cp;
+                    user = vec[vecp++] = cp;
                    continue;
 
                case SNOOPSW:
@@ -208,8 +207,7 @@ main (int argc, char **argv)
        }
        if (vecp >= MAXVEC-1)
            adios (NULL, "you can only check %d users at a time", MAXVEC-1);
-       else
-           vec[vecp++] = cp;
+        vec[vecp++] = cp;
     }
 
     /*

diff --git a/uip/new.c b/uip/new.c
index f954933..080f065 100644 (file)
--- a/uip/new.c
+++ b/uip/new.c
@@ -120,13 +120,10 @@ get_msgnums(char *folder, char *sequences[])
        return NULL;
 
     if ((fp = lkfopendata (seqfile, "r", & failed_to_lock)) == NULL) {
-
-       if (failed_to_lock) {
+       if (failed_to_lock)
            adios (seqfile, "failed to lock");
-       } else {
-           free(seqfile);
-           return NULL;
-       }
+        free(seqfile);
+        return NULL;
     }
 
     /* Use m_getfld2 to scan sequence file */

diff --git a/uip/pick.c b/uip/pick.c
index 1fa6536..373fa59 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -177,8 +177,7 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
     }

diff --git a/uip/post.c b/uip/post.c
index d981ff6..1b26646 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -584,8 +584,7 @@ main (int argc, char **argv)
        }
        if (msg)
            adios (NULL, "only one message at a time!");
-       else
-           msg = cp;
+        msg = cp;
     }
 
     alias (AliasFile);

diff --git a/uip/rcvpack.c b/uip/rcvpack.c
index 18937bc..7fc7602 100644 (file)
--- a/uip/rcvpack.c
+++ b/uip/rcvpack.c
@@ -73,8 +73,7 @@ main (int argc, char **argv)
        }
        if (file)
            adios (NULL, "only one file at a time!");
-       else
-           file = cp;
+        file = cp;
     }
 
     if (!file)

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index e9654b4..660d7ce 100644 (file)
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -123,8 +123,7 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else {
            adios (NULL, "usage: %s [+folder] [switches]", invo_name);
        }

diff --git a/uip/repl.c b/uip/repl.c
index adfe58d..2707b36 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -336,13 +336,11 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else {
            if (msg)
                adios (NULL, "only one message at a time!");
-           else
-               msg = cp;
+            msg = cp;
        }
     }
 

diff --git a/uip/rmf.c b/uip/rmf.c
index cede3b0..5450fd6 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -72,8 +72,7 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else {
            adios (NULL, "usage: %s [+folder] [switches]", invo_name);
        }

diff --git a/uip/rmm.c b/uip/rmm.c
index f245478..64fe272 100644 (file)
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -79,10 +79,9 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else
-               app_msgarg(&msgs, cp);
+            app_msgarg(&msgs, cp);
     }
 
     if (!context_find ("path"))

diff --git a/uip/scan.c b/uip/scan.c
index 2b33708..d9d8ca9 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -126,10 +126,9 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else
-               app_msgarg(&msgs, cp);
+            app_msgarg(&msgs, cp);
     }
 
     if (!context_find ("path"))

diff --git a/uip/show.c b/uip/show.c
index dfe5052..55707da 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -188,8 +188,7 @@ usage:
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else {
            if (mode != SHOW)
                goto usage;

diff --git a/uip/sortm.c b/uip/sortm.c
index 3ebb532..84f8e08 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -167,10 +167,9 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else
-               app_msgarg(&msgs, cp);
+            app_msgarg(&msgs, cp);
     }
 
     if (!context_find ("path"))

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 4fd8cbd..fe1b2f7 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -199,8 +199,7 @@ WhatNow (int argc, char **argv)
        }
        if (drft)
            adios (NULL, "only one draft at a time!");
-       else
-           drft = cp;
+        drft = cp;
     }
 
     if ((drft == NULL && (drft = getenv ("mhdraft")) == NULL) || *drft == 0)

diff --git a/uip/whom.c b/uip/whom.c
index efa74c6..c1ef659 100644 (file)
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -143,8 +143,7 @@ main (int argc, char **argv)
        }
        if (msg)
            adios (NULL, "only one draft at a time!");
-       else
-           vec[vecp++] = msg = cp;
+        vec[vecp++] = msg = cp;
     }
 
     /* allow Aliasfile: profile entry */