Mercurial > illumos > git > illumos-joyent
changeset 25233:bf151a4cdf4e
12947 stand: this statement may fall through
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Reviewed by: Sebastian Wiedenroth <wiedi@frubar.net>
Approved by: Dan McDonald <danmcd@joyent.com>
| author | Toomas Soome <tsoome@me.com> |
|---|---|
| date | Mon, 13 Apr 2020 20:00:45 +0300 |
| parents | 1e97e55a86d8 |
| children | 75715aa4fe66 |
| files | usr/src/stand/lib/inet/ipv4.c usr/src/stand/lib/sock/socket.c |
| diffstat | 2 files changed, 14 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/stand/lib/inet/ipv4.c Mon Apr 13 10:24:01 2020 +0300 +++ b/usr/src/stand/lib/inet/ipv4.c Mon Apr 13 20:00:45 2020 +0300 @@ -219,7 +219,7 @@ ipp = fragment[first_frag].ipp; for (i = 0; i < FRAG_MAX; i++) { if (fragment[i].mp != NULL && ip_id != fragment[i].ipid && - fragment[i].ipp != ipp) { + fragment[i].ipp != ipp) { #ifdef FRAG_DEBUG printf("ipv4: Frag id mismatch: %x != %x\n", fragment[i].ipid, ip_id); @@ -342,7 +342,7 @@ { static int routing_table_initialized; int index; - uint8_t tmp_flag; + uint8_t tmp_flag; if (gatewayp == NULL) { errno = EINVAL; @@ -383,8 +383,10 @@ table[index].flag = RT_UNUSED; table[index].dest.s_addr = htonl(INADDR_ANY); table[index].gateway.s_addr = htonl(INADDR_ANY); - } else + } else { table[index].flag = RT_NG; + } + break; default: errno = EINVAL; return (-1); @@ -716,7 +718,7 @@ iphp = (struct ip *)igp->igm_mp->b_rptr; if (iphp->ip_v != IPVERSION) { dprintf("ipv4_input(%d): IPv%d datagram discarded\n", - index, iphp->ip_v); + index, iphp->ip_v); del_gram(&sockets[index].inq, igp, TRUE); continue; } @@ -1080,7 +1082,7 @@ /* Routing necessary? */ if (((datagram.igm_oflags & MSG_DONTROUTE) == 0) && - ((iph->ip_dst.s_addr & netmask.s_addr) != mynet.s_addr)) { + ((iph->ip_dst.s_addr & netmask.s_addr) != mynet.s_addr)) { if ((rip = ipv4_get_route(RT_HOST, &iph->ip_dst, NULL)) == NULL) { rip = ipv4_get_route(RT_DEFAULT, NULL, NULL); @@ -1141,7 +1143,7 @@ while ((c = *cp) != '\0') { if (isdigit(c)) { if ((c - '0') >= base) - break; + break; val = (val * base) + (c - '0'); cp++; continue; @@ -1186,20 +1188,20 @@ case 2: /* a.b -- 8.24 bits */ if (parts[1] > 0xffffff) - return ((uint32_t)-1); + return ((uint32_t)-1); val = (parts[0] << 24) | (parts[1] & 0xffffff); break; case 3: /* a.b.c -- 8.8.16 bits */ if (parts[2] > 0xffff) - return ((uint32_t)-1); + return ((uint32_t)-1); val = (parts[0] << 24) | ((parts[1] & 0xff) << 16) | - (parts[2] & 0xffff); + (parts[2] & 0xffff); break; case 4: /* a.b.c.d -- 8.8.8.8 bits */ if (parts[3] > 0xff) - return ((uint32_t)-1); + return ((uint32_t)-1); val = (parts[0] << 24) | ((parts[1] & 0xff) << 16) | ((parts[2] & 0xff) << 8) | (parts[3] & 0xff); break;
--- a/usr/src/stand/lib/sock/socket.c Mon Apr 13 10:24:01 2020 +0300 +++ b/usr/src/stand/lib/sock/socket.c Mon Apr 13 20:00:45 2020 +0300 @@ -25,8 +25,6 @@ * socket.c, Code implementing a simple socket interface. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include "socket_impl.h" #include <sys/isa_defs.h> @@ -85,7 +83,7 @@ * * Notes: * Only PF_INET communication domains are supported. Within - * this domain, only SOCK_RAW, SOCK_DGRAM and SOCK_STREAM types are + * this domain, only SOCK_RAW, SOCK_DGRAM and SOCK_STREAM types are * supported. */ int @@ -242,6 +240,7 @@ *optlen = 0; errno = EINVAL; } + break; default: errno = ENOPROTOOPT; break;