* uip/mhlistsbr.c, uip/mhlsbr.c, uip/picksbr.c: cast

[mmh] / uip / conflict.c

diff --git a/uip/conflict.c b/uip/conflict.c
index 29a12e7..8247ff0 100644 (file)
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -3,12 +3,17 @@
  * conflict.c -- check for conflicts in mail system
  *
  * $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/aliasbr.h>
-#include <zotnet/mts/mts.h>
+#include <h/mts.h>
+#include <h/utils.h>
 #include <grp.h>
 #include <pwd.h>
 
@@ -31,7 +36,7 @@ static struct swit switches[] = {
 #define VERSIONSW      2
     { "version", 0 },
 #define        HELPSW         3
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -135,6 +140,7 @@ main (int argc, char **argv)
     maildrops ();
 
     done (0);
+    return 1;
 }
 
 
@@ -185,8 +191,7 @@ grp_names (void)
     /* allocate space NGRPS at a time */
     numgroups = 0;
     maxgroups = NGRPS;
-    if (!(grps = (char **) malloc((size_t) (maxgroups * sizeof(*grps)))))
-       adios (NULL, "unable to allocate group name storage");
+    grps = (char **) mh_xmalloc((size_t) (maxgroups * sizeof(*grps)));
 
     setgrent ();
     while ((gr = getgrent ())) {
@@ -201,9 +206,8 @@ grp_names (void)
        if (i >= numgroups) {
            if (numgroups >= maxgroups) {
                maxgroups += NGRPS;
-               if (!(grps = (char **) realloc(grps,
-                       (size_t) (maxgroups * sizeof(*grps)))))
-                   adios (NULL, "unable to reallocate group name storage");
+               grps = (char **) mh_xrealloc(grps,
+                   (size_t) (maxgroups * sizeof(*grps)));
            }
            grps[numgroups++] = getcpy (gr->gr_name);
        }