Alter HasSuffixC()'s char * to be const.

[nmh] / uip / ap.c

diff --git a/uip/ap.c b/uip/ap.c
index b124c306c9f9ac9f9a30ebc71a498e65068354d3..89b207b57e3a4c73a699b8d4b27dd2967cbf4d1e 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -53,9 +53,9 @@ main (int argc, char **argv)
     char buf[BUFSIZ], **argp;
     char **arguments, *addrs[NADDRS];
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], 2)) { return 1; }
 
-    mts_init (invo_name);
+    mts_init ();
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
@@ -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;