X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0ef703ef8b5176df2c593153d55a26fb914dd94e..b40ecb4417e49cbc53459b28ee394a3b2eb93c9c:/uip/scansbr.c

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 8d2a46d2..c7979b64 100644
--- 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
@@ -21,7 +19,7 @@
  * the entire message body when we're only going to display 30
  * characters of it.
  */
-#define SBUFSIZ 512
+#define SBUFSIZ NMH_BUFSIZ
 
 static struct format *fmt;
 static struct comp *datecomp;		/* pntr to "date" comp             */
@@ -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)
@@ -278,7 +271,7 @@ body:;
 		    state = BODY;
 		    goto body;
 		}
-		/* fall through */
+		/* FALLTHRU */
 
 	    case FILEEOF:
 		goto finished;
@@ -352,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 () {