From: David Levine <levinedl@acm.org>
Date: Mon, 4 Feb 2013 04:51:00 +0000 (-0600)
Subject: Tweaked logic in brkstring.c and showfile.c to get rid of the
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/2ba12fd3ce39f4f4bcb693f3e67e233294acb581?hp=f3d2f47d97e4660b78e7a1c89abbfe0e6bfaf97d

Tweaked logic in brkstring.c and showfile.c to get rid of the
remaining "statement not reached" warnings from Solaris cc.
---

diff --git a/sbr/brkstring.c b/sbr/brkstring.c
index 5375596d..bdc8c30a 100644
--- a/sbr/brkstring.c
+++ b/sbr/brkstring.c
@@ -59,7 +59,7 @@ brkstring (char *str, char *brksep, char *brkterm)
 	if (!c || brkany (c, brkterm)) {
 	    *s = '\0';
 	    broken[i] = NULL;
-	    return broken;
+	    break;
 	}
 
 	/* set next start addr */
@@ -69,7 +69,7 @@ brkstring (char *str, char *brksep, char *brkterm)
 	    ;	/* empty body */
     }
 
-    return broken;	/* NOT REACHED */
+    return broken;
 }
 
 
diff --git a/sbr/showfile.c b/sbr/showfile.c
index 369c953b..1d4bd17f 100644
--- a/sbr/showfile.c
+++ b/sbr/showfile.c
@@ -16,6 +16,7 @@ showfile (char **arg, char *file)
     pid_t pid;
     int isdraft, vecp;
     char **vec, *program;
+    int retval = 1;
 
     context_save();	/* save the context file */
     fflush(stdout);
@@ -32,7 +33,7 @@ showfile (char **arg, char *file)
     case -1:
 	/* fork error */
 	advise ("fork", "unable to");
-	return 1;
+	break;
 
     case 0:
 	/* child */
@@ -59,8 +60,8 @@ showfile (char **arg, char *file)
 
     default:
 	/* parent */
-	return (pidwait (pid, -1) & 0377 ? 1 : 0);
+	retval = pidwait (pid, -1) & 0377 ? 1 : 0;
     }
 
-    return 1;	/* NOT REACHED */
+    return retval;
 }