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, 12 deletions

diff --git a/usr.bin/dig/lib/dns/dst_internal.h b/usr.bin/dig/lib/dns/dst_internal.h
index a750cfa6aea..6ccd14662c8 100644
--- a/usr.bin/dig/lib/dns/dst_internal.h
+++ b/usr.bin/dig/lib/dns/dst_internal.h
@@ -31,14 +31,12 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dst_internal.h,v 1.5 2020/02/16 21:12:41 florian Exp $ */
+/* $Id: dst_internal.h,v 1.6 2020/02/18 18:11:27 florian Exp $ */
 
 #ifndef DST_DST_INTERNAL_H
 #define DST_DST_INTERNAL_H 1
 
 #include <isc/buffer.h>
-
-#include <isc/magic.h>
 #include <isc/region.h>
 #include <isc/types.h>
 #include <isc/refcount.h>
@@ -47,7 +45,6 @@
 #include <isc/hmacsha.h>
 
 #include <dns/time.h>
-
 #include <dst/dst.h>
 
 #include <openssl/err.h>
@@ -55,12 +52,6 @@
 #include <openssl/objects.h>
 #include <openssl/rsa.h>
 
-#define KEY_MAGIC	ISC_MAGIC('D','S','T','K')
-#define CTX_MAGIC	ISC_MAGIC('D','S','T','C')
-
-#define VALID_KEY(x) ISC_MAGIC_VALID(x, KEY_MAGIC)
-#define VALID_CTX(x) ISC_MAGIC_VALID(x, CTX_MAGIC)
-
 /***
  *** Types
  ***/
@@ -81,7 +72,6 @@ typedef enum { DO_SIGN, DO_VERIFY } dst_use_t;
 
 /*% DST Key Structure */
 struct dst_key {
-	unsigned int	magic;
 	isc_refcount_t	refs;
 	dns_name_t *	key_name;	/*%< name of the key */
 	unsigned int	key_size;	/*%< size of the key in bits */
@@ -123,7 +113,6 @@ struct dst_key {
 };
 
 struct dst_context {
-	unsigned int magic;
 	dst_use_t use;
 	dst_key_t *key;
 	isc_logcategory_t *category;