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 c2ddf3691e09b0091a6e6bdbf096fb1d90c677da..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
  *
  * 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) {\
 #define DIEWRERR() adios (scnmsg, "write error on")
 
 #define FPUTS(buf) {\

-               if (mh_fputs(buf,scnout) == EOF)\
+               if (fputs(buf,scnout) == EOF)\

                    DIEWRERR();\
                }
 
                    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)
 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)
        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++;
        }
        if (fmt_addcompentry("encrypted")) {
                ncomps++;
        }


@@ -157,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;
        if (ferror(inb)) {
            advise("read", "unable to"); /* "read error" */
            return SCNFAT;

-       } else {
-           return SCNEOF;

        }
        }

+        return SCNEOF;

     }
 
     if (outnum) {
     }
 
     if (outnum) {


@@ -279,7 +271,7 @@ body:;
                    state = BODY;
                    goto body;
                }
                    state = BODY;
                    goto body;
                }

-               /* fall through */
+               /* FALLTHRU */

 
            case FILEEOF:
                goto finished;
 
            case FILEEOF:
                goto finished;


@@ -353,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 () {
 /* The following two functions allow access to the global gstate above. */
 void
 scan_finished () {