sbr/vector.c: Zero the growth with memset(3), not loop.

[nmh] / uip / scansbr.c

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 2ef32c4e1adcbddc4827bb6d972eb01b9670739f..ce29fa8bc365f0471ee42611b914e27e567b1a14 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -1,6 +1,4 @@
-
-/*
- * scansbr.c -- routines to help scan along...
+/* scansbr.c -- routines to help scan along...
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -38,15 +36,10 @@ static m_getfld_state_t gstate;             /* for accessor functions below    */
 #define DIEWRERR() adios (scnmsg, "write error on")
 
 #define FPUTS(buf) {\
-               if (mh_fputs(buf,scnout) == EOF)\
+               if (fputs(buf,scnout) == EOF)\
                    DIEWRERR();\
                }
 
-/*
- * prototypes
- */
-static int mh_fputs(char *, FILE *);
-
 int
 scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
       int unseen, char *folder, long size, int noisy, charstring_t *scanl)
@@ -86,7 +79,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 +119,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 **) mh_xcalloc ((size_t) ncomps, sizeof(char *));
-       if (nxtbuf == NULL)
-           adios (NULL, "unable to allocate component buffers");
-       used_buf = (struct comp **) mh_xcalloc ((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 +150,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) {
@@ -284,7 +271,7 @@ body:;
                    state = BODY;
                    goto body;
                }
-               /* fall through */
+               /* FALLTHRU */
 
            case FILEEOF:
                goto finished;
@@ -326,10 +313,7 @@ finished:
        if (datecomp) {
            if (! datecomp->c_text) {
                if (datecomp->c_tws == NULL)
-                   datecomp->c_tws = (struct tws *)
-                       mh_xcalloc ((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 {
@@ -361,17 +345,6 @@ finished:
 }
 
 
-static int
-mh_fputs(char *s, FILE *stream)
-{
-    char c;
-
-    while ((c = *s++)) 
-       if (putc (c,stream) == EOF )
-           return(EOF);
-    return (0);
-}
-
 /* The following two functions allow access to the global gstate above. */
 void
 scan_finished () {