Get rid of ISC_MAGIC and ISC_MAGIC_VALID macros.

While pulling on that it turns out we can / need git rid of a isc_task
-> isc__task, isc_taskmgr -> isc__taskmgr, isc_timer -> isc__timer and
isc_socket -> isc__socket indirection.
OK millert

1 files changed, 1 insertions, 6 deletions

diff --git a/usr.bin/dig/lib/dns/key.c b/usr.bin/dig/lib/dns/key.c
index 2ffe86ef729..ae14b0aef3a 100644
--- a/usr.bin/dig/lib/dns/key.c
+++ b/usr.bin/dig/lib/dns/key.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: key.c,v 1.4 2020/02/12 13:05:03 jsg Exp $ */
+/* $Id: key.c,v 1.5 2020/02/18 18:11:27 florian Exp $ */
 
 
 
@@ -84,26 +84,22 @@ dst_region_computerid(const isc_region_t *source, unsigned int alg) {
 
 dns_name_t *
 dst_key_name(const dst_key_t *key) {
-	REQUIRE(VALID_KEY(key));
 	return (key->key_name);
 }
 
 unsigned int
 dst_key_size(const dst_key_t *key) {
-	REQUIRE(VALID_KEY(key));
 	return (key->key_size);
 }
 
 unsigned int
 dst_key_alg(const dst_key_t *key) {
-	REQUIRE(VALID_KEY(key));
 	return (key->key_alg);
 }
 
 void
 dst_key_setbits(dst_key_t *key, uint16_t bits) {
 	unsigned int maxbits;
-	REQUIRE(VALID_KEY(key));
 	if (bits != 0) {
 		RUNTIME_CHECK(dst_key_sigsize(key, &maxbits) == ISC_R_SUCCESS);
 		maxbits *= 8;
@@ -114,7 +110,6 @@ dst_key_setbits(dst_key_t *key, uint16_t bits) {
 
 uint16_t
 dst_key_getbits(const dst_key_t *key) {
-	REQUIRE(VALID_KEY(key));
 	return (key->key_bits);
 }