From 38761fbd9369446f7654800f2a7e0824310627d0 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Sat, 24 Dec 2022 22:20:39 -0800 Subject: [PATCH] Resolve warning: unreachable-code-break (remove break following return) --- src/inet.c | 14 +------------- src/lisp2c.c | 5 ++--- src/llstk.c | 3 +-- src/miscn.c | 4 +--- src/storage.c | 2 -- src/timer.c | 1 - src/unixcomm.c | 15 ++++----------- src/uraid.c | 1 - 8 files changed, 9 insertions(+), 36 deletions(-) diff --git a/src/inet.c b/src/inet.c index 4c11d19..0231d3a 100644 --- a/src/inet.c +++ b/src/inet.c @@ -102,7 +102,6 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li service = getservbyname(namestring, servstring); if (!service) return (NIL); return (GetSmallp(ntohs(service->s_port))); - break; case TCPsocket: addr_class = LispNumToCInt(nameConn); @@ -112,7 +111,6 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li fcntl(result, F_SETOWN, getpid()); return (GetSmallp(result)); - break; case TCPconnect: /* args: hostname or (fixp)address, socket# */ memset(&farend, 0, sizeof farend); N_GETNUMBER(nameConn, res, string_host); @@ -136,7 +134,6 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li fcntl(result, F_SETOWN, getpid()); return (GetSmallp(result)); - break; case TCPsend: /* args: conn, buffer, len */ sock = LispNumToCInt(nameConn); @@ -159,7 +156,6 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li return (NIL); } return (GetSmallp(result)); - break; case TCPrecv: /* args: conn, buffer, maxlen */ sock = LispNumToCInt(nameConn); @@ -177,7 +173,6 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li #endif /* BYTESWAP */ return (GetSmallp(result)); - break; case TCPclose: sock = LispNumToCInt(nameConn); @@ -221,7 +216,6 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li FD_SET(result, &LispReadFds); DBPRINT(("LispIOFds = %p\n", (void *)&LispIOFds)); return (GetSmallp(result)); - break; case TCPAccept: /* Socket we're listening on */ sock = LispNumToCInt(nameConn); @@ -234,7 +228,6 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li fcntl(result, F_SETOWN, getpid()); return (GetSmallp(result)); - break; case INETpeername: /* socket#, buffer for name string */ sock = LispNumToCInt(nameConn); @@ -244,7 +237,6 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li host = gethostbyaddr((const char *)&addr, ures, AF_INET); strcpy((char *)buffer, host->h_name); return (GetSmallp(strlen(host->h_name))); - break; case INETgetname: /* host addr, buffer for name string */ sock = LispNumToCInt(nameConn); @@ -255,7 +247,6 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li if (!host) return (GetSmallp(0)); strcpy((char *)buffer, host->h_name); return (GetSmallp(strlen(host->h_name))); - break; case UDPListen: /* socket# to listen on */ sock = LispNumToCInt(nameConn); @@ -275,7 +266,6 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li FD_SET(result, &LispReadFds); DBPRINT(("LispIOFds = %p\n", (void *)&LispIOFds)); return (GetSmallp(result)); - break; case UDPSendto: /* fd-socket# addr remote-socket buffer len*/ sock = LispNumToCInt(nameConn); @@ -301,7 +291,6 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li return (NIL); } return (GetSmallp(result)); - break; case UDPRecvfrom: /* fd-socket# buffer len addr-cell port-cell*/ sock = LispNumToCInt(nameConn); @@ -328,9 +317,8 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li #endif /* BYTESWAP */ return (GetSmallp(result)); - break; - default: return (NIL); break; + default: return (NIL); } #endif /* DOS */ } diff --git a/src/lisp2c.c b/src/lisp2c.c index e21e2b1..44b3396 100644 --- a/src/lisp2c.c +++ b/src/lisp2c.c @@ -67,8 +67,8 @@ void LispStringToCStr(LispPTR lispstring, char *cstring) { int LispIntToCInt(LispPTR lispint) { switch ((0xFFFF0000 & lispint)) { - case S_POSITIVE: return (lispint & 0xFFFF); break; - case S_NEGATIVE: return (lispint | 0xFFFF0000); break; + case S_POSITIVE: return (lispint & 0xFFFF); + case S_NEGATIVE: return (lispint | 0xFFFF0000); default: if (GetTypeNumber(lispint) == TYPE_FIXP) { return (*((int *)NativeAligned4FromLAddr(lispint))); @@ -79,7 +79,6 @@ int LispIntToCInt(LispPTR lispint) { /* NOTREACHED */ return(0); } - break; } } diff --git a/src/llstk.c b/src/llstk.c index 4673422..21de461 100644 --- a/src/llstk.c +++ b/src/llstk.c @@ -316,7 +316,7 @@ STARTOVER: SCAN: switch ((unsigned)(STKWORD(scanptr68k)->flags)) { - case STK_FSB: goto FREESCAN; break; + case STK_FSB: goto FREESCAN; case STK_GUARD: if ((UNSIGNED)scanptr68k < (UNSIGNED)easp68k) goto FREESCAN; if (start68k) { @@ -324,7 +324,6 @@ SCAN: goto SCAN; } else goto NEWPAGE; - break; case STK_FX: scanptr68k = (StackWord *)NativeAligned2FromStackOffset(((FX *)scanptr68k)->nextblock); break; diff --git a/src/miscn.c b/src/miscn.c index 308b3d9..1ee20b0 100644 --- a/src/miscn.c +++ b/src/miscn.c @@ -76,7 +76,6 @@ int OP_miscn(int misc_index, int arg_count) { if (arg_count > 255) { error("miscn: arg_count too big! continue punts"); goto do_ufn; - break; } result = values(arg_count, args); break; @@ -86,7 +85,6 @@ int OP_miscn(int misc_index, int arg_count) { if (arg_count > 255) { error("miscn: arg_count too big! continue punts"); goto do_ufn; - break; } result = values_list(arg_count, args); break; @@ -156,7 +154,7 @@ int OP_miscn(int misc_index, int arg_count) { result = 0; break; - default: goto do_ufn; break; + default: goto do_ufn; } /* switch end */ diff --git a/src/storage.c b/src/storage.c index 0ca44f8..fe20786 100644 --- a/src/storage.c +++ b/src/storage.c @@ -87,8 +87,6 @@ void checkfor_storagefull(unsigned int npages) { #endif return; /*(NIL); */ - break; - case SFS_SWITCHABLE: if (npages == NIL) { if (pagesleft <= 0) { diff --git a/src/timer.c b/src/timer.c index ec1d4ef..c3b35e4 100644 --- a/src/timer.c +++ b/src/timer.c @@ -757,7 +757,6 @@ and do a 'v' before trying anything else."; /* Assume that a user tried to exit UNIX shell */ killpg(getpgrp(), SIGKILL); exit(0); - break; case SIGFPE: snprintf(errormsg, sizeof(errormsg), "%s (%d) at address %p.\n%s", strsignal(sig), info->si_code, info->si_addr, stdmsg); break; diff --git a/src/unixcomm.c b/src/unixcomm.c index 0c9a18f..40690bb 100644 --- a/src/unixcomm.c +++ b/src/unixcomm.c @@ -443,7 +443,6 @@ LispPTR Unix_handlecomm(LispPTR *args) { unlink(PipeName); return (NIL); } - break; } case 1: /* Write byte */ @@ -462,7 +461,6 @@ LispPTR Unix_handlecomm(LispPTR *args) { return (NIL); } else return (GetSmallp(1)); - break; default: return (NIL); } @@ -504,11 +502,9 @@ LispPTR Unix_handlecomm(LispPTR *args) { /* Either way, signal EOF. */ DBPRINT(("Indicating EOF from PTY desc %d.\n", slot)); return (NIL); - break; - default: return (NIL); break; + default: return (NIL); } - break; case 3: /* Kill process */ /* Maiko uses this as CLOSEF, so "process" is a misnomer */ @@ -559,7 +555,6 @@ LispPTR Unix_handlecomm(LispPTR *args) { /* If status available, return it, otherwise T */ return (GetSmallp(UJ[slot].status)); - break; case 4: case 11: /* Fork PTY process */ @@ -615,7 +610,6 @@ LispPTR Unix_handlecomm(LispPTR *args) { close(Master); return (NIL); } - break; } case 5: /* Kill all the subprocesses */ close_unix_descriptors(); return (ATOM_T); @@ -679,7 +673,6 @@ LispPTR Unix_handlecomm(LispPTR *args) { return (ATOM_T); else return (GetSmallp(UJ[slot].status)); - break; case 8: /* Return largest supported command */ return (GetSmallp(15)); @@ -804,7 +797,7 @@ LispPTR Unix_handlecomm(LispPTR *args) { UJ[sockFD].type = UJSOCKET; return (GetSmallp(sockFD)); - } break; + } case 13: /* try to accept */ { @@ -836,7 +829,7 @@ LispPTR Unix_handlecomm(LispPTR *args) { } } else return (NIL); - } break; + } case 14: /* return type of socket */ { @@ -847,7 +840,7 @@ LispPTR Unix_handlecomm(LispPTR *args) { return GetSmallp(UJ[streamFD].type); else return NIL; - } break; + } case 15: /* Write buffer */ { diff --git a/src/uraid.c b/src/uraid.c index 94164c6..f064f9a 100644 --- a/src/uraid.c +++ b/src/uraid.c @@ -475,7 +475,6 @@ LispPTR uraid_commands(void) { print(defcell68k->defpointer); return (T); } - break; case 'M': /* Machine States */ printf("TOS : 0x%x\n", TopOfStack);