No error-checking for error-checking alloc functions

[mmh] / uip / ap.c

diff --git a/uip/ap.c b/uip/ap.c
index af97e9e..e2d43da 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -9,6 +9,7 @@
 #include <h/mh.h>
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
+#include <h/utils.h>
 #include <locale.h>
 #include <sysexits.h>
 
@@ -128,18 +129,16 @@ static int
 process(char *arg, int norm)
 {
        int status = 0;
-       register char *cp;
+       char *cp;
        char buffer[BUFSIZ + 1], error[BUFSIZ];
-       register struct comp *cptr;
-       register struct pqpair *p, *q;
+       struct comp *cptr;
+       struct pqpair *p, *q;
        struct pqpair pq;
-       register struct mailname *mp;
+       struct mailname *mp;
 
        (q = &pq)->pq_next = NULL;
        while ((cp = getname(arg))) {
-               if ((p = (struct pqpair *)
-                               calloc((size_t) 1, sizeof(*p))) == NULL)
-                       adios(EX_OSERR, NULL, "unable to allocate pqpair memory");
+               p = (struct pqpair *) mh_xcalloc((size_t) 1, sizeof(*p));
                if ((mp = getm(cp, NULL, 0, norm, error)) == NULL) {
                        p->pq_text = getcpy(cp);
                        p->pq_error = getcpy(error);