X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2eea62e1e3ef4496c0a850250d6575a65a6f2f3d..d0bd505e1a9b0bc2fc107446dcb615bf55c42e81:/uip/scansbr.c?ds=sidebyside

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 715357bc..569991ec 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -59,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());
 
@@ -260,7 +260,7 @@ body:;
 		    state = BODY;
 		    goto body;
 		}
-		/* FALLTHRU */
+		goto finished;
 
 	    case FILEEOF:
 		goto finished;
@@ -336,7 +336,7 @@ finished:
 
 /* The following two functions allow access to the global gstate above. */
 void
-scan_finished () {
+scan_finished(void) {
     m_getfld_state_destroy (&gstate);
 }