X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/79f012b76eba04d50a36a4a37c57458a8d521434..b9dda34301de552ad6413e4dd022114fd5219cc9:/uip/mhlsbr.c

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 9a35a816..bd354a31 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -778,7 +778,7 @@ evalvar (struct mcomp *c1)
 	    return 1;
 	}
 
-	args = (struct arglist *) mh_xcalloc ((size_t) 1, sizeof(struct arglist));
+	NEW0(args);
 
 	if (arglist_tail)
 	    arglist_tail->a_next = args;
@@ -1188,18 +1188,15 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2)
 
     (q = &pq)->pq_next = NULL;
     while ((cp = getname (ap))) {
-	if ((p = (struct pqpair *) mh_xcalloc ((size_t) 1, sizeof(*p))) == NULL)
-	    adios (NULL, "unable to allocate pqpair memory");
-	else {
-	    if ((mp = getm (cp, NULL, 0, error, sizeof(error))) == NULL) {
-		p->pq_text = getcpy (cp);
-		p->pq_error = getcpy (error);
-	    } else {
-		p->pq_text = getcpy (mp->m_text);
-		mnfree (mp);
-	    }
-	    q = (q->pq_next = p);
-	}
+	NEW0(p);
+        if ((mp = getm (cp, NULL, 0, error, sizeof(error))) == NULL) {
+            p->pq_text = getcpy (cp);
+            p->pq_error = getcpy (error);
+        } else {
+            p->pq_text = getcpy (mp->m_text);
+            mnfree (mp);
+        }
+        q = (q->pq_next = p);
     }
 
     for (p = pq.pq_next; p; p = q) {
@@ -1244,22 +1241,19 @@ add_queue (struct mcomp **head, struct mcomp **tail, char *name, char *text, int
 {
     struct mcomp *c1;
 
-    if ((c1 = (struct mcomp *) mh_xcalloc ((size_t) 1, sizeof(*c1))) == NULL)
-	adios (NULL, "unable to allocate comp memory");
-    else {
-	c1->c_flags = flags & ~INIT;
-	if ((c1->c_name = name ? getcpy (name) : NULL))
-	    c1->c_flags |= mcomp_flags (c1->c_name);
-	c1->c_text = text ? getcpy (text) : NULL;
-	if (flags & INIT) {
-	    if (global.c_ovtxt)
-		c1->c_ovtxt = getcpy (global.c_ovtxt);
-	    c1->c_offset = global.c_offset;
-	    c1->c_ovoff = global. c_ovoff;
-	    c1->c_width = c1->c_length = 0;
-	    c1->c_cwidth = global.c_cwidth;
-	    c1->c_flags |= global.c_flags & GFLAGS;
-	}
+    NEW0(c1);
+    c1->c_flags = flags & ~INIT;
+    if ((c1->c_name = name ? getcpy (name) : NULL))
+        c1->c_flags |= mcomp_flags (c1->c_name);
+    c1->c_text = text ? getcpy (text) : NULL;
+    if (flags & INIT) {
+        if (global.c_ovtxt)
+            c1->c_ovtxt = getcpy (global.c_ovtxt);
+        c1->c_offset = global.c_offset;
+        c1->c_ovoff = global. c_ovoff;
+        c1->c_width = c1->c_length = 0;
+        c1->c_cwidth = global.c_cwidth;
+        c1->c_flags |= global.c_flags & GFLAGS;
     }
     if (*head == NULL)
 	*head = c1;