Remove unused NCWD and NPWD #defines.

[nmh] / uip / scansbr.c

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 749743c1c4c3f55b2461ccc3e74f2f8c834fef8f..8d2a46d2e1921d90692dcfe91044d19d913cc08a 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -75,7 +75,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
            width = INT_MAX;
        }
        dat[3] = slwidth = width;
-       *scanl = charstring_create (width);
+       *scanl = charstring_create (width < NMH_BUFSIZ ? width : NMH_BUFSIZ);
        if (outnum)
            umask(~m_gmprot());
 
@@ -86,7 +86,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
        datecomp = fmt_findcomp("date");
        cptr = fmt_findcomp("folder");
        if (cptr && folder)
-           cptr->c_text = getcpy(folder);
+           cptr->c_text = mh_xstrdup(folder);
        if (fmt_addcompentry("encrypted")) {
                ncomps++;
        }
@@ -126,13 +126,8 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
         * and it's our responsibility to free it.
         */
 
-       nxtbuf = compbuffers = (char **) calloc((size_t) ncomps, sizeof(char *));
-       if (nxtbuf == NULL)
-           adios (NULL, "unable to allocate component buffers");
-       used_buf = (struct comp **) calloc((size_t) (ncomps+1),
-           sizeof(struct comp *));
-       if (used_buf == NULL)
-           adios (NULL, "unable to allocate component buffer stack");
+       nxtbuf = compbuffers = mh_xcalloc(ncomps, sizeof *nxtbuf);
+       used_buf = mh_xcalloc(ncomps + 1, sizeof *used_buf);
        used_buf += ncomps+1; *--used_buf = 0;
        rlwidth = bodycomp && (width > SBUFSIZ)
            ? min (width, NMH_BUFSIZ)
@@ -162,9 +157,8 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
        if (ferror(inb)) {
            advise("read", "unable to"); /* "read error" */
            return SCNFAT;
-       } else {
-           return SCNEOF;
        }
+        return SCNEOF;
     }
 
     if (outnum) {
@@ -242,7 +236,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
                  * The previous code here used to call m_getfld() using
                  * pointers to the underlying output stdio buffers to
                  * avoid the extra copy.  Tests by Markus Schnalke show
-                 * no noticable performance loss on larger mailboxes
+                 * no noticeable performance loss on larger mailboxes
                  * if we incur an extra copy, and messing around with
                  * internal stdio buffers is becoming more and more
                  * unportable as times go on.  So from now on just deal
@@ -326,10 +320,7 @@ finished:
        if (datecomp) {
            if (! datecomp->c_text) {
                if (datecomp->c_tws == NULL)
-                   datecomp->c_tws = (struct tws *)
-                       calloc((size_t) 1, sizeof(*datecomp->c_tws));
-               if (datecomp->c_tws == NULL)
-                   adios (NULL, "unable to allocate tws buffer");
+                   NEW0(datecomp->c_tws);
                *datecomp->c_tws = *dlocaltime ((time_t *) &st.st_mtime);
                datecomp->c_flags |= CF_DATEFAB|CF_TRUE;
            } else {