Removed a bunch of unreachable break statements found by

SunStudio cc -v.  Also fixed an "end-of-loop code not
reached" condition in uip/dropsbr.c.  That one is significant
because it meant that retries were not attempted when attempting
to open and lock a file.

diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index e97ab626b8e8d3fa99ed817feec9af7ce0452c0b..7dc0a87be17ffdf140518e875cabd5b91ad7e99b 100644 (file)
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -61,7 +61,7 @@ mbx_open (char *file, int mbx_style, uid_t uid, gid_t gid, mode_t mode)
                case ETXTBSY: 
                    j = errno;
                    sleep (5);
                case ETXTBSY: 
                    j = errno;
                    sleep (5);

-                   break;
+                   continue;

 
                default: 
                    /* just return error */
 
                default: 
                    /* just return error */

diff --git a/uip/mhlistsbr.c b/uip/mhlistsbr.c
index 0b4e439f0594d2c227d361f2b3247095e098b7c4..9380c3d72655c67e0dc31afb326bd708ad13aac2 100644 (file)
--- a/uip/mhlistsbr.c
+++ b/uip/mhlistsbr.c
@@ -106,40 +106,32 @@ list_switch (CT ct, int toplevel, int realsize, int verbose, int debug)
     switch (ct->c_type) {
        case CT_MULTIPART:
            return list_multi (ct, toplevel, realsize, verbose, debug);
     switch (ct->c_type) {
        case CT_MULTIPART:
            return list_multi (ct, toplevel, realsize, verbose, debug);

-           break;

 
        case CT_MESSAGE:
            switch (ct->c_subtype) {
                case MESSAGE_PARTIAL:
                    return list_partial (ct, toplevel, realsize, verbose, debug);
 
        case CT_MESSAGE:
            switch (ct->c_subtype) {
                case MESSAGE_PARTIAL:
                    return list_partial (ct, toplevel, realsize, verbose, debug);

-                   break;

 
                case MESSAGE_EXTERNAL:
                    return list_external (ct, toplevel, realsize, verbose, debug);
 
                case MESSAGE_EXTERNAL:
                    return list_external (ct, toplevel, realsize, verbose, debug);

-                   break;

 
                case MESSAGE_RFC822:
                default:
                    return list_content (ct, toplevel, realsize, verbose, debug);
 
                case MESSAGE_RFC822:
                default:
                    return list_content (ct, toplevel, realsize, verbose, debug);

-                   break;

            }
            }

-           break;

 
        case CT_TEXT:
        case CT_AUDIO:
        case CT_IMAGE:
        case CT_VIDEO:
            return list_content (ct, toplevel, realsize, verbose, debug);
 
        case CT_TEXT:
        case CT_AUDIO:
        case CT_IMAGE:
        case CT_VIDEO:
            return list_content (ct, toplevel, realsize, verbose, debug);

-           break;

 
        case CT_APPLICATION:
            return list_application (ct, toplevel, realsize, verbose, debug);
 
        case CT_APPLICATION:
            return list_application (ct, toplevel, realsize, verbose, debug);

-           break;

 
        default:
            /* list_debug (ct); */
            adios (NULL, "unknown content type %d", ct->c_type);
 
        default:
            /* list_debug (ct); */
            adios (NULL, "unknown content type %d", ct->c_type);

-           break;

     }
 
     return 0;  /* NOT REACHED */
     }
 
     return 0;  /* NOT REACHED */

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 6854ab991e560f4db6390822ca0e4444d6604e47..0788d1ef77600feb0fcf5dbfa6acb95838c2fde1 100644 (file)
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -1852,7 +1852,6 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp,
         * buffers that we have duplicated from the parent.
         */
        _exit(0);
         * buffers that we have duplicated from the parent.
         */
        _exit(0);

-       break;

     case -1:
        adios(NULL, "Unable to fork for filter writer process");
        break;
     case -1:
        adios(NULL, "Unable to fork for filter writer process");
        break;

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index c8c954dd1f9ee40afa3bd20f0be593f32a659137..fe0e33041ba2fa9e7dbdc6547a5aa4058b5eac2e 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -223,39 +223,31 @@ show_switch (CT ct, int serial, int alternate)
     switch (ct->c_type) {
        case CT_MULTIPART:
            return show_multi (ct, serial, alternate);
     switch (ct->c_type) {
        case CT_MULTIPART:
            return show_multi (ct, serial, alternate);

-           break;

 
        case CT_MESSAGE:
            switch (ct->c_subtype) {
                case MESSAGE_PARTIAL:
                    return show_partial (ct, serial, alternate);
 
        case CT_MESSAGE:
            switch (ct->c_subtype) {
                case MESSAGE_PARTIAL:
                    return show_partial (ct, serial, alternate);

-                   break;

 
                case MESSAGE_EXTERNAL:
                    return show_external (ct, serial, alternate);
 
                case MESSAGE_EXTERNAL:
                    return show_external (ct, serial, alternate);

-                   break;

 
                case MESSAGE_RFC822:
                default:
                    return show_message_rfc822 (ct, serial, alternate);
 
                case MESSAGE_RFC822:
                default:
                    return show_message_rfc822 (ct, serial, alternate);

-                   break;

            }
            }

-           break;

 
        case CT_TEXT:
            return show_text (ct, serial, alternate);
 
        case CT_TEXT:
            return show_text (ct, serial, alternate);

-           break;

 
        case CT_AUDIO:
        case CT_IMAGE:
        case CT_VIDEO:
        case CT_APPLICATION:
            return show_content (ct, serial, alternate);
 
        case CT_AUDIO:
        case CT_IMAGE:
        case CT_VIDEO:
        case CT_APPLICATION:
            return show_content (ct, serial, alternate);

-           break;

 
        default:
            adios (NULL, "unknown content type %d", ct->c_type);
 
        default:
            adios (NULL, "unknown content type %d", ct->c_type);

-           break;

     }
 
     return 0;  /* NOT REACHED */
     }
 
     return 0;  /* NOT REACHED */

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 9efc732cf848888f7815fa9140e0df894df89662..93d3e90259fc8e90bf2612bd6b2c0b233d320d42 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -135,13 +135,11 @@ store_switch (CT ct)
     switch (ct->c_type) {
        case CT_MULTIPART:
            return store_multi (ct);
     switch (ct->c_type) {
        case CT_MULTIPART:
            return store_multi (ct);

-           break;

 
        case CT_MESSAGE:
            switch (ct->c_subtype) {
                case MESSAGE_PARTIAL:
                    return store_partial (ct);
 
        case CT_MESSAGE:
            switch (ct->c_subtype) {
                case MESSAGE_PARTIAL:
                    return store_partial (ct);

-                   break;

 
                case MESSAGE_EXTERNAL:
                    return store_external (ct);
 
                case MESSAGE_EXTERNAL:
                    return store_external (ct);


@@ -149,24 +147,19 @@ store_switch (CT ct)
                case MESSAGE_RFC822:
                default:
                    return store_generic (ct);
                case MESSAGE_RFC822:
                default:
                    return store_generic (ct);

-                   break;

            }
            }

-           break;

 
        case CT_APPLICATION:
            return store_application (ct);
 
        case CT_APPLICATION:
            return store_application (ct);

-           break;

 
        case CT_TEXT:
        case CT_AUDIO:
        case CT_IMAGE:
        case CT_VIDEO:
            return store_generic (ct);
 
        case CT_TEXT:
        case CT_AUDIO:
        case CT_IMAGE:
        case CT_VIDEO:
            return store_generic (ct);

-           break;

 
        default:
            adios (NULL, "unknown content type %d", ct->c_type);
 
        default:
            adios (NULL, "unknown content type %d", ct->c_type);

-           break;

     }
 
     return OK; /* NOT REACHED */
     }
 
     return OK; /* NOT REACHED */

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 1088d3169a5b50f8fb728d83fc085f55b30cbd5c..73f15b89211f63feff06be18d3b0eb06380d4ce0 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -876,7 +876,6 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st)
        fprintf (stderr, "unable to exec ");
        perror (postproc);
        _exit (-1);
        fprintf (stderr, "unable to exec ");
        perror (postproc);
        _exit (-1);

-       break;  /* NOT REACHED */

 
     default:
        /*
 
     default:
        /*

diff --git a/uip/slocal.c b/uip/slocal.c
index 11a44cc952c6e17705e409d72444292c4d565923..c944cd69bc0997e33f45ec2f31b75df6c6888d32 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -1477,7 +1477,6 @@ suppress_duplicates (int fd, char *file)
                free (cp);
                fclose (in);
                return result;
                free (cp);
                fclose (in);
                return result;

-               break;

 
           case BODY:
           case FILEEOF:
 
           case BODY:
           case FILEEOF: