upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-03-09 09:40:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ondrej/cleanup-unreachable-calls' into 'main'

Browse source 
Consistenly use UNREACHABLE() instead of ISC_UNREACHABLE()

See merge request isc-projects/bind9!6042
This commit is contained in:
Ondřej Surý 2022-03-28 21:40:52 +00:00
commit f768c138b4
8 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/tests/test_client.c
View file

@ -232,7 +232,7 @@ parse_options(int argc, char **argv) {
break;
default:
INSIST(0);
UNREACHABLE();
}
}

2
bin/tests/test_server.c
View file

@ -152,7 +152,7 @@ parse_options(int argc, char **argv) {
break;
default:
INSIST(0);
UNREACHABLE();
}
}

6
cocci/unreachable.spatch
View file

@ -11,3 +11,9 @@
- INSIST(0);
- ISC_UNREACHABLE();
+ UNREACHABLE();
@@
@@
- UNREACHABLE();
UNREACHABLE();

4
lib/dns/rpz.c
View file

@ -2590,7 +2590,7 @@ dns_rpz_find_ip(dns_rpz_zones_t *rpzs, dns_rpz_type_t rpz_type,
zbits &= have.nsipv4;
break;
default:
INSIST(0);
UNREACHABLE();
break;
}
} else if (netaddr->family == AF_INET6) {
@ -2616,7 +2616,7 @@ dns_rpz_find_ip(dns_rpz_zones_t *rpzs, dns_rpz_type_t rpz_type,
zbits &= have.nsipv6;
break;
default:
INSIST(0);
UNREACHABLE();
break;
}
} else {

4
lib/isc/netmgr/netmgr.c
View file

@ -2273,7 +2273,7 @@ isc__nm_process_sock_buffer(isc_nmsocket_t *sock) {
}
break;
default:
INSIST(0);
UNREACHABLE();
}
}
}
@ -2799,7 +2799,6 @@ isc__nmsocket_reset(isc_nmsocket_t *sock) {
REQUIRE(sock->parent == NULL);
break;
default:
INSIST(0);
UNREACHABLE();
break;
}
@ -3493,7 +3492,6 @@ isc_nm_set_maxage(isc_nmhandle_t *handle, const uint32_t ttl) {
case isc_nm_tlssocket:
#endif /* HAVE_LIBNGHTTP2 */
default:
INSIST(0);
UNREACHABLE();
break;
}

2
lib/isc/rwlock.c
View file

@ -82,7 +82,7 @@ isc_rwlock_trylock(isc_rwlock_t *rwl, isc_rwlocktype_t type) {
}
break;
default:
INSIST(0);
UNREACHABLE();
}
switch (ret) {

2
lib/isc/timer.c
View file

@ -117,7 +117,6 @@ schedule(isc_timer_t *timer, isc_time_t *now, bool signal_ok) {
due = timer->idle;
break;
default:
INSIST(0);
UNREACHABLE();
}
@ -425,7 +424,6 @@ dispatch(isc_timermgr_t *manager, isc_time_t *now) {
need_schedule = false;
break;
default:
INSIST(0);
UNREACHABLE();
}

2
lib/ns/query.c
View file

@ -293,7 +293,7 @@ get_hooktab(query_ctx_t *qctx) {
result = _res; \
goto cleanup; \
default: \
INSIST(0); \
UNREACHABLE(); \
} \
} \
} while (false)