X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fconflict.c;h=8247ff0cf32912e97cdc6ce78849d8e77ecd18bd;hp=32b1613eeb158fc1d5e851337f9509faeeca1a63;hb=d8916ff5d389de5ab225cd6f40aeda1b285d0f28;hpb=6c42153ad9362cc676ea66563bf400d7511b3b68

diff --git a/uip/conflict.c b/uip/conflict.c
index 32b1613..8247ff0 100644
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -13,6 +13,7 @@
 #include <fcntl.h>
 #include <h/aliasbr.h>
 #include <h/mts.h>
+#include <h/utils.h>
 #include <grp.h>
 #include <pwd.h>
 
@@ -138,7 +139,8 @@ main (int argc, char **argv)
 #endif	/* UCI */
     maildrops ();
 
-    return done (0);
+    done (0);
+    return 1;
 }
 
 
@@ -189,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 ())) {
@@ -205,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);
 	}