reduce multiple newlines

120 files changed, 91 insertions, 604 deletions

diff --git a/usr.bin/dig/lib/dns/dns_log.c b/usr.bin/dig/lib/dns/dns_log.c
index db85be7b2b9..ecd12f40ced 100644
--- a/usr.bin/dig/lib/dns/dns_log.c
+++ b/usr.bin/dig/lib/dns/dns_log.c
@@ -18,8 +18,6 @@
 
 /* Principal Authors: DCL */
 
-
-
 #include <isc/util.h>
 
 #include <dns/log.h>
diff --git a/usr.bin/dig/lib/dns/include/dns/message.h b/usr.bin/dig/lib/dns/include/dns/message.h
index 7a23b0df61c..65ffcfd4c3f 100644
--- a/usr.bin/dig/lib/dns/include/dns/message.h
+++ b/usr.bin/dig/lib/dns/include/dns/message.h
@@ -655,7 +655,6 @@ dns_message_addname(dns_message_t *msg, dns_name_t *name,
  *\li	'section' be a named section.
  */
 
-
 /*
  * LOANOUT FUNCTIONS
  *
diff --git a/usr.bin/dig/lib/dns/include/dns/name.h b/usr.bin/dig/lib/dns/include/dns/name.h
index 8e5904e4fe8..e634972920f 100644
--- a/usr.bin/dig/lib/dns/include/dns/name.h
+++ b/usr.bin/dig/lib/dns/include/dns/name.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: name.h,v 1.10 2020/02/24 16:11:21 florian Exp $ */
+/* $Id: name.h,v 1.11 2020/02/25 05:00:42 jsg Exp $ */
 
 #ifndef DNS_NAME_H
 #define DNS_NAME_H 1
@@ -470,7 +470,6 @@ dns_name_getlabelsequence(const dns_name_t *source, unsigned int first,
  * \li	first + n <= dns_name_countlabels(name)
  */
 
-
 void
 dns_name_clone(const dns_name_t *source, dns_name_t *target);
 /*%<
diff --git a/usr.bin/dig/lib/dns/key.c b/usr.bin/dig/lib/dns/key.c
index d3211b01888..40dad57b701 100644
--- a/usr.bin/dig/lib/dns/key.c
+++ b/usr.bin/dig/lib/dns/key.c
@@ -14,9 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: key.c,v 1.7 2020/02/23 23:40:21 jsg Exp $ */
-
-
+/* $Id: key.c,v 1.8 2020/02/25 05:00:42 jsg Exp $ */
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/usr.bin/dig/lib/dns/masterdump.c b/usr.bin/dig/lib/dns/masterdump.c
index d0b637d3bad..ac2396456e4 100644
--- a/usr.bin/dig/lib/dns/masterdump.c
+++ b/usr.bin/dig/lib/dns/masterdump.c
@@ -227,7 +227,6 @@ totext_ctx_init(const dns_master_style_t *style, dns_totext_ctx_t *ctx) {
 			    return (result); \
 	} while (0)
 
-
 static isc_result_t
 str_totext(const char *source, isc_buffer_t *target) {
 	unsigned int l;
diff --git a/usr.bin/dig/lib/dns/name.c b/usr.bin/dig/lib/dns/name.c
index 2a620bc3f20..b271d42c0e2 100644
--- a/usr.bin/dig/lib/dns/name.c
+++ b/usr.bin/dig/lib/dns/name.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: name.c,v 1.12 2020/02/24 16:11:20 florian Exp $ */
+/* $Id: name.c,v 1.13 2020/02/25 05:00:42 jsg Exp $ */
 
 /*! \file */
 #include <ctype.h>
@@ -188,7 +188,6 @@ dns_name_invalidate(dns_name_t *name) {
 	 * Make 'name' invalid.
 	 */
 
-
 	name->ndata = NULL;
 	name->length = 0;
 	name->labels = 0;
@@ -217,7 +216,6 @@ dns_name_isabsolute(const dns_name_t *name) {
 	 * Does 'name' end in the root label?
 	 */
 
-
 	if ((name->attributes & DNS_NAMEATTR_ABSOLUTE) != 0)
 		return (ISC_TRUE);
 	return (ISC_FALSE);
@@ -524,7 +522,6 @@ dns_name_countlabels(const dns_name_t *name) {
 	 * How many labels does 'name' have?
 	 */
 
-
 	ENSURE(name->labels <= 128);
 
 	return (name->labels);
diff --git a/usr.bin/dig/lib/dns/rdata.c b/usr.bin/dig/lib/dns/rdata.c
index 23ff09bb54d..3d089672acb 100644
--- a/usr.bin/dig/lib/dns/rdata.c
+++ b/usr.bin/dig/lib/dns/rdata.c
@@ -14,11 +14,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdata.c,v 1.23 2020/02/24 17:57:54 florian Exp $ */
+/* $Id: rdata.c,v 1.24 2020/02/25 05:00:42 jsg Exp $ */
 
 /*! \file */
 
-
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
@@ -1142,7 +1141,6 @@ static const char atob_digits[86] =
  * Modified to be re-entrant 3/2/99.
  */
 
-
 struct state {
 	int32_t Ceor;
 	int32_t Csum;
@@ -1224,7 +1222,6 @@ byte_btoa(int c, isc_buffer_t *target, struct state *state) {
 	return (ISC_R_SUCCESS);
 }
 
-
 /*
  * Encode the binary data from inbuf, of length inbuflen, into a
  * target.  Return success/failure status
diff --git a/usr.bin/dig/lib/dns/rdata/any_255/tsig_250.c b/usr.bin/dig/lib/dns/rdata/any_255/tsig_250.c
index 2e34d25fdab..6afe87c1fd5 100644
--- a/usr.bin/dig/lib/dns/rdata/any_255/tsig_250.c
+++ b/usr.bin/dig/lib/dns/rdata/any_255/tsig_250.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tsig_250.c,v 1.5 2020/02/24 12:06:50 florian Exp $ */
+/* $Id: tsig_250.c,v 1.6 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Thu Mar 16 13:39:43 PST 2000 by gson */
 
@@ -222,7 +222,6 @@ towire_any_tsig(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, sr.base, sr.length));
 }
 
-
 static inline isc_result_t
 fromstruct_any_tsig(ARGS_FROMSTRUCT) {
 	dns_rdata_any_tsig_t *tsig = source;
@@ -401,6 +400,4 @@ freestruct_any_tsig(ARGS_FREESTRUCT) {
 	free(tsig->other);
 }
 
-
-
 #endif	/* RDATA_ANY_255_TSIG_250_C */
diff --git a/usr.bin/dig/lib/dns/rdata/ch_3/a_1.c b/usr.bin/dig/lib/dns/rdata/ch_3/a_1.c
index abbed31187c..65f9558d7e0 100644
--- a/usr.bin/dig/lib/dns/rdata/ch_3/a_1.c
+++ b/usr.bin/dig/lib/dns/rdata/ch_3/a_1.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: a_1.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: a_1.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* by Bjorn.Victor@it.uu.se, 2005-05-07 */
 /* Based on generic/soa_6.c and generic/mx_15.c */
@@ -117,9 +117,4 @@ towire_ch_a(ARGS_TOWIRE) {
 	return (ISC_R_SUCCESS);
 }
 
-
-
-
-
-
 #endif	/* RDATA_CH_3_A_1_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/afsdb_18.c b/usr.bin/dig/lib/dns/rdata/generic/afsdb_18.c
index 8ee79fc59be..0b3c24cf438 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/afsdb_18.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/afsdb_18.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: afsdb_18.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: afsdb_18.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Wed Mar 15 14:59:00 PST 2000 by explorer */
 
@@ -102,9 +102,4 @@ towire_afsdb(ARGS_TOWIRE) {
 	return (dns_name_towire(&name, cctx, target));
 }
 
-
-
-
-
-
 #endif	/* RDATA_GENERIC_AFSDB_18_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/avc_258.c b/usr.bin/dig/lib/dns/rdata/generic/avc_258.c
index 9bc17905b68..07ce5fc21ea 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/avc_258.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/avc_258.c
@@ -53,9 +53,4 @@ towire_avc(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
 
-
-
-
-
-
 #endif	/* RDATA_GENERIC_AVC_258_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/caa_257.c b/usr.bin/dig/lib/dns/rdata/generic/caa_257.c
index 2e689effa6f..27a258985a4 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/caa_257.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/caa_257.c
@@ -130,10 +130,4 @@ towire_caa(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, region.base, region.length));
 }
 
-
-
-
-
-
-
 #endif /* GENERIC_CAA_257_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/cdnskey_60.c b/usr.bin/dig/lib/dns/rdata/generic/cdnskey_60.c
index b3a0aebbe81..26e9f447961 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/cdnskey_60.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/cdnskey_60.c
@@ -54,10 +54,4 @@ towire_cdnskey(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, sr.base, sr.length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_CDNSKEY_60_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/cds_59.c b/usr.bin/dig/lib/dns/rdata/generic/cds_59.c
index 47d333b6c5e..f219bf947e6 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/cds_59.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/cds_59.c
@@ -56,10 +56,4 @@ towire_cds(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, sr.base, sr.length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_CDS_59_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/cert_37.c b/usr.bin/dig/lib/dns/rdata/generic/cert_37.c
index 1a503d2fce3..4b6996bd58b 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/cert_37.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/cert_37.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cert_37.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: cert_37.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Wed Mar 15 21:14:32 EST 2000 by tale */
 
@@ -108,9 +108,4 @@ towire_cert(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, sr.base, sr.length));
 }
 
-
-
-
-
-
 #endif	/* RDATA_GENERIC_CERT_37_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/cname_5.c b/usr.bin/dig/lib/dns/rdata/generic/cname_5.c
index aebca83d465..52349c37aae 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/cname_5.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/cname_5.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cname_5.c,v 1.6 2020/02/24 17:44:44 florian Exp $ */
+/* $Id: cname_5.c,v 1.7 2020/02/25 05:00:43 jsg Exp $ */
 
 /* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */
 
@@ -78,8 +78,6 @@ towire_cname(ARGS_TOWIRE) {
 	return (dns_name_towire(&name, cctx, target));
 }
 
-
-
 static inline isc_result_t
 tostruct_cname(ARGS_TOSTRUCT) {
 	isc_region_t region;
@@ -111,6 +109,4 @@ freestruct_cname(ARGS_FREESTRUCT) {
 	dns_name_free(&cname->cname);
 }
 
-
-
 #endif	/* RDATA_GENERIC_CNAME_5_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/csync_62.c b/usr.bin/dig/lib/dns/rdata/generic/csync_62.c
index 2b82ce30b54..fc5ff568247 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/csync_62.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/csync_62.c
@@ -95,9 +95,4 @@ towire_csync(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
 
-
-
-
-
-
 #endif	/* RDATA_GENERIC_CSYNC_62_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/dlv_32769.c b/usr.bin/dig/lib/dns/rdata/generic/dlv_32769.c
index 8ee1eee174f..efe680fa0b0 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/dlv_32769.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/dlv_32769.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dlv_32769.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: dlv_32769.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* RFC3658 */
 
@@ -58,10 +58,4 @@ towire_dlv(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, sr.base, sr.length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_DLV_32769_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/dname_39.c b/usr.bin/dig/lib/dns/rdata/generic/dname_39.c
index 5f5718eb583..80bf3329400 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/dname_39.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/dname_39.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dname_39.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: dname_39.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Wed Mar 15 16:52:38 PST 2000 by explorer */
 
@@ -78,9 +78,4 @@ towire_dname(ARGS_TOWIRE) {
 	return (dns_name_towire(&name, cctx, target));
 }
 
-
-
-
-
-
 #endif	/* RDATA_GENERIC_DNAME_39_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/dnskey_48.c b/usr.bin/dig/lib/dns/rdata/generic/dnskey_48.c
index 486ecad1dc2..b3a1723756f 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/dnskey_48.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/dnskey_48.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnskey_48.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: dnskey_48.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /*
  * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.
@@ -61,10 +61,4 @@ towire_dnskey(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, sr.base, sr.length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_DNSKEY_48_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/doa_259.c b/usr.bin/dig/lib/dns/rdata/generic/doa_259.c
index 789f2ac6c2a..f553277e5b6 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/doa_259.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/doa_259.c
@@ -118,10 +118,4 @@ towire_doa(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, region.base, region.length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_DOA_259_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/eui48_108.c b/usr.bin/dig/lib/dns/rdata/generic/eui48_108.c
index 6c7b2abbfb5..b8836083b32 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/eui48_108.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/eui48_108.c
@@ -65,10 +65,4 @@ towire_eui48(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_EUI48_108_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/eui64_109.c b/usr.bin/dig/lib/dns/rdata/generic/eui64_109.c
index 03b583893cd..a722c711ce1 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/eui64_109.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/eui64_109.c
@@ -68,10 +68,4 @@ towire_eui64(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_EUI64_109_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/gpos_27.c b/usr.bin/dig/lib/dns/rdata/generic/gpos_27.c
index 8de7cecdfe5..b6e99ab6773 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/gpos_27.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/gpos_27.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gpos_27.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: gpos_27.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */
 
@@ -73,10 +73,4 @@ towire_gpos(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_GPOS_27_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/hinfo_13.c b/usr.bin/dig/lib/dns/rdata/generic/hinfo_13.c
index c7532846e4e..94d9fb4321d 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/hinfo_13.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/hinfo_13.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hinfo_13.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: hinfo_13.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /*
  * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.
@@ -65,9 +65,4 @@ towire_hinfo(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
 
-
-
-
-
-
 #endif	/* RDATA_GENERIC_HINFO_13_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/ipseckey_45.c b/usr.bin/dig/lib/dns/rdata/generic/ipseckey_45.c
index 388c08fad1b..286e3413665 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/ipseckey_45.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/ipseckey_45.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ipseckey_45.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: ipseckey_45.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 #ifndef RDATA_GENERIC_IPSECKEY_45_C
 #define RDATA_GENERIC_IPSECKEY_45_C
@@ -172,10 +172,4 @@ towire_ipseckey(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, region.base, region.length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_IPSECKEY_45_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/isdn_20.c b/usr.bin/dig/lib/dns/rdata/generic/isdn_20.c
index f38f3b839b3..a8c71b834d1 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/isdn_20.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/isdn_20.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: isdn_20.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: isdn_20.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Wed Mar 15 16:53:11 PST 2000 by bwelling */
 
@@ -67,10 +67,4 @@ towire_isdn(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_ISDN_20_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/key_25.c b/usr.bin/dig/lib/dns/rdata/generic/key_25.c
index b53b1ad9ae1..5d7439ba0df 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/key_25.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/key_25.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: key_25.c,v 1.9 2020/02/24 17:47:50 florian Exp $ */
+/* $Id: key_25.c,v 1.10 2020/02/25 05:00:43 jsg Exp $ */
 
 /*
  * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.
@@ -57,7 +57,6 @@ generic_totext_key(ARGS_TOTEXT) {
 	} else
 		keyinfo = "ZSK";
 
-
 	/* protocol */
 	snprintf(buf, sizeof(buf), "%u", sr.base[0]);
 	isc_region_consume(&sr, 1);
diff --git a/usr.bin/dig/lib/dns/rdata/generic/keydata_65533.c b/usr.bin/dig/lib/dns/rdata/generic/keydata_65533.c
index af4a8f3211d..2b2a9080880 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/keydata_65533.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/keydata_65533.c
@@ -221,10 +221,4 @@ towire_keydata(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, sr.base, sr.length));
 }
 
-
-
-
-
-
-
 #endif /* GENERIC_KEYDATA_65533_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/l32_105.c b/usr.bin/dig/lib/dns/rdata/generic/l32_105.c
index e806f78415c..06c53212b1c 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/l32_105.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/l32_105.c
@@ -74,10 +74,4 @@ towire_l32(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_L32_105_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/l64_106.c b/usr.bin/dig/lib/dns/rdata/generic/l64_106.c
index 5e4b5c2646e..5a02c1eb45b 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/l64_106.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/l64_106.c
@@ -79,10 +79,4 @@ towire_l64(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_L64_106_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/loc_29.c b/usr.bin/dig/lib/dns/rdata/generic/loc_29.c
index de0064f6514..1b69ea03741 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/loc_29.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/loc_29.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: loc_29.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: loc_29.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Wed Mar 15 18:13:09 PST 2000 by explorer */
 
@@ -229,10 +229,4 @@ towire_loc(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_LOC_29_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/lp_107.c b/usr.bin/dig/lib/dns/rdata/generic/lp_107.c
index f3e4c94a9d9..c74a0d3c8f6 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/lp_107.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/lp_107.c
@@ -84,10 +84,4 @@ towire_lp(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_LP_107_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/mb_7.c b/usr.bin/dig/lib/dns/rdata/generic/mb_7.c
index 535a04e0bc3..771b668c48c 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/mb_7.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/mb_7.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mb_7.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: mb_7.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Wed Mar 15 17:31:26 PST 2000 by bwelling */
 
@@ -77,10 +77,4 @@ towire_mb(ARGS_TOWIRE) {
 	return (dns_name_towire(&name, cctx, target));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_MB_7_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/md_3.c b/usr.bin/dig/lib/dns/rdata/generic/md_3.c
index 8812d217984..d8cbe1691b3 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/md_3.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/md_3.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: md_3.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: md_3.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Wed Mar 15 17:48:20 PST 2000 by bwelling */
 
@@ -77,10 +77,4 @@ towire_md(ARGS_TOWIRE) {
 	return (dns_name_towire(&name, cctx, target));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_MD_3_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/mf_4.c b/usr.bin/dig/lib/dns/rdata/generic/mf_4.c
index 31909120ceb..52e3faa8ba7 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/mf_4.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/mf_4.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mf_4.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: mf_4.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* reviewed: Wed Mar 15 17:47:33 PST 2000 by brister */
 
@@ -77,10 +77,4 @@ towire_mf(ARGS_TOWIRE) {
 	return (dns_name_towire(&name, cctx, target));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_MF_4_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/mg_8.c b/usr.bin/dig/lib/dns/rdata/generic/mg_8.c
index ec426908185..b93573b9ef7 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/mg_8.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/mg_8.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mg_8.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: mg_8.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* reviewed: Wed Mar 15 17:49:21 PST 2000 by brister */
 
@@ -77,10 +77,4 @@ towire_mg(ARGS_TOWIRE) {
 	return (dns_name_towire(&name, cctx, target));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_MG_8_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/minfo_14.c b/usr.bin/dig/lib/dns/rdata/generic/minfo_14.c
index 03527f76c51..571e71d0ae4 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/minfo_14.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/minfo_14.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: minfo_14.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: minfo_14.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* reviewed: Wed Mar 15 17:45:32 PST 2000 by brister */
 
@@ -104,10 +104,4 @@ towire_minfo(ARGS_TOWIRE) {
 	return (dns_name_towire(&rmail, cctx, target));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_MINFO_14_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/mr_9.c b/usr.bin/dig/lib/dns/rdata/generic/mr_9.c
index 099cb4ff82b..931fa5df2e0 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/mr_9.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/mr_9.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mr_9.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: mr_9.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Wed Mar 15 21:30:35 EST 2000 by tale */
 
@@ -77,10 +77,4 @@ towire_mr(ARGS_TOWIRE) {
 	return (dns_name_towire(&name, cctx, target));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_MR_9_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/mx_15.c b/usr.bin/dig/lib/dns/rdata/generic/mx_15.c
index 6913b903e4e..904155803f1 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/mx_15.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/mx_15.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mx_15.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: mx_15.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* reviewed: Wed Mar 15 18:05:46 PST 2000 by brister */
 
@@ -98,10 +98,4 @@ towire_mx(ARGS_TOWIRE) {
 	return (dns_name_towire(&name, cctx, target));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_MX_15_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/naptr_35.c b/usr.bin/dig/lib/dns/rdata/generic/naptr_35.c
index e6fb3ce44a1..dfe382bb65a 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/naptr_35.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/naptr_35.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: naptr_35.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: naptr_35.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
 
@@ -270,10 +270,4 @@ towire_naptr(ARGS_TOWIRE) {
 	return (dns_name_towire(&name, cctx, target));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_NAPTR_35_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/nid_104.c b/usr.bin/dig/lib/dns/rdata/generic/nid_104.c
index 4e825d7ee7d..2b4f1b42b6e 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/nid_104.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/nid_104.c
@@ -79,10 +79,4 @@ towire_nid(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_NID_104_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/ninfo_56.c b/usr.bin/dig/lib/dns/rdata/generic/ninfo_56.c
index 28cabe12c77..94ee8e4f0de 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/ninfo_56.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/ninfo_56.c
@@ -53,10 +53,4 @@ towire_ninfo(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_NINFO_56_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/ns_2.c b/usr.bin/dig/lib/dns/rdata/generic/ns_2.c
index 25f6f9c739b..e21b34b91c0 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/ns_2.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/ns_2.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ns_2.c,v 1.6 2020/02/24 17:44:45 florian Exp $ */
+/* $Id: ns_2.c,v 1.7 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Wed Mar 15 18:15:00 PST 2000 by bwelling */
 
@@ -77,8 +77,6 @@ towire_ns(ARGS_TOWIRE) {
 	return (dns_name_towire(&name, cctx, target));
 }
 
-
-
 static inline isc_result_t
 tostruct_ns(ARGS_TOSTRUCT) {
 	isc_region_t region;
@@ -110,6 +108,4 @@ freestruct_ns(ARGS_FREESTRUCT) {
 	dns_name_free(&ns->name);
 }
 
-
-
 #endif	/* RDATA_GENERIC_NS_2_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/nsec3_50.c b/usr.bin/dig/lib/dns/rdata/generic/nsec3_50.c
index ea915659e1f..c717be90749 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/nsec3_50.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/nsec3_50.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsec3_50.c,v 1.7 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: nsec3_50.c,v 1.8 2020/02/25 05:00:43 jsg Exp $ */
 
 /*
  * Copyright (C) 2004  Nominet, Ltd.
@@ -168,10 +168,6 @@ towire_nsec3(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, sr.base, sr.length));
 }
 
-
-
-
-
 #define NSEC3_MAX_HASH_LENGTH 155
 static inline isc_boolean_t
 checkowner_nsec3(ARGS_CHECKOWNER) {
@@ -197,5 +193,4 @@ checkowner_nsec3(ARGS_CHECKOWNER) {
 	return (ISC_FALSE);
 }
 
-
 #endif	/* RDATA_GENERIC_NSEC3_50_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/nsec3param_51.c b/usr.bin/dig/lib/dns/rdata/generic/nsec3param_51.c
index bca5b43c080..5af687ca2db 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/nsec3param_51.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/nsec3param_51.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsec3param_51.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: nsec3param_51.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /*
  * Copyright (C) 2004  Nominet, Ltd.
@@ -132,10 +132,4 @@ towire_nsec3param(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, sr.base, sr.length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_NSEC3PARAM_51_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/nsec_47.c b/usr.bin/dig/lib/dns/rdata/generic/nsec_47.c
index 394774358e4..8894551df0f 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/nsec_47.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/nsec_47.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsec_47.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: nsec_47.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* reviewed: Wed Mar 15 18:21:15 PST 2000 by brister */
 
@@ -94,9 +94,4 @@ towire_nsec(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, sr.base, sr.length));
 }
 
-
-
-
-
-
 #endif	/* RDATA_GENERIC_NSEC_47_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/null_10.c b/usr.bin/dig/lib/dns/rdata/generic/null_10.c
index 47792a568ee..5af436d17dc 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/null_10.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/null_10.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: null_10.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: null_10.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Thu Mar 16 13:57:50 PST 2000 by explorer */
 
@@ -55,10 +55,4 @@ towire_null(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_NULL_10_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/nxt_30.c b/usr.bin/dig/lib/dns/rdata/generic/nxt_30.c
index 3617fd7f3c6..47e20fceac0 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/nxt_30.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/nxt_30.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nxt_30.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: nxt_30.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* reviewed: Wed Mar 15 18:21:15 PST 2000 by brister */
 
@@ -112,9 +112,4 @@ towire_nxt(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, sr.base, sr.length));
 }
 
-
-
-
-
-
 #endif	/* RDATA_GENERIC_NXT_30_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/openpgpkey_61.c b/usr.bin/dig/lib/dns/rdata/generic/openpgpkey_61.c
index 320a93c819f..f18aa67af28 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/openpgpkey_61.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/openpgpkey_61.c
@@ -83,10 +83,4 @@ towire_openpgpkey(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, sr.base, sr.length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_OPENPGPKEY_61_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/opt_41.c b/usr.bin/dig/lib/dns/rdata/generic/opt_41.c
index 63ad1bd1cdf..9de6ae18d7a 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/opt_41.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/opt_41.c
@@ -200,10 +200,4 @@ towire_opt(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_OPT_41_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/proforma.c b/usr.bin/dig/lib/dns/rdata/generic/proforma.c
index 01ef624a7a7..66c99af21ff 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/proforma.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/proforma.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: proforma.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: proforma.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 #ifndef RDATA_GENERIC_#_#_C
 #define RDATA_GENERIC_#_#_C
@@ -56,10 +56,4 @@ towire_#(ARGS_TOWIRE) {
 	return (ISC_R_NOTIMPLEMENTED);
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_#_#_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/ptr_12.c b/usr.bin/dig/lib/dns/rdata/generic/ptr_12.c
index 7fe86c3ea24..e0556a3179f 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/ptr_12.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/ptr_12.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ptr_12.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: ptr_12.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Thu Mar 16 14:05:12 PST 2000 by explorer */
 
@@ -77,11 +77,6 @@ towire_ptr(ARGS_TOWIRE) {
 	return (dns_name_towire(&name, cctx, target));
 }
 
-
-
-
-
-
 static unsigned char ip6_arpa_data[]  = "\003IP6\004ARPA";
 static unsigned char ip6_arpa_offsets[] = { 0, 4, 9 };
 static const dns_name_t ip6_arpa =
diff --git a/usr.bin/dig/lib/dns/rdata/generic/rkey_57.c b/usr.bin/dig/lib/dns/rdata/generic/rkey_57.c
index e1de7a8a666..ae3142cbe70 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/rkey_57.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/rkey_57.c
@@ -51,10 +51,4 @@ towire_rkey(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, sr.base, sr.length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_RKEY_57_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/rp_17.c b/usr.bin/dig/lib/dns/rdata/generic/rp_17.c
index 1f58648a28a..3d6a85467d3 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/rp_17.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/rp_17.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rp_17.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: rp_17.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* RFC1183 */
 
@@ -102,9 +102,4 @@ towire_rp(ARGS_TOWIRE) {
 	return (dns_name_towire(&rmail, cctx, target));
 }
 
-
-
-
-
-
 #endif	/* RDATA_GENERIC_RP_17_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/rrsig_46.c b/usr.bin/dig/lib/dns/rdata/generic/rrsig_46.c
index 6583c36be19..c23c17e6ee6 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/rrsig_46.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/rrsig_46.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rrsig_46.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: rrsig_46.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Fri Mar 17 09:05:02 PST 2000 by gson */
 
@@ -217,10 +217,6 @@ towire_rrsig(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, sr.base, sr.length));
 }
 
-
-
-
-
 static inline dns_rdatatype_t
 covers_rrsig(dns_rdata_t *rdata) {
 	dns_rdatatype_t type;
@@ -234,6 +230,4 @@ covers_rrsig(dns_rdata_t *rdata) {
 	return (type);
 }
 
-
-
 #endif	/* RDATA_GENERIC_RRSIG_46_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/rt_21.c b/usr.bin/dig/lib/dns/rdata/generic/rt_21.c
index bc7b71ad7b9..82a73da6348 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/rt_21.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/rt_21.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rt_21.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: rt_21.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* reviewed: Thu Mar 16 15:02:31 PST 2000 by brister */
 
@@ -103,10 +103,4 @@ towire_rt(ARGS_TOWIRE) {
 	return (dns_name_towire(&name, cctx, target));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_RT_21_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/sig_24.c b/usr.bin/dig/lib/dns/rdata/generic/sig_24.c
index a0f20910101..c51c14f223a 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/sig_24.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/sig_24.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sig_24.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: sig_24.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Fri Mar 17 09:05:02 PST 2000 by gson */
 
@@ -217,10 +217,6 @@ towire_sig(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, sr.base, sr.length));
 }
 
-
-
-
-
 static inline dns_rdatatype_t
 covers_sig(dns_rdata_t *rdata) {
 	dns_rdatatype_t type;
@@ -234,5 +230,4 @@ covers_sig(dns_rdata_t *rdata) {
 	return (type);
 }
 
-
 #endif	/* RDATA_GENERIC_SIG_24_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/sink_40.c b/usr.bin/dig/lib/dns/rdata/generic/sink_40.c
index f85ed5cc169..d69a3018465 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/sink_40.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/sink_40.c
@@ -94,9 +94,4 @@ towire_sink(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
 
-
-
-
-
-
 #endif	/* RDATA_GENERIC_SINK_40_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/smimea_53.c b/usr.bin/dig/lib/dns/rdata/generic/smimea_53.c
index 2448b325776..356c86a5be9 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/smimea_53.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/smimea_53.c
@@ -49,10 +49,4 @@ towire_smimea(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, sr.base, sr.length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_SMIMEA_53_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/soa_6.c b/usr.bin/dig/lib/dns/rdata/generic/soa_6.c
index d90f1e334a9..e73b90b935e 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/soa_6.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/soa_6.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: soa_6.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */
+/* $Id: soa_6.c,v 1.6 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Thu Mar 16 15:18:32 PST 2000 by explorer */
 
@@ -47,7 +47,6 @@ totext_soa(ARGS_TOTEXT) {
 	else
 		comm = ISC_FALSE;
 
-
 	dns_name_init(&mname, NULL);
 	dns_name_init(&rname, NULL);
 	dns_name_init(&prefix, NULL);
@@ -170,7 +169,6 @@ towire_soa(ARGS_TOWIRE) {
 	return (ISC_R_SUCCESS);
 }
 
-
 static inline isc_result_t
 fromstruct_soa(ARGS_FROMSTRUCT) {
 	dns_rdata_soa_t *soa = source;
@@ -210,7 +208,6 @@ tostruct_soa(ARGS_TOSTRUCT) {
 	soa->common.rdtype = rdata->type;
 	ISC_LINK_INIT(&soa->common, link);
 
-
 	dns_rdata_toregion(rdata, &region);
 
 	dns_name_init(&name, NULL);
@@ -258,6 +255,4 @@ freestruct_soa(ARGS_FREESTRUCT) {
 	dns_name_free(&soa->contact);
 }
 
-
-
 #endif	/* RDATA_GENERIC_SOA_6_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/spf_99.c b/usr.bin/dig/lib/dns/rdata/generic/spf_99.c
index 162e82d64b4..c44d8214f6a 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/spf_99.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/spf_99.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: spf_99.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: spf_99.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Thu Mar 16 15:40:00 PST 2000 by bwelling */
 
@@ -57,9 +57,4 @@ towire_spf(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
 
-
-
-
-
-
 #endif	/* RDATA_GENERIC_SPF_99_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/sshfp_44.c b/usr.bin/dig/lib/dns/rdata/generic/sshfp_44.c
index ed6bd262ee5..cdf2ee33663 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/sshfp_44.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/sshfp_44.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sshfp_44.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: sshfp_44.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* RFC 4255 */
 
@@ -100,10 +100,4 @@ towire_sshfp(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, sr.base, sr.length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_SSHFP_44_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/ta_32768.c b/usr.bin/dig/lib/dns/rdata/generic/ta_32768.c
index 42841e9d52d..3a113df8ddb 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/ta_32768.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/ta_32768.c
@@ -51,10 +51,4 @@ towire_ta(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, sr.base, sr.length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_TA_32768_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/talink_58.c b/usr.bin/dig/lib/dns/rdata/generic/talink_58.c
index 733d479c446..2a90903090d 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/talink_58.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/talink_58.c
@@ -97,10 +97,4 @@ towire_talink(ARGS_TOWIRE) {
 	return(dns_name_towire(&next, cctx, target));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_TALINK_58_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/tkey_249.c b/usr.bin/dig/lib/dns/rdata/generic/tkey_249.c
index 711f18ca2af..5cc54e132db 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/tkey_249.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/tkey_249.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tkey_249.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: tkey_249.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /*
  * Reviewed: Thu Mar 16 17:35:30 PST 2000 by halley.
@@ -223,9 +223,4 @@ towire_tkey(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, sr.base, sr.length));
 }
 
-
-
-
-
-
 #endif	/* RDATA_GENERIC_TKEY_249_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/unspec_103.c b/usr.bin/dig/lib/dns/rdata/generic/unspec_103.c
index d187d304b80..d6bf0114402 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/unspec_103.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/unspec_103.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: unspec_103.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: unspec_103.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 #ifndef RDATA_GENERIC_UNSPEC_103_C
 #define RDATA_GENERIC_UNSPEC_103_C
@@ -57,10 +57,4 @@ towire_unspec(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_UNSPEC_103_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/uri_256.c b/usr.bin/dig/lib/dns/rdata/generic/uri_256.c
index c2a98b892da..5753e4d2966 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/uri_256.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/uri_256.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: uri_256.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: uri_256.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 #ifndef GENERIC_URI_256_C
 #define GENERIC_URI_256_C 1
@@ -95,10 +95,4 @@ towire_uri(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, region.base, region.length));
 }
 
-
-
-
-
-
-
 #endif /* GENERIC_URI_256_C */
diff --git a/usr.bin/dig/lib/dns/rdata/generic/x25_19.c b/usr.bin/dig/lib/dns/rdata/generic/x25_19.c
index 78fab66c3b7..651124ab800 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/x25_19.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/x25_19.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: x25_19.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: x25_19.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Thu Mar 16 16:15:57 PST 2000 by bwelling */
 
@@ -65,10 +65,4 @@ towire_x25(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_GENERIC_X25_19_C */
diff --git a/usr.bin/dig/lib/dns/rdata/hs_4/a_1.c b/usr.bin/dig/lib/dns/rdata/hs_4/a_1.c
index 62bb716b7c0..55837854936 100644
--- a/usr.bin/dig/lib/dns/rdata/hs_4/a_1.c
+++ b/usr.bin/dig/lib/dns/rdata/hs_4/a_1.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: a_1.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: a_1.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* reviewed: Thu Mar 16 15:58:36 PST 2000 by brister */
 
@@ -83,10 +83,4 @@ towire_hs_a(ARGS_TOWIRE) {
 	return (ISC_R_SUCCESS);
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_HS_4_A_1_C */
diff --git a/usr.bin/dig/lib/dns/rdata/in_1/a6_38.c b/usr.bin/dig/lib/dns/rdata/in_1/a6_38.c
index bc2d8196123..22559c95d7f 100644
--- a/usr.bin/dig/lib/dns/rdata/in_1/a6_38.c
+++ b/usr.bin/dig/lib/dns/rdata/in_1/a6_38.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: a6_38.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: a6_38.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* RFC2874 */
 
@@ -150,10 +150,4 @@ towire_in_a6(ARGS_TOWIRE) {
 	return (dns_name_towire(&name, cctx, target));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_IN_1_A6_38_C */
diff --git a/usr.bin/dig/lib/dns/rdata/in_1/a_1.c b/usr.bin/dig/lib/dns/rdata/in_1/a_1.c
index da93d2a20fb..a78863b8639 100644
--- a/usr.bin/dig/lib/dns/rdata/in_1/a_1.c
+++ b/usr.bin/dig/lib/dns/rdata/in_1/a_1.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: a_1.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: a_1.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
 
@@ -85,11 +85,4 @@ towire_in_a(ARGS_TOWIRE) {
 	return (ISC_R_SUCCESS);
 }
 
-
-
-
-
-
-
-
 #endif	/* RDATA_IN_1_A_1_C */
diff --git a/usr.bin/dig/lib/dns/rdata/in_1/aaaa_28.c b/usr.bin/dig/lib/dns/rdata/in_1/aaaa_28.c
index 42809a23f55..7c01ad1b879 100644
--- a/usr.bin/dig/lib/dns/rdata/in_1/aaaa_28.c
+++ b/usr.bin/dig/lib/dns/rdata/in_1/aaaa_28.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: aaaa_28.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: aaaa_28.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
 
@@ -85,9 +85,4 @@ towire_in_aaaa(ARGS_TOWIRE) {
 	return (ISC_R_SUCCESS);
 }
 
-
-
-
-
-
 #endif	/* RDATA_IN_1_AAAA_28_C */
diff --git a/usr.bin/dig/lib/dns/rdata/in_1/apl_42.c b/usr.bin/dig/lib/dns/rdata/in_1/apl_42.c
index f0cba1c5712..9bfe5a26dfd 100644
--- a/usr.bin/dig/lib/dns/rdata/in_1/apl_42.c
+++ b/usr.bin/dig/lib/dns/rdata/in_1/apl_42.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: apl_42.c,v 1.9 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: apl_42.c,v 1.10 2020/02/25 05:00:43 jsg Exp $ */
 
 /* RFC3123 */
 
@@ -149,10 +149,4 @@ towire_in_apl(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_IN_1_APL_42_C */
diff --git a/usr.bin/dig/lib/dns/rdata/in_1/dhcid_49.c b/usr.bin/dig/lib/dns/rdata/in_1/dhcid_49.c
index 65b7d3fe0cb..8d549427610 100644
--- a/usr.bin/dig/lib/dns/rdata/in_1/dhcid_49.c
+++ b/usr.bin/dig/lib/dns/rdata/in_1/dhcid_49.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dhcid_49.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: dhcid_49.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* RFC 4701 */
 
@@ -90,10 +90,4 @@ towire_in_dhcid(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, sr.base, sr.length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_IN_1_DHCID_49_C */
diff --git a/usr.bin/dig/lib/dns/rdata/in_1/kx_36.c b/usr.bin/dig/lib/dns/rdata/in_1/kx_36.c
index c182e673870..faeb342aefd 100644
--- a/usr.bin/dig/lib/dns/rdata/in_1/kx_36.c
+++ b/usr.bin/dig/lib/dns/rdata/in_1/kx_36.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: kx_36.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: kx_36.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Thu Mar 16 17:24:54 PST 2000 by explorer */
 
@@ -98,10 +98,4 @@ towire_in_kx(ARGS_TOWIRE) {
 	return (dns_name_towire(&name, cctx, target));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_IN_1_KX_36_C */
diff --git a/usr.bin/dig/lib/dns/rdata/in_1/nsap-ptr_23.c b/usr.bin/dig/lib/dns/rdata/in_1/nsap-ptr_23.c
index 3dc487cfe11..65f9c7d2fc7 100644
--- a/usr.bin/dig/lib/dns/rdata/in_1/nsap-ptr_23.c
+++ b/usr.bin/dig/lib/dns/rdata/in_1/nsap-ptr_23.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsap-ptr_23.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: nsap-ptr_23.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Fri Mar 17 10:16:02 PST 2000 by gson */
 
@@ -81,10 +81,4 @@ towire_in_nsap_ptr(ARGS_TOWIRE) {
 	return (dns_name_towire(&name, cctx, target));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_IN_1_NSAP_PTR_23_C */
diff --git a/usr.bin/dig/lib/dns/rdata/in_1/nsap_22.c b/usr.bin/dig/lib/dns/rdata/in_1/nsap_22.c
index 5945d88b490..9c8842865ae 100644
--- a/usr.bin/dig/lib/dns/rdata/in_1/nsap_22.c
+++ b/usr.bin/dig/lib/dns/rdata/in_1/nsap_22.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsap_22.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: nsap_22.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Fri Mar 17 10:41:07 PST 2000 by gson */
 
@@ -78,10 +78,4 @@ towire_in_nsap(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_IN_1_NSAP_22_C */
diff --git a/usr.bin/dig/lib/dns/rdata/in_1/px_26.c b/usr.bin/dig/lib/dns/rdata/in_1/px_26.c
index cccd3a995e2..285aaa8b1d9 100644
--- a/usr.bin/dig/lib/dns/rdata/in_1/px_26.c
+++ b/usr.bin/dig/lib/dns/rdata/in_1/px_26.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: px_26.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: px_26.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Mon Mar 20 10:44:27 PST 2000 */
 
@@ -137,10 +137,4 @@ towire_in_px(ARGS_TOWIRE) {
 	return (dns_name_towire(&name, cctx, target));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_IN_1_PX_26_C */
diff --git a/usr.bin/dig/lib/dns/rdata/in_1/srv_33.c b/usr.bin/dig/lib/dns/rdata/in_1/srv_33.c
index 73293e933fd..5c1756beaa6 100644
--- a/usr.bin/dig/lib/dns/rdata/in_1/srv_33.c
+++ b/usr.bin/dig/lib/dns/rdata/in_1/srv_33.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: srv_33.c,v 1.8 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: srv_33.c,v 1.9 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Fri Mar 17 13:01:00 PST 2000 by bwelling */
 
@@ -132,10 +132,4 @@ towire_in_srv(ARGS_TOWIRE) {
 	return (dns_name_towire(&name, cctx, target));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_IN_1_SRV_33_C */
diff --git a/usr.bin/dig/lib/dns/rdata/in_1/wks_11.c b/usr.bin/dig/lib/dns/rdata/in_1/wks_11.c
index 55e422ac77d..01b6366bda0 100644
--- a/usr.bin/dig/lib/dns/rdata/in_1/wks_11.c
+++ b/usr.bin/dig/lib/dns/rdata/in_1/wks_11.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: wks_11.c,v 1.9 2020/02/24 17:45:26 florian Exp $ */
+/* $Id: wks_11.c,v 1.10 2020/02/25 05:00:43 jsg Exp $ */
 
 /* Reviewed: Fri Mar 17 15:01:49 PST 2000 by explorer */
 
@@ -111,10 +111,4 @@ towire_in_wks(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, sr.base, sr.length));
 }
 
-
-
-
-
-
-
 #endif	/* RDATA_IN_1_WKS_11_C */
diff --git a/usr.bin/dig/lib/dns/rdataset.c b/usr.bin/dig/lib/dns/rdataset.c
index a59b35028e2..328c1b72bd4 100644
--- a/usr.bin/dig/lib/dns/rdataset.c
+++ b/usr.bin/dig/lib/dns/rdataset.c
@@ -88,7 +88,6 @@ dns_rdataset_isassociated(dns_rdataset_t *rdataset) {
 	 * Is 'rdataset' associated?
 	 */
 
-
 	if (rdataset->methods != NULL)
 		return (ISC_TRUE);
 
diff --git a/usr.bin/dig/lib/dns/ttl.c b/usr.bin/dig/lib/dns/ttl.c
index fcb652eabe0..e565b0ee251 100644
--- a/usr.bin/dig/lib/dns/ttl.c
+++ b/usr.bin/dig/lib/dns/ttl.c
@@ -14,12 +14,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ttl.c,v 1.4 2020/02/24 13:49:38 jsg Exp $ */
+/* $Id: ttl.c,v 1.5 2020/02/25 05:00:42 jsg Exp $ */
 
 /*! \file */
 
-
-
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/usr.bin/dig/lib/isc/assertions.c b/usr.bin/dig/lib/isc/assertions.c
index f0d10654b8b..623ffc5160b 100644
--- a/usr.bin/dig/lib/isc/assertions.c
+++ b/usr.bin/dig/lib/isc/assertions.c
@@ -14,12 +14,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: assertions.c,v 1.4 2020/02/13 08:15:31 florian Exp $ */
+/* $Id: assertions.c,v 1.5 2020/02/25 05:00:43 jsg Exp $ */
 
 /*! \file */
 
-
-
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/usr.bin/dig/lib/isc/base32.c b/usr.bin/dig/lib/isc/base32.c
index 1e78aa34acb..950666752f9 100644
--- a/usr.bin/dig/lib/isc/base32.c
+++ b/usr.bin/dig/lib/isc/base32.c
@@ -14,12 +14,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: base32.c,v 1.4 2020/02/22 19:47:06 jung Exp $ */
+/* $Id: base32.c,v 1.5 2020/02/25 05:00:43 jsg Exp $ */
 
 /*! \file */
 
-
-
 #include <isc/base32.h>
 #include <isc/buffer.h>
 #include <isc/region.h>
@@ -32,7 +30,6 @@
 		return (_r); \
 	} while (0)
 
-
 /*@{*/
 /*!
  * These static functions are also present in lib/dns/rdata.c.  I'm not
diff --git a/usr.bin/dig/lib/isc/base64.c b/usr.bin/dig/lib/isc/base64.c
index 6fa0a8a6325..ff10db8da90 100644
--- a/usr.bin/dig/lib/isc/base64.c
+++ b/usr.bin/dig/lib/isc/base64.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: base64.c,v 1.3 2020/02/24 13:49:38 jsg Exp $ */
+/* $Id: base64.c,v 1.4 2020/02/25 05:00:43 jsg Exp $ */
 
 /*! \file */
 
@@ -31,7 +31,6 @@
 		return (_r); \
 	} while (0)
 
-
 /*@{*/
 /*!
  * These static functions are also present in lib/dns/rdata.c.  I'm not
diff --git a/usr.bin/dig/lib/isc/buffer.c b/usr.bin/dig/lib/isc/buffer.c
index a0814a8c3f4..735dc0a8c85 100644
--- a/usr.bin/dig/lib/isc/buffer.c
+++ b/usr.bin/dig/lib/isc/buffer.c
@@ -14,11 +14,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: buffer.c,v 1.5 2020/02/22 19:48:48 jung Exp $ */
+/* $Id: buffer.c,v 1.6 2020/02/25 05:00:43 jsg Exp $ */
 
 /*! \file */
 
-
 #include <stdlib.h>
 #include <isc/buffer.h>
 
diff --git a/usr.bin/dig/lib/isc/bufferlist.c b/usr.bin/dig/lib/isc/bufferlist.c
index 33e428efe37..76091510dc8 100644
--- a/usr.bin/dig/lib/isc/bufferlist.c
+++ b/usr.bin/dig/lib/isc/bufferlist.c
@@ -14,12 +14,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: bufferlist.c,v 1.2 2020/02/18 18:11:27 florian Exp $ */
+/* $Id: bufferlist.c,v 1.3 2020/02/25 05:00:43 jsg Exp $ */
 
 /*! \file */
 
-
-
 #include <stddef.h>
 
 #include <isc/buffer.h>
diff --git a/usr.bin/dig/lib/isc/error.c b/usr.bin/dig/lib/isc/error.c
index 92840b3dc5f..4632be88f49 100644
--- a/usr.bin/dig/lib/isc/error.c
+++ b/usr.bin/dig/lib/isc/error.c
@@ -14,12 +14,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: error.c,v 1.4 2020/02/13 16:57:55 florian Exp $ */
+/* $Id: error.c,v 1.5 2020/02/25 05:00:43 jsg Exp $ */
 
 /*! \file */
 
-
-
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/usr.bin/dig/lib/isc/event.c b/usr.bin/dig/lib/isc/event.c
index 090cab78e5d..280cedf88bb 100644
--- a/usr.bin/dig/lib/isc/event.c
+++ b/usr.bin/dig/lib/isc/event.c
@@ -14,14 +14,13 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: event.c,v 1.2 2020/02/12 13:05:04 jsg Exp $ */
+/* $Id: event.c,v 1.3 2020/02/25 05:00:43 jsg Exp $ */
 
 /*!
  * \file
  * \author Principal Author: Bob Halley
  */
 
-
 #include <stdlib.h>
 #include <isc/event.h>
 
diff --git a/usr.bin/dig/lib/isc/hash.c b/usr.bin/dig/lib/isc/hash.c
index 581a1eb8a4f..d14e1541641 100644
--- a/usr.bin/dig/lib/isc/hash.c
+++ b/usr.bin/dig/lib/isc/hash.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hash.c,v 1.5 2020/02/23 06:22:46 jsg Exp $ */
+/* $Id: hash.c,v 1.6 2020/02/25 05:00:43 jsg Exp $ */
 
 /*! \file
  * Some portion of this code was derived from universal hash function
@@ -40,7 +40,6 @@ met:
     contributors may be used to endorse or promote products derived
     from this software without specific prior written permission.
 
-
 This software is provided by RICE and the contributors on an "as is"
 basis, without any representations or warranties of any kind, express
 or implied including, but not limited to, representations or
diff --git a/usr.bin/dig/lib/isc/heap.c b/usr.bin/dig/lib/isc/heap.c
index 53326533eae..4b03e895dc8 100644
--- a/usr.bin/dig/lib/isc/heap.c
+++ b/usr.bin/dig/lib/isc/heap.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: heap.c,v 1.4 2020/02/18 18:11:27 florian Exp $ */
+/* $Id: heap.c,v 1.5 2020/02/25 05:00:43 jsg Exp $ */
 
 /*! \file
  * Heap implementation of priority queues adapted from the following:
@@ -26,7 +26,6 @@
  *	ISBN 0-201-06673-4, chapter 11.
  */
 
-
 #include <stdlib.h>
 #include <isc/heap.h>
 #include <string.h>
@@ -110,7 +109,6 @@ resize(isc_heap_t *heap) {
 	void **new_array;
 	unsigned int new_size;
 
-
 	new_size = heap->size + heap->size_increment;
 	new_array = malloc(new_size * sizeof(void *));
 	if (new_array == NULL)
@@ -172,7 +170,6 @@ isc_result_t
 isc_heap_insert(isc_heap_t *heap, void *elt) {
 	unsigned int new_last;
 
-
 	new_last = heap->last + 1;
 	RUNTIME_CHECK(new_last > 0); /* overflow check */
 	if (new_last >= heap->size && !resize(heap))
diff --git a/usr.bin/dig/lib/isc/hmacsha.c b/usr.bin/dig/lib/isc/hmacsha.c
index aa0e0f09d14..2da7d283f19 100644
--- a/usr.bin/dig/lib/isc/hmacsha.c
+++ b/usr.bin/dig/lib/isc/hmacsha.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hmacsha.c,v 1.3 2020/02/11 23:26:11 jsg Exp $ */
+/* $Id: hmacsha.c,v 1.4 2020/02/25 05:00:43 jsg Exp $ */
 
 /*
  * This code implements the HMAC-SHA1, HMAC-SHA224, HMAC-SHA256, HMAC-SHA384
@@ -22,8 +22,6 @@
  * draft-ietf-dnsext-tsig-sha-01.txt.
  */
 
-
-
 #include <isc/hmacsha.h>
 
 #include <isc/safe.h>
diff --git a/usr.bin/dig/lib/isc/include/isc/error.h b/usr.bin/dig/lib/isc/include/isc/error.h
index 55d663133f7..56265d7069a 100644
--- a/usr.bin/dig/lib/isc/include/isc/error.h
+++ b/usr.bin/dig/lib/isc/include/isc/error.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: error.h,v 1.4 2020/02/13 16:57:55 florian Exp $ */
+/* $Id: error.h,v 1.5 2020/02/25 05:00:43 jsg Exp $ */
 
 #ifndef ISC_ERROR_H
 #define ISC_ERROR_H 1
@@ -24,8 +24,6 @@
 #include <sys/cdefs.h>
 #include <stdarg.h>
 
-
-
 typedef void (*isc_errorcallback_t)(const char *, int, const char *, va_list);
 
 /*% unexpected error */
diff --git a/usr.bin/dig/lib/isc/include/isc/hmacsha.h b/usr.bin/dig/lib/isc/include/isc/hmacsha.h
index a416a20d02a..5ac88fcb6f2 100644
--- a/usr.bin/dig/lib/isc/include/isc/hmacsha.h
+++ b/usr.bin/dig/lib/isc/include/isc/hmacsha.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hmacsha.h,v 1.4 2020/02/13 13:53:01 jsg Exp $ */
+/* $Id: hmacsha.h,v 1.5 2020/02/25 05:00:43 jsg Exp $ */
 
 /*! \file isc/hmacsha.h
  * This is the header file for the HMAC-SHA1, HMAC-SHA224, HMAC-SHA256,
@@ -45,7 +45,6 @@ typedef isc_hmacsha_t isc_hmacsha256_t;
 typedef isc_hmacsha_t isc_hmacsha384_t;
 typedef isc_hmacsha_t isc_hmacsha512_t;
 
-
 void
 isc_hmacsha1_init(isc_hmacsha1_t *ctx, const unsigned char *key,
 		  unsigned int len);
@@ -80,7 +79,6 @@ isc_hmacsha224_sign(isc_hmacsha224_t *ctx, unsigned char *digest, size_t len);
 isc_boolean_t
 isc_hmacsha224_verify(isc_hmacsha224_t *ctx, unsigned char *digest, size_t len);
 
-
 void
 isc_hmacsha256_init(isc_hmacsha256_t *ctx, const unsigned char *key,
 		    unsigned int len);
@@ -98,7 +96,6 @@ isc_hmacsha256_sign(isc_hmacsha256_t *ctx, unsigned char *digest, size_t len);
 isc_boolean_t
 isc_hmacsha256_verify(isc_hmacsha256_t *ctx, unsigned char *digest, size_t len);
 
-
 void
 isc_hmacsha384_init(isc_hmacsha384_t *ctx, const unsigned char *key,
 		    unsigned int len);
@@ -116,7 +113,6 @@ isc_hmacsha384_sign(isc_hmacsha384_t *ctx, unsigned char *digest, size_t len);
 isc_boolean_t
 isc_hmacsha384_verify(isc_hmacsha384_t *ctx, unsigned char *digest, size_t len);
 
-
 void
 isc_hmacsha512_init(isc_hmacsha512_t *ctx, const unsigned char *key,
 		    unsigned int len);
diff --git a/usr.bin/dig/lib/isc/include/isc/lex.h b/usr.bin/dig/lib/isc/include/isc/lex.h
index 6ec56bc0cea..58168faa099 100644
--- a/usr.bin/dig/lib/isc/include/isc/lex.h
+++ b/usr.bin/dig/lib/isc/include/isc/lex.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lex.h,v 1.5 2020/02/23 23:40:22 jsg Exp $ */
+/* $Id: lex.h,v 1.6 2020/02/25 05:00:43 jsg Exp $ */
 
 #ifndef ISC_LEX_H
 #define ISC_LEX_H 1
@@ -291,7 +291,6 @@ isc_lex_getsourcename(isc_lex_t *lex);
  *\li	result valid while current input source exists.
  */
 
-
 unsigned long
 isc_lex_getsourceline(isc_lex_t *lex);
 /*%<
diff --git a/usr.bin/dig/lib/isc/include/isc/log.h b/usr.bin/dig/lib/isc/include/isc/log.h
index 1c266921f05..792cb542786 100644
--- a/usr.bin/dig/lib/isc/include/isc/log.h
+++ b/usr.bin/dig/lib/isc/include/isc/log.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.h,v 1.6 2020/02/17 18:58:39 jung Exp $ */
+/* $Id: log.h,v 1.7 2020/02/25 05:00:43 jsg Exp $ */
 
 #ifndef ISC_LOG_H
 #define ISC_LOG_H 1
@@ -24,8 +24,6 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-
-
 #include <isc/types.h>
 
 /*@{*/
diff --git a/usr.bin/dig/lib/isc/include/isc/refcount.h b/usr.bin/dig/lib/isc/include/isc/refcount.h
index 7232e485ce3..16520451a82 100644
--- a/usr.bin/dig/lib/isc/include/isc/refcount.h
+++ b/usr.bin/dig/lib/isc/include/isc/refcount.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: refcount.h,v 1.2 2020/02/13 13:53:01 jsg Exp $ */
+/* $Id: refcount.h,v 1.3 2020/02/25 05:00:43 jsg Exp $ */
 
 #ifndef ISC_REFCOUNT_H
 #define ISC_REFCOUNT_H 1
@@ -84,7 +84,6 @@
  *	ref != NULL.
  */
 
-
 /*
  * Sample implementations
  */
diff --git a/usr.bin/dig/lib/isc/include/isc/resultclass.h b/usr.bin/dig/lib/isc/include/isc/resultclass.h
index fc11d628c88..9136cf756ad 100644
--- a/usr.bin/dig/lib/isc/include/isc/resultclass.h
+++ b/usr.bin/dig/lib/isc/include/isc/resultclass.h
@@ -14,12 +14,11 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resultclass.h,v 1.1 2020/02/07 09:58:54 florian Exp $ */
+/* $Id: resultclass.h,v 1.2 2020/02/25 05:00:43 jsg Exp $ */
 
 #ifndef ISC_RESULTCLASS_H
 #define ISC_RESULTCLASS_H 1
 
-
 /*! \file isc/resultclass.h
  * \brief Registry of Predefined Result Type Classes
  *
@@ -37,7 +36,6 @@
 #define ISC_RESULTCLASS_INCLASS(rclass, result) \
 	((rclass) == ((result) & 0xFFFF0000))
 
-
 #define	ISC_RESULTCLASS_ISC		ISC_RESULTCLASS_FROMNUM(0)
 #define	ISC_RESULTCLASS_DNS		ISC_RESULTCLASS_FROMNUM(1)
 #define	ISC_RESULTCLASS_DST		ISC_RESULTCLASS_FROMNUM(2)
diff --git a/usr.bin/dig/lib/isc/include/isc/sha1.h b/usr.bin/dig/lib/isc/include/isc/sha1.h
index ab81aac3bd2..3e3cc0f2293 100644
--- a/usr.bin/dig/lib/isc/include/isc/sha1.h
+++ b/usr.bin/dig/lib/isc/include/isc/sha1.h
@@ -17,7 +17,7 @@
 #ifndef ISC_SHA1_H
 #define ISC_SHA1_H 1
 
-/* $Id: sha1.h,v 1.5 2020/02/17 18:58:39 jung Exp $ */
+/* $Id: sha1.h,v 1.6 2020/02/25 05:00:43 jsg Exp $ */
 
 /*	$NetBSD: sha1.h,v 1.2 1998/05/29 22:55:44 thorpej Exp $	*/
 
@@ -36,7 +36,6 @@ typedef struct {
 	EVP_MD_CTX *ctx;
 } isc_sha1_t;
 
-
 void
 isc_sha1_init(isc_sha1_t *ctx);
 
diff --git a/usr.bin/dig/lib/isc/include/isc/task.h b/usr.bin/dig/lib/isc/include/isc/task.h
index b87df4307eb..02902a8b493 100644
--- a/usr.bin/dig/lib/isc/include/isc/task.h
+++ b/usr.bin/dig/lib/isc/include/isc/task.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: task.h,v 1.7 2020/02/22 19:47:07 jung Exp $ */
+/* $Id: task.h,v 1.8 2020/02/25 05:00:43 jsg Exp $ */
 
 #ifndef ISC_TASK_H
 #define ISC_TASK_H 1
@@ -74,7 +74,6 @@
  * unsend events which they have sent.
  */
 
-
 /***
  *** Imports.
  ***/
@@ -214,7 +213,6 @@ isc_task_sendanddetach(isc_task_t **taskp, isc_event_t **eventp);
  *		all resources used by the task will be freed.
  */
 
-
 unsigned int
 isc_task_purgerange(isc_task_t *task, void *sender, isc_eventtype_t first,
 		    isc_eventtype_t last, void *tag);
diff --git a/usr.bin/dig/lib/isc/include/isc/timer.h b/usr.bin/dig/lib/isc/include/isc/timer.h
index 59f725696cb..a32996fb0d6 100644
--- a/usr.bin/dig/lib/isc/include/isc/timer.h
+++ b/usr.bin/dig/lib/isc/include/isc/timer.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer.h,v 1.11 2020/02/24 13:49:39 jsg Exp $ */
+/* $Id: timer.h,v 1.12 2020/02/25 05:00:43 jsg Exp $ */
 
 #ifndef ISC_TIMER_H
 #define ISC_TIMER_H 1
@@ -66,7 +66,6 @@
  *	None.
  */
 
-
 /***
  *** Imports
  ***/
diff --git a/usr.bin/dig/lib/isc/include/isc/util.h b/usr.bin/dig/lib/isc/include/isc/util.h
index 9a460785692..c1353fc2204 100644
--- a/usr.bin/dig/lib/isc/include/isc/util.h
+++ b/usr.bin/dig/lib/isc/include/isc/util.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: util.h,v 1.2 2020/02/16 21:11:02 florian Exp $ */
+/* $Id: util.h,v 1.3 2020/02/25 05:00:43 jsg Exp $ */
 
 #ifndef ISC_UTIL_H
 #define ISC_UTIL_H 1
@@ -113,7 +113,6 @@
  * Performance
  */
 
-
 /*
  * Assertions
  */
diff --git a/usr.bin/dig/lib/isc/lex.c b/usr.bin/dig/lib/isc/lex.c
index d9d3baa6bc3..c3ede6243e8 100644
--- a/usr.bin/dig/lib/isc/lex.c
+++ b/usr.bin/dig/lib/isc/lex.c
@@ -14,12 +14,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lex.c,v 1.7 2020/02/23 23:40:22 jsg Exp $ */
+/* $Id: lex.c,v 1.8 2020/02/25 05:00:43 jsg Exp $ */
 
 /*! \file */
 
-
-
 #include <ctype.h>
 #include <stdlib.h>
 
@@ -141,7 +139,6 @@ isc_lex_setcomments(isc_lex_t *lex, unsigned int comments) {
 	 * Set allowed lexer commenting styles.
 	 */
 
-
 	lex->comments = comments;
 }
 
@@ -152,7 +149,6 @@ isc_lex_setspecials(isc_lex_t *lex, isc_lexspecials_t specials) {
 	 * whitespace, they delimit strings and numbers.
 	 */
 
-
 	memmove(lex->specials, specials, 256);
 }
 
@@ -201,7 +197,6 @@ isc_lex_openfile(isc_lex_t *lex, const char *filename) {
 	 * Open 'filename' and make it the current input source for 'lex'.
 	 */
 
-
 	if ((stream = fopen(filename, "r")) == NULL)
 		return (isc__errno2result(errno));
 
@@ -219,7 +214,6 @@ isc_lex_close(isc_lex_t *lex) {
 	 * Close the most recently opened object (i.e. file or buffer).
 	 */
 
-
 	source = HEAD(lex->sources);
 	if (source == NULL)
 		return (ISC_R_NOMORE);
@@ -761,7 +755,6 @@ isc_lex_getlasttokentext(isc_lex_t *lex, isc_token_t *tokenp, isc_region_t *r)
 		    source->ignored;
 }
 
-
 char *
 isc_lex_getsourcename(isc_lex_t *lex) {
 	inputsource *source;
diff --git a/usr.bin/dig/lib/isc/netaddr.c b/usr.bin/dig/lib/isc/netaddr.c
index 97e74c71a58..20f610a7f88 100644
--- a/usr.bin/dig/lib/isc/netaddr.c
+++ b/usr.bin/dig/lib/isc/netaddr.c
@@ -14,12 +14,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: netaddr.c,v 1.6 2020/02/22 19:51:03 jung Exp $ */
+/* $Id: netaddr.c,v 1.7 2020/02/25 05:00:43 jsg Exp $ */
 
 /*! \file */
 
-
-
 #include <stdio.h>
 
 #include <isc/buffer.h>
diff --git a/usr.bin/dig/lib/isc/parseint.c b/usr.bin/dig/lib/isc/parseint.c
index c1745d712f6..dd00f7289cf 100644
--- a/usr.bin/dig/lib/isc/parseint.c
+++ b/usr.bin/dig/lib/isc/parseint.c
@@ -14,12 +14,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: parseint.c,v 1.3 2020/02/22 19:47:06 jung Exp $ */
+/* $Id: parseint.c,v 1.4 2020/02/25 05:00:43 jsg Exp $ */
 
 /*! \file */
 
-
-
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
@@ -28,7 +26,6 @@
 #include <isc/parseint.h>
 #include <isc/result.h>
 
-
 isc_result_t
 isc_parse_uint32(uint32_t *uip, const char *string, int base) {
 	unsigned long n;
diff --git a/usr.bin/dig/lib/isc/refcount.c b/usr.bin/dig/lib/isc/refcount.c
index d615d33cc2b..688929828e0 100644
--- a/usr.bin/dig/lib/isc/refcount.c
+++ b/usr.bin/dig/lib/isc/refcount.c
@@ -14,9 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: refcount.c,v 1.1 2020/02/07 09:58:54 florian Exp $ */
-
-
+/* $Id: refcount.c,v 1.2 2020/02/25 05:00:43 jsg Exp $ */
 
 #include <stddef.h>
 
diff --git a/usr.bin/dig/lib/isc/regex.c b/usr.bin/dig/lib/isc/regex.c
index 7ce06c349c7..3b5e05a04c0 100644
--- a/usr.bin/dig/lib/isc/regex.c
+++ b/usr.bin/dig/lib/isc/regex.c
@@ -14,10 +14,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-
-
-
-
 #include <isc/regex.h>
 #include <isc/types.h>
 #include <string.h>
diff --git a/usr.bin/dig/lib/isc/result.c b/usr.bin/dig/lib/isc/result.c
index 2e80193c474..1d3b8da7b00 100644
--- a/usr.bin/dig/lib/isc/result.c
+++ b/usr.bin/dig/lib/isc/result.c
@@ -14,12 +14,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.c,v 1.3 2020/02/13 10:40:24 jsg Exp $ */
+/* $Id: result.c,v 1.4 2020/02/25 05:00:43 jsg Exp $ */
 
 /*! \file */
 
-
-
 #include <stddef.h>
 #include <stdlib.h>
 
diff --git a/usr.bin/dig/lib/isc/serial.c b/usr.bin/dig/lib/isc/serial.c
index 78e73d96c7d..6c9e61236c9 100644
--- a/usr.bin/dig/lib/isc/serial.c
+++ b/usr.bin/dig/lib/isc/serial.c
@@ -14,12 +14,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: serial.c,v 1.2 2020/02/17 18:58:39 jung Exp $ */
+/* $Id: serial.c,v 1.3 2020/02/25 05:00:43 jsg Exp $ */
 
 /*! \file */
 
-
-
 #include <isc/serial.h>
 
 isc_boolean_t
diff --git a/usr.bin/dig/lib/isc/sha1.c b/usr.bin/dig/lib/isc/sha1.c
index 4bebea053b6..7edca275962 100644
--- a/usr.bin/dig/lib/isc/sha1.c
+++ b/usr.bin/dig/lib/isc/sha1.c
@@ -14,10 +14,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sha1.c,v 1.4 2020/02/17 18:58:39 jung Exp $ */
+/* $Id: sha1.c,v 1.5 2020/02/25 05:00:43 jsg Exp $ */
 
 /*	$NetBSD: sha1.c,v 1.5 2000/01/22 22:19:14 mycroft Exp $	*/
-/*	$OpenBSD: sha1.c,v 1.4 2020/02/17 18:58:39 jung Exp $	*/
+/*	$OpenBSD: sha1.c,v 1.5 2020/02/25 05:00:43 jsg Exp $	*/
 
 /*! \file
  * SHA-1 in C
@@ -34,8 +34,6 @@
  * \endverbatim
  */
 
-
-
 #include <isc/sha1.h>
 #include <string.h>
 #include <isc/util.h>
diff --git a/usr.bin/dig/lib/isc/sockaddr.c b/usr.bin/dig/lib/isc/sockaddr.c
index 216b2a36e3d..73ae6cfa9b5 100644
--- a/usr.bin/dig/lib/isc/sockaddr.c
+++ b/usr.bin/dig/lib/isc/sockaddr.c
@@ -14,12 +14,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sockaddr.c,v 1.6 2020/02/13 16:55:44 florian Exp $ */
+/* $Id: sockaddr.c,v 1.7 2020/02/25 05:00:43 jsg Exp $ */
 
 /*! \file */
 
-
-
 #include <stdio.h>
 
 #include <isc/buffer.h>
diff --git a/usr.bin/dig/lib/isc/symtab.c b/usr.bin/dig/lib/isc/symtab.c
index 616afff494d..a4066769745 100644
--- a/usr.bin/dig/lib/isc/symtab.c
+++ b/usr.bin/dig/lib/isc/symtab.c
@@ -14,12 +14,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: symtab.c,v 1.3 2020/02/18 18:11:27 florian Exp $ */
+/* $Id: symtab.c,v 1.4 2020/02/25 05:00:43 jsg Exp $ */
 
 /*! \file */
 
-
-
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/dig/lib/isc/task.c b/usr.bin/dig/lib/isc/task.c
index dacc18d0688..4614a94f74b 100644
--- a/usr.bin/dig/lib/isc/task.c
+++ b/usr.bin/dig/lib/isc/task.c
@@ -108,8 +108,6 @@ pop_readyq(isc_taskmgr_t *manager);
 static inline void
 push_readyq(isc_taskmgr_t *manager, isc_task_t *task);
 
-
-
 /***
  *** Tasks.
  ***/
@@ -322,7 +320,6 @@ isc_task_send(isc_task_t *task, isc_event_t **eventp) {
 	 * Send '*event' to 'task'.
 	 */
 
-
 	/*
 	 * We're trying hard to hold locks for as short a time as possible.
 	 * We're also trying to hold as few locks as possible.  This is why
@@ -451,7 +448,6 @@ isc_task_setname(isc_task_t *task, const char *name, void *tag) {
 	 * Name 'task'.
 	 */
 
-
 	strlcpy(task->name, name, sizeof(task->name));
 	task->tag = tag;
 }
@@ -529,7 +525,6 @@ dispatch(isc_taskmgr_t *manager) {
 	isc_tasklist_t new_priority_tasks;
 	unsigned int tasks_ready = 0;
 
-
 	ISC_LIST_INIT(new_ready_tasks);
 	ISC_LIST_INIT(new_priority_tasks);
 
diff --git a/usr.bin/dig/lib/isc/timer.c b/usr.bin/dig/lib/isc/timer.c
index b880e33674f..15fc781f3a5 100644
--- a/usr.bin/dig/lib/isc/timer.c
+++ b/usr.bin/dig/lib/isc/timer.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer.c,v 1.23 2020/02/24 13:49:38 jsg Exp $ */
+/* $Id: timer.c,v 1.24 2020/02/25 05:00:43 jsg Exp $ */
 
 /*! \file */
 
@@ -275,7 +275,6 @@ isc_timer_touch(isc_timer_t *timer) {
 	 * Set the last-touched time of 'timer' to the current time.
 	 */
 
-
 	clock_gettime(CLOCK_MONOTONIC, &now);
 	timespecadd(&now, &timer->interval, &timer->idle);
 }
diff --git a/usr.bin/dig/lib/isc/unix/socket.c b/usr.bin/dig/lib/isc/unix/socket.c
index 66af2b1b65a..b447b31f657 100644
--- a/usr.bin/dig/lib/isc/unix/socket.c
+++ b/usr.bin/dig/lib/isc/unix/socket.c
@@ -239,7 +239,6 @@ enum {
 	STATID_ACTIVE = 10
 };
 
-
 static void
 socket_log(isc_socket_t *sock, isc_sockaddr_t *address,
 	   isc_logcategory_t *category, isc_logmodule_t *module, int level,
@@ -2388,7 +2387,6 @@ internal_connect(isc_task_t *me, isc_event_t *ev) {
 			return;
 		}
 
-
 		/*
 		 * Translate other errors into ISC_R_* flavors.
 		 */
diff --git a/usr.bin/dig/lib/isccfg/include/isccfg/cfg.h b/usr.bin/dig/lib/isccfg/include/isccfg/cfg.h
index 5633a8e85a5..97d73a77a5d 100644
--- a/usr.bin/dig/lib/isccfg/include/isccfg/cfg.h
+++ b/usr.bin/dig/lib/isccfg/include/isccfg/cfg.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cfg.h,v 1.4 2020/02/13 16:57:55 florian Exp $ */
+/* $Id: cfg.h,v 1.5 2020/02/25 05:00:43 jsg Exp $ */
 
 #ifndef ISCCFG_CFG_H
 #define ISCCFG_CFG_H 1
@@ -32,7 +32,6 @@
  *** Imports
  ***/
 
-
 #include <isc/refcount.h>
 #include <isc/types.h>
 #include <isc/list.h>
diff --git a/usr.bin/dig/lib/isccfg/include/isccfg/grammar.h b/usr.bin/dig/lib/isccfg/include/isccfg/grammar.h
index 2f68f8f83f7..187c82ddf70 100644
--- a/usr.bin/dig/lib/isccfg/include/isccfg/grammar.h
+++ b/usr.bin/dig/lib/isccfg/include/isccfg/grammar.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: grammar.h,v 1.2 2020/02/25 02:35:46 jsg Exp $ */
+/* $Id: grammar.h,v 1.3 2020/02/25 05:00:43 jsg Exp $ */
 
 #ifndef ISCCFG_GRAMMAR_H
 #define ISCCFG_GRAMMAR_H 1
@@ -99,7 +99,6 @@ struct cfg_obj {
 	unsigned int    line;
 };
 
-
 /*% A list element. */
 struct cfg_listelt {
 	cfg_obj_t               *obj;
diff --git a/usr.bin/dig/lib/isccfg/parser.c b/usr.bin/dig/lib/isccfg/parser.c
index 5d875154a85..5e1be0311e3 100644
--- a/usr.bin/dig/lib/isccfg/parser.c
+++ b/usr.bin/dig/lib/isccfg/parser.c
@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-
 #include <isc/lex.h>
 #include <isc/log.h>
 #include <isc/symtab.h>
@@ -60,7 +59,6 @@ isc_logmodule_t cfg_module = { "isccfg/parser",      0 };
 #define CLEANUP_OBJ(obj) \
 	do { if ((obj) != NULL) cfg_obj_destroy(pctx, &(obj)); } while (0)
 
-
 /* Forward declarations of variables */
 cfg_rep_t cfg_rep_string;
 cfg_rep_t cfg_rep_list;
@@ -759,7 +757,6 @@ cfg_parse_mapbody(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret)
 		}
 	}
 
-
 	*ret = obj;
 	return (ISC_R_SUCCESS);
 
@@ -1194,7 +1191,6 @@ cfg_create_obj(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
 	return (ISC_R_SUCCESS);
 }
 
-
 static void
 map_symtabitem_destroy(char *key, unsigned int type,
 		       isc_symvalue_t symval, void *userarg)
@@ -1208,7 +1204,6 @@ map_symtabitem_destroy(char *key, unsigned int type,
 	cfg_obj_destroy(pctx, &obj);
 }
 
-
 static isc_result_t
 create_map(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
 	isc_result_t result;
diff --git a/usr.bin/dig/lib/lwres/lwconfig.c b/usr.bin/dig/lib/lwres/lwconfig.c
index 9b8f95cd2c3..004e6980f1d 100644
--- a/usr.bin/dig/lib/lwres/lwconfig.c
+++ b/usr.bin/dig/lib/lwres/lwconfig.c
@@ -43,8 +43,6 @@
  *    /etc/resolv.conf
  */
 
-
-
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
@@ -93,7 +91,6 @@ eatline(FILE *fp) {
 	return (ch);
 }
 
-
 /*!
  * Eats white space up to next newline or non-whitespace character (of
  * EOF). Returns the last character read. Comments are considered white
@@ -113,7 +110,6 @@ eatwhite(FILE *fp) {
 	return (ch);
 }
 
-
 /*!
  * Skip over any leading whitespace and then read in the next sequence of
  * non-whitespace characters. In this context newline is not considered