Delete declaration already available from included header file.

[nmh] / uip / folder.c

diff --git a/uip/folder.c b/uip/folder.c
index 5fd411cd40f0260808239a9a6b20d5d8a34e35ba..8db9e3e64589db28545ff5be1ffc75f6cf9055c7 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -10,6 +10,7 @@
 #include <h/mh.h>
 #include <h/crawl_folders.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 
 #define FOLDER_SWITCHES \
     X("all", 0, ALLSW) \
@@ -225,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;
        }
     }
 
@@ -570,7 +569,7 @@ print_folders (void)
            } else {
                printf ("has %*d message%1s  (%*d-%*d)",
                        nummsgdigits, fi[i].nummsg,
-                       (fi[i].nummsg == 1) ? "" : "s",
+                       PLURALS(fi[i].nummsg),
                        lowmsgdigits, fi[i].lowmsg,
                        hghmsgdigits, fi[i].hghmsg);
                if (fi[i].curmsg >= fi[i].lowmsg && fi[i].curmsg <= fi[i].hghmsg) {
@@ -592,8 +591,8 @@ print_folders (void)
        if (all)
            putchar('\n');
        printf ("TOTAL = %d message%s in %d folder%s.\n",
-               total_msgs, total_msgs != 1 ? "s" : "",
-               total_folders, total_folders != 1 ? "s" : "");
+               total_msgs, PLURALS(total_msgs),
+               total_folders, PLURALS(total_folders));
     }
 
     fflush (stdout);