From: David Levine Date: Wed, 11 Dec 2013 00:22:23 +0000 (-0600) Subject: Removed a bunch of unreachable break statements found by X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/43a65e9777214029046fe7a1427493e6e503a717?ds=sidebyside;hp=959dbc18d02cb81512ee2d0904b76e9287c95ee4 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 e97ab626..7dc0a87b 100644 --- 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); - break; + continue; default: /* just return error */ diff --git a/uip/mhlistsbr.c b/uip/mhlistsbr.c index 0b4e439f..9380c3d7 100644 --- 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); - break; 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); - break; 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); - break; 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); - break; } return 0; /* NOT REACHED */ diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c index 6854ab99..0788d1ef 100644 --- 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); - break; case -1: adios(NULL, "Unable to fork for filter writer process"); break; diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c index c8c954dd..fe0e3304 100644 --- 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); - break; 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); - break; case MESSAGE_RFC822: default: return show_message_rfc822 (ct, serial, alternate); - break; } - break; 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); - break; default: adios (NULL, "unknown content type %d", ct->c_type); - break; } return 0; /* NOT REACHED */ diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c index 9efc732c..93d3e902 100644 --- 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); - break; case CT_MESSAGE: switch (ct->c_subtype) { case MESSAGE_PARTIAL: return store_partial (ct); - break; case MESSAGE_EXTERNAL: return store_external (ct); @@ -149,24 +147,19 @@ store_switch (CT ct) case MESSAGE_RFC822: default: return store_generic (ct); - break; } - break; case CT_APPLICATION: return store_application (ct); - break; 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); - break; } return OK; /* NOT REACHED */ diff --git a/uip/sendsbr.c b/uip/sendsbr.c index 1088d316..73f15b89 100644 --- 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); - break; /* NOT REACHED */ default: /* diff --git a/uip/slocal.c b/uip/slocal.c index 11a44cc9..c944cd69 100644 --- a/uip/slocal.c +++ b/uip/slocal.c @@ -1477,7 +1477,6 @@ suppress_duplicates (int fd, char *file) free (cp); fclose (in); return result; - break; case BODY: case FILEEOF: