Remove RCS keywords, since they no longer work after git migration.

[mmh] / uip / conflict.c

diff --git a/uip/conflict.c b/uip/conflict.c
index 5097119..07e77fc 100644 (file)
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -2,8 +2,6 @@
 /*
  * 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.
@@ -139,7 +137,8 @@ main (int argc, char **argv)
 #endif /* UCI */
     maildrops ();
 
-    return done (0);
+    done (0);
+    return 1;
 }
 
 
@@ -205,9 +204,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);
        }