Use DIM(a) macro a few more times; array's dimension using sizeof.

[nmh] / uip / msgchk.c

diff --git a/uip/msgchk.c b/uip/msgchk.c
index eed61cd2d4985ab7b186c2d670995d6adff58742..3bc7f230fc9bdb2bb8e412b379e192a1e781262d 100644 (file)
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -1,6 +1,4 @@
-
-/*
- * msgchk.c -- check for mail
+/* msgchk.c -- check for mail
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -10,6 +8,7 @@
 #include <h/mh.h>
 #include <h/mts.h>
 #include <h/tws.h>
+#include <h/utils.h>
 #include <pwd.h>
 
 #include <h/popsbr.h>
@@ -265,7 +264,7 @@ main (int argc, char **argv)
                if ((pw = getpwnam (vec[vecp])))
                    status += checkmail (pw->pw_name, pw->pw_dir, datesw, notifysw, 0);
                else
-                   advise (NULL, "no such user as %s", vec[vecp]);
+                   inform("no such user as %s", vec[vecp]);
            }
        }
     }          /* host == NULL */
@@ -389,7 +388,7 @@ remotemail (char *host, char *port, char *user, char *proxy, int notifysw,
                  auth_svc) == NOTOK
            || pop_stat (&nmsgs, &nbytes) == NOTOK     /* check for messages  */
            || pop_quit () == NOTOK) {                 /* quit POP connection */
-       advise (NULL, "%s", response);
+       inform("%s", response);
        return 1;
     }
 
@@ -401,7 +400,7 @@ remotemail (char *host, char *port, char *user, char *proxy, int notifysw,
                printf ("%s has ", user);
 
            printf ("%d message%s (%d bytes)",
-                   nmsgs, nmsgs != 1 ? "s" : "", nbytes);
+                   nmsgs, PLURALS(nmsgs), nbytes);
        }
        else
            notifysw = 0;