X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/b2c1539592ef07b0236cdd974763af75958bfc05..665dfc96:/uip/scansbr.c?ds=sidebyside

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 191e69e8..7023502f 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
@@ -14,15 +12,6 @@
 #include <h/tws.h>
 #include <h/utils.h>
 
-/*
- * Buffer size for content part of header fields.  We want this
- * to be large enough so that we don't do a lot of extra FLDPLUS
- * calls on m_getfld but small enough so that we don't snarf
- * the entire message body when we're only going to display 30
- * characters of it.
- */
-#define SBUFSIZ 512
-
 static struct format *fmt;
 static struct comp *datecomp;		/* pntr to "date" comp             */
 static struct comp *bodycomp;		/* pntr to "body" pseudo-comp      *
@@ -70,7 +59,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 < NMH_BUFSIZ ? width : NMH_BUFSIZ);
+        *scanl = charstring_create (min(width, NMH_BUFSIZ));
 	if (outnum)
 	    umask(~m_gmprot());
 
@@ -124,9 +113,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 	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)
-	    : SBUFSIZ;
+	rlwidth = NMH_BUFSIZ;
 	for (i = ncomps; i--; )
 	    *nxtbuf++ = mh_xmalloc(rlwidth);
     }
@@ -273,7 +260,7 @@ body:;
 		    state = BODY;
 		    goto body;
 		}
-		/* fall through */
+		/* FALLTHRU */
 
 	    case FILEEOF:
 		goto finished;