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 5375596de68b49e817ae406f809423f61607f385..bdc8c30ac91cea9b10f80ebfe01e95fd5290fa5e 100644 (file)
--- 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;
        if (!c || brkany (c, brkterm)) {
            *s = '\0';
            broken[i] = NULL;

-           return broken;
+           break;

        }
 
        /* set next start addr */
        }
 
        /* set next start addr */


@@ -69,7 +69,7 @@ brkstring (char *str, char *brksep, char *brkterm)
            ;   /* empty body */
     }
 
            ;   /* empty body */
     }
 

-    return broken;     /* NOT REACHED */
+    return broken;

 }
 
 
 }
 
 

diff --git a/sbr/showfile.c b/sbr/showfile.c
index 369c953b6372dfd4e5e9663d8888b60ad8bff2a0..1d4bd17f3676f641e62a7e8f7ddeacb781716623 100644 (file)
--- 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;
     pid_t pid;
     int isdraft, vecp;
     char **vec, *program;

+    int retval = 1;

 
     context_save();    /* save the context file */
     fflush(stdout);
 
     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");
     case -1:
        /* fork error */
        advise ("fork", "unable to");

-       return 1;
+       break;

 
     case 0:
        /* child */
 
     case 0:
        /* child */


@@ -59,8 +60,8 @@ showfile (char **arg, char *file)
 
     default:
        /* parent */
 
     default:
        /* parent */

-       return (pidwait (pid, -1) & 0377 ? 1 : 0);
+       retval = pidwait (pid, -1) & 0377 ? 1 : 0;

     }
 
     }
 

-    return 1;  /* NOT REACHED */
+    return retval;

 }
 }