X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/e903b81df0e36dde59d6b6441eb49704380f94f4..d601805e1d9c40d88107eb4b79c6cd592d660eb2:/sbr/read_switch_multiword.c

diff --git a/sbr/read_switch_multiword.c b/sbr/read_switch_multiword.c
index ddacfa2d..67c5f33e 100644
--- a/sbr/read_switch_multiword.c
+++ b/sbr/read_switch_multiword.c
@@ -1,6 +1,4 @@
-
-/*
- * read_switch_multiword.c -- get an answer from the user and return a string array
+/* read_switch_multiword.c -- get an answer from the user and return a string array
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -52,7 +50,7 @@ read_switch_multiword (const char *prompt, const struct swit *ansp)
 		 * then just return.
 		 */
 
-		else if (ferror(stdin)) {
+		if (ferror(stdin)) {
 		    if (errno == EINTR) {
 		    	clearerr(stdin);
 			continue;
@@ -60,14 +58,11 @@ read_switch_multiword (const char *prompt, const struct swit *ansp)
 		    fprintf(stderr, "\nError %s during read\n",
 		    	    strerror(errno));
 		    siglongjmp (sigenv, 1);
-		} else {
-		    /*
-		     * Just for completeness's sake ...
-		     */
-
-		    fprintf(stderr, "\nUnknown problem in getchar()\n");
-		    siglongjmp (sigenv, 1);
 		}
+
+                /* Just for completeness's sake... */
+                fprintf(stderr, "\nUnknown problem in getchar()\n");
+                siglongjmp(sigenv, 1);
 	    }
 	    if (cp < &ansbuf[sizeof ansbuf - 1])
 		*cp++ = i;
@@ -99,8 +94,5 @@ intrser (int i)
 {
     NMH_UNUSED (i);
 
-    /*
-     * should this be siglongjmp?
-     */
     siglongjmp (sigenv, 1);
 }