X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a30e7865b46712fe346d8a91894ab68aac664901..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/ap.c?ds=sidebyside

diff --git a/uip/ap.c b/uip/ap.c
index 0b57e652..89b207b5 100644
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -146,20 +146,19 @@ static int
 process (char *arg, int length)
 {
     int	status = 0;
-    register char *cp;
+    char *cp;
     char 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 *) mh_xcalloc ((size_t) 1, sizeof(*p))) == NULL)
-	    adios (NULL, "unable to allocate pqpair memory");
+	NEW0(p);
 	if ((mp = getm (cp, NULL, 0, error, sizeof(error))) == NULL) {
-	    p->pq_text = getcpy (cp);
-	    p->pq_error = getcpy (error);
+	    p->pq_text = mh_xstrdup(cp);
+	    p->pq_error = mh_xstrdup(error);
 	    status++;
 	}
 	else {
@@ -175,15 +174,13 @@ process (char *arg, int length)
 
 	cptr = fmt_findcomp ("text");
 	if (cptr) {
-	    if (cptr->c_text)
-		free(cptr->c_text);
+            mh_xfree(cptr->c_text);
 	    cptr->c_text = p->pq_text;
 	    p->pq_text = NULL;
 	}
 	cptr = fmt_findcomp ("error");
 	if (cptr) {
-	    if (cptr->c_text)
-		free(cptr->c_text);
+            mh_xfree(cptr->c_text);
 	    cptr->c_text = p->pq_error;
 	    p->pq_error = NULL;
 	}
@@ -192,12 +189,10 @@ process (char *arg, int length)
 	fputs (charstring_buffer (scanl), stdout);
 	charstring_free (scanl);
 
-	if (p->pq_text)
-	    free (p->pq_text);
-	if (p->pq_error)
-	    free (p->pq_error);
+        mh_xfree(p->pq_text);
+        mh_xfree(p->pq_error);
 	q = p->pq_next;
-	free ((char *) p);
+	free(p);
     }
 
     return status;