Consistenly use UNREACHABLE() instead of ISC_UNREACHABLE()

In couple places, we have missed INSIST(0) or ISC_UNREACHABLE()
replacement on some branches with UNREACHABLE().  Replace all
ISC_UNREACHABLE() or INSIST(0) calls with UNREACHABLE().

diff --git a/cocci/unreachable.spatch b/cocci/unreachable.spatch
index 100f1a0abe16839dc8ab9846a097b474150ed56a..84c0c344bb5f9af56f75fd8c6790a505d1a8fb20 100644 (file)
--- a/cocci/unreachable.spatch
+++ b/cocci/unreachable.spatch
@@ -11,3 +11,9 @@
 -   INSIST(0);
 -   ISC_UNREACHABLE();
 +   UNREACHABLE();
+
+@@
+@@
+
+- UNREACHABLE();
+  UNREACHABLE();

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index 42a98e3e5a1fc5a0746e955c5db0b8c20d801fc1..d446df3cd3a464ba187d87b75ae7de760ba3307f 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -3182,7 +3182,6 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
                                    "deprecated");
                } else {
                        UNREACHABLE();
-                       ISC_UNREACHABLE();
                }
        }
 

diff --git a/lib/dns/client.c b/lib/dns/client.c
index 21aed4106227438a0c4e9498e6d1064cdfaff42d..a90d4ded8a756f4f4250fd388880884c8dd7cf19 100644 (file)
--- a/lib/dns/client.c
+++ b/lib/dns/client.c
@@ -220,7 +220,6 @@ getudpdispatch(int family, dns_dispatchmgr_t *dispatchmgr,
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
        attrmask = 0;
        attrmask |= DNS_DISPATCHATTR_UDP;

diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index 50eb1ce4d8f674133eaa40e503d0ab993bf63988..c5f0fff7d843d7895b6fef2db201a9d93bee2866 100644 (file)
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -916,7 +916,6 @@ free_buffer(dns_dispatch_t *disp, void *buf, unsigned int len) {
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
 }
 
@@ -1587,7 +1586,6 @@ startrecv(dns_dispatch_t *disp, dispsocket_t *dispsock) {
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
 
        return (ISC_R_SUCCESS);

diff --git a/lib/dns/pkcs11ecdsa_link.c b/lib/dns/pkcs11ecdsa_link.c
index 9e0d5320aad13c0515256540516a69df0627c01e..2806c3bbead167a23e52346c54b059c9d7df433e 100644 (file)
--- a/lib/dns/pkcs11ecdsa_link.c
+++ b/lib/dns/pkcs11ecdsa_link.c
@@ -192,7 +192,6 @@ pkcs11ecdsa_sign(dst_context_t *dctx, isc_buffer_t *sig) {
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
 
        PK11_RET(pkcs_C_DigestFinal, (pk11_ctx->session, digest, &dgstlen),
@@ -312,7 +311,6 @@ pkcs11ecdsa_verify(dst_context_t *dctx, const isc_region_t *sig) {
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
 
        PK11_RET(pkcs_C_DigestFinal, (pk11_ctx->session, digest, &dgstlen),
@@ -454,7 +452,6 @@ pkcs11ecdsa_compare(const dst_key_t *key1, const dst_key_t *key2) {
                break;                                                   \
        default:                                                         \
                UNREACHABLE();                                           \
-               ISC_UNREACHABLE();                                       \
        }
 
 #define FREECURVE()                                                     \
@@ -564,7 +561,6 @@ pkcs11ecdsa_generate(dst_key_t *key, int unused, void (*callback)(int)) {
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
 
        return (ISC_R_SUCCESS);
@@ -647,7 +643,6 @@ pkcs11ecdsa_todns(const dst_key_t *key, isc_buffer_t *data) {
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
 
        ec = key->keydata.pkey;
@@ -689,7 +684,6 @@ pkcs11ecdsa_fromdns(dst_key_t *key, isc_buffer_t *data) {
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
 
        isc_buffer_remainingregion(data, &r);
@@ -985,7 +979,6 @@ pkcs11ecdsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) {
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
 
        return (ISC_R_SUCCESS);
@@ -1107,7 +1100,6 @@ pkcs11ecdsa_fromlabel(dst_key_t *key, const char *engine, const char *label,
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
 
        pk11_return_session(pk11_ctx);

diff --git a/lib/dns/pkcs11eddsa_link.c b/lib/dns/pkcs11eddsa_link.c
index 9979e858e5ca7c6e3e7c40ac619d0009bd7da330..a6aff28c6c80399d1d57981dd25aa4b9dc66a146 100644 (file)
--- a/lib/dns/pkcs11eddsa_link.c
+++ b/lib/dns/pkcs11eddsa_link.c
@@ -151,7 +151,6 @@ pkcs11eddsa_sign(dst_context_t *dctx, isc_buffer_t *sig) {
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
 
        pk11_ctx = isc_mem_get(dctx->mctx, sizeof(*pk11_ctx));
@@ -426,7 +425,6 @@ pkcs11eddsa_compare(const dst_key_t *key1, const dst_key_t *key2) {
                break;                                                         \
        default:                                                               \
                UNREACHABLE();                                                 \
-               ISC_UNREACHABLE();                                             \
        }
 
 #define FREECURVE()                                                     \
@@ -536,7 +534,6 @@ pkcs11eddsa_generate(dst_key_t *key, int unused, void (*callback)(int)) {
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
 
        return (ISC_R_SUCCESS);
@@ -619,7 +616,6 @@ pkcs11eddsa_todns(const dst_key_t *key, isc_buffer_t *data) {
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
 
        ec = key->keydata.pkey;
@@ -660,7 +656,6 @@ pkcs11eddsa_fromdns(dst_key_t *key, isc_buffer_t *data) {
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
 
        isc_buffer_remainingregion(data, &r);
@@ -955,7 +950,6 @@ pkcs11eddsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) {
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
 
        return (ISC_R_SUCCESS);
@@ -1077,7 +1071,6 @@ pkcs11eddsa_fromlabel(dst_key_t *key, const char *engine, const char *label,
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
 
        pk11_return_session(pk11_ctx);

diff --git a/lib/dns/pkcs11rsa_link.c b/lib/dns/pkcs11rsa_link.c
index 4ae74f3bc5ae9a1798e56a9f581476869013e356..ddbdc099129e2c44b0f6fd56caa710fb6958f9d8 100644 (file)
--- a/lib/dns/pkcs11rsa_link.c
+++ b/lib/dns/pkcs11rsa_link.c
@@ -229,7 +229,6 @@ token_key:
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
 
        PK11_RET(pkcs_C_SignInit, (pk11_ctx->session, &mech, pk11_ctx->object),
@@ -387,7 +386,6 @@ pkcs11rsa_createctx_verify(dst_key_t *key, unsigned int maxbits,
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
 
        PK11_RET(pkcs_C_VerifyInit,
@@ -602,7 +600,6 @@ pkcs11rsa_createctx(dst_key_t *key, dst_context_t *dctx) {
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
 
        pk11_ctx = isc_mem_get(dctx->mctx, sizeof(*pk11_ctx));
@@ -751,7 +748,6 @@ pkcs11rsa_sign(dst_context_t *dctx, isc_buffer_t *sig) {
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
        dgstlen = derlen + hashlen;
        INSIST(dgstlen <= sizeof(digest));
@@ -945,7 +941,6 @@ pkcs11rsa_verify(dst_context_t *dctx, const isc_region_t *sig) {
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
        dgstlen = derlen + hashlen;
        INSIST(dgstlen <= sizeof(digest));
@@ -1143,7 +1138,6 @@ pkcs11rsa_generate(dst_key_t *key, int exp, void (*callback)(int)) {
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
 
        pk11_ctx = isc_mem_get(key->mctx, sizeof(*pk11_ctx));

diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c
index aea6af71b68b9d7d8058baf360fb00ae4684169f..f59bffbddc53a1d64be5984ccd35d11de00f5105 100644 (file)
--- a/lib/dns/rpz.c
+++ b/lib/dns/rpz.c
@@ -2604,8 +2604,7 @@ dns_rpz_find_ip(dns_rpz_zones_t *rpzs, dns_rpz_type_t rpz_type,
                        zbits &= have.nsipv4;
                        break;
                default:
-                       INSIST(0);
-                       break;
+                       UNREACHABLE();
                }
        } else if (netaddr->family == AF_INET6) {
                dns_rpz_cidr_key_t src_ip6;
@@ -2630,8 +2629,7 @@ dns_rpz_find_ip(dns_rpz_zones_t *rpzs, dns_rpz_type_t rpz_type,
                        zbits &= have.nsipv6;
                        break;
                default:
-                       INSIST(0);
-                       break;
+                       UNREACHABLE();
                }
        } else {
                return (DNS_RPZ_INVALID_NUM);

diff --git a/lib/irs/getnameinfo.c b/lib/irs/getnameinfo.c
index 8c6fe82f6b6f342330fea8c4f667326527a7cfbd..8462885b1c5d299e31cdad7f7c94bbba9eb9a0d6 100644 (file)
--- a/lib/irs/getnameinfo.c
+++ b/lib/irs/getnameinfo.c
@@ -207,7 +207,6 @@ found:
 
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
        proto = ((flags & NI_DGRAM) != 0) ? "udp" : "tcp";
 

diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
index ef262c500ebec810f9799bf5e164d86a5a4a6160..efb8e64dbe6e1e9f7ad276a8add5a01d1a1333a2 100644 (file)
--- a/lib/isc/netmgr/netmgr.c
+++ b/lib/isc/netmgr/netmgr.c
@@ -2233,7 +2233,7 @@ isc__nm_process_sock_buffer(isc_nmsocket_t *sock) {
                        }
                        break;
                default:
-                       INSIST(0);
+                       UNREACHABLE();
                }
        }
 }
@@ -2687,7 +2687,6 @@ isc__nmsocket_reset(isc_nmsocket_t *sock) {
                REQUIRE(sock->parent == NULL);
                break;
        default:
-               INSIST(0);
                UNREACHABLE();
                break;
        }

diff --git a/lib/isc/rwlock.c b/lib/isc/rwlock.c
index cece662c480d5b21aa44090f1a4282cae342e4c1..3eaa97da2c6e430e894fa897f5fc80c9faa0df5a 100644 (file)
--- a/lib/isc/rwlock.c
+++ b/lib/isc/rwlock.c
@@ -83,7 +83,7 @@ isc_rwlock_trylock(isc_rwlock_t *rwl, isc_rwlocktype_t type) {
                }
                break;
        default:
-               INSIST(0);
+               UNREACHABLE();
        }
 
        switch (ret) {

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 7ae18cca29a728d3da74f75bbdccc0c07ef19ad5..280678d9b8cbaaef58357a5a2283142b278e9621 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -1577,7 +1577,6 @@ doio_recv(isc_socket_t *sock, isc_socketevent_t *dev) {
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
 
        if (sock->type == isc_sockettype_udp) {
@@ -2466,7 +2465,6 @@ socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
 
        sock->pf = pf;

diff --git a/lib/isc/win32/include/isc/stdatomic.h b/lib/isc/win32/include/isc/stdatomic.h
index 23686152a4b90a585a16fcc86cf5456a75eea686..dd5293f3d1b8ae4da8f7ecaa6be03e52c7878dfc 100644 (file)
--- a/lib/isc/win32/include/isc/stdatomic.h
+++ b/lib/isc/win32/include/isc/stdatomic.h
@@ -147,7 +147,6 @@ typedef uintmax_t volatile atomic_uintmax_t;
 static inline void
 atomic_store_abort() {
        UNREACHABLE();
-       ISC_UNREACHABLE();
 }
 
 #define atomic_store_explicit(obj, desired, order)                             \
@@ -208,7 +207,6 @@ atomic_store_abort() {
 static inline int8_t
 atomic_load_abort() {
        UNREACHABLE();
-       ISC_UNREACHABLE();
 }
 
 #define atomic_load_explicit(obj, order)                                       \
@@ -278,7 +276,6 @@ atomic_load_abort() {
 static inline int8_t
 atomic_add_abort() {
        UNREACHABLE();
-       ISC_UNREACHABLE();
 }
 
 #define atomic_fetch_add_explicit(obj, arg, order)                              \
@@ -345,7 +342,6 @@ atomic_add_abort() {
 static inline int8_t
 atomic_and_abort() {
        UNREACHABLE();
-       ISC_UNREACHABLE();
 }
 
 #define atomic_fetch_and_explicit(obj, arg, order)                              \
@@ -406,7 +402,6 @@ atomic_and_abort() {
 static inline int8_t
 atomic_or_abort() {
        UNREACHABLE();
-       ISC_UNREACHABLE();
 }
 
 #define atomic_fetch_or_explicit(obj, arg, order)                              \
@@ -543,7 +538,6 @@ atomic_compare_exchange_strong_explicit64(atomic_int_fast64_t *obj,
 static inline bool
 atomic_compare_exchange_abort() {
        UNREACHABLE();
-       ISC_UNREACHABLE();
 }
 
 #define atomic_compare_exchange_strong_explicit(obj, expected, desired, succ,                 \
@@ -583,7 +577,6 @@ atomic_compare_exchange_abort() {
 static inline bool
 atomic_exchange_abort() {
        UNREACHABLE();
-       ISC_UNREACHABLE();
 }
 
 #define atomic_exchange_explicit(obj, desired, order)                        \

diff --git a/lib/isc/win32/interfaceiter.c b/lib/isc/win32/interfaceiter.c
index c0687885b2d2690f736663e5fccc77fffbe826ce..620971d1102adc631b1a4f1356804aa23cd38ac9 100644 (file)
--- a/lib/isc/win32/interfaceiter.c
+++ b/lib/isc/win32/interfaceiter.c
@@ -93,7 +93,6 @@ get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src) {
                break;
        default:
                UNREACHABLE();
-               ISC_UNREACHABLE();
        }
 }
 

diff --git a/lib/ns/query.c b/lib/ns/query.c
index 71dd50a3ac02b806100e0bef11f9c6569cf13585..771aa7b970804101e75a4a6756d64aecf562e0fc 100644 (file)
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -284,7 +284,7 @@ get_hooktab(query_ctx_t *qctx) {
                                result = _res;                      \
                                goto cleanup;                       \
                        default:                                    \
-                               INSIST(0);                          \
+                               UNREACHABLE();                      \
                        }                                           \
                }                                                   \
        } while (false)