diff --git a/bin/dnssec/dnssec-makekeyset.c b/bin/dnssec/dnssec-makekeyset.c
index cfb2edf065..f081b9e1ed 100644
--- a/bin/dnssec/dnssec-makekeyset.c
+++ b/bin/dnssec/dnssec-makekeyset.c
@@ -343,7 +343,8 @@ main(int argc, char *argv[]) {
 		isc_buffer_init(&b, data, BUFSIZE);
 		result = dst_key_todns(key, &b);
 		if (result != ISC_R_SUCCESS)
-			fatal("failed to convert key %s/%s/%d to a DNS KEY: %s",
+			fatal("failed to convert key %s/%s/%d "
+			      "to a DNS KEY: %s",
 			      namestr, id, algtostr(alg),
 			      isc_result_totext(result));
 		isc_buffer_usedregion(&b, &r);
diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index fa4105d1e2..24a8a5486c 100644
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -761,7 +761,8 @@ signname(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node,
 	if (dns_name_iswildcard(name)) {
 		if (warnwild++ == 0) {
 			fprintf(stderr, "%s: warning: BIND 9 doesn't properly "
-				"handle wildcards in secure zones:\n", PROGRAM);
+				"handle wildcards in secure zones:\n",
+				PROGRAM);
 			fprintf(stderr, "\t- wildcard nonexistence proof is "
 				"not generated by the server\n");
 			fprintf(stderr, "\t- wildcard nonexistence proof is "
@@ -1512,7 +1513,7 @@ main(int argc, char *argv[]) {
 						      "non-private key "
 						      "'%s/%s/%d'",
 						      dst_key_name(dkey),
-						      algtostr(dst_key_alg(dkey)),
+						   algtostr(dst_key_alg(dkey)),
 						      dst_key_id(dkey));
 					break;
 				}
diff --git a/bin/named/aclconf.c b/bin/named/aclconf.c
index 46116f9160..7492fa5fbc 100644
--- a/bin/named/aclconf.c
+++ b/bin/named/aclconf.c
@@ -166,7 +166,7 @@ dns_acl_fromconfig(dns_c_ipmatchlist_t *caml,
 			break;
 
 		case dns_c_ipmatch_localnets:
-			de->type = dns_aclelementtype_localnets;			
+			de->type = dns_aclelementtype_localnets;
 			break;
 		case dns_c_ipmatch_acl:
 			de->type = dns_aclelementtype_nestedacl;
diff --git a/bin/named/query.c b/bin/named/query.c
index aa102deccb..fbc150b151 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -311,7 +311,8 @@ query_newrdataset(ns_client_t *client) {
 	rdataset = NULL;
 	result = dns_message_gettemprdataset(client->message, &rdataset);
 	if (result != ISC_R_SUCCESS) {
-	  CTRACE("query_newrdataset: dns_message_gettemprdataset failed: done");
+	  CTRACE("query_newrdataset: "
+		 "dns_message_gettemprdataset failed: done");
 		return (NULL);
 	}
 	dns_rdataset_init(rdataset);
@@ -1747,11 +1748,14 @@ query_resume(isc_task_t *task, isc_event_t *event) {
 		query_putrdataset(client, &devent->sigrdataset);
 		isc_event_free(&event);
 		ns_client_next(client, ISC_R_CANCELED);
-		/* This may destroy the client. */
+		/*
+		 * This may destroy the client.
+		 */
 		ns_client_detach(&client);
 	} else {
 		RWLOCK(&ns_g_server->conflock, isc_rwlocktype_read);
-		dns_zonemgr_lockconf(ns_g_server->zonemgr, isc_rwlocktype_read);
+		dns_zonemgr_lockconf(ns_g_server->zonemgr,
+				     isc_rwlocktype_read);
 		dns_view_attach(client->view, &client->lockview);
 		RWLOCK(&client->lockview->conflock, isc_rwlocktype_read);
 
@@ -1759,7 +1763,8 @@ query_resume(isc_task_t *task, isc_event_t *event) {
 		
 		RWUNLOCK(&client->lockview->conflock, isc_rwlocktype_read);
 		dns_view_detach(&client->lockview);		
-		dns_zonemgr_unlockconf(ns_g_server->zonemgr, isc_rwlocktype_read);
+		dns_zonemgr_unlockconf(ns_g_server->zonemgr,
+				       isc_rwlocktype_read);
 		RWUNLOCK(&ns_g_server->conflock, isc_rwlocktype_read);
 	}
 }
diff --git a/bin/named/server.c b/bin/named/server.c
index 6df21523fb..af1172f84a 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -285,7 +285,7 @@ get_view_querysource_dispatch(dns_c_ctx_t *cctx, dns_c_view_t *cview,
 		if (cview != NULL)
 			result = dns_c_view_getquerysource(cview, &sa);
 		if (result != ISC_R_SUCCESS)
-			result = dns_c_ctx_getquerysource(cctx, &sa);			
+			result = dns_c_ctx_getquerysource(cctx, &sa);
 		if (result != ISC_R_SUCCESS)
 			isc_sockaddr_any(&sa);
 		break;
diff --git a/bin/named/update.c b/bin/named/update.c
index a2f02c94ad..6a59de8409 100644
--- a/bin/named/update.c
+++ b/bin/named/update.c
@@ -1294,11 +1294,13 @@ next_active(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *oldname,
 		dns_dbnode_t *node = NULL;
 		
 		if (forward)
-			result = dns_dbiterator_next(dbit);			
+			result = dns_dbiterator_next(dbit);
 		else
 			result = dns_dbiterator_prev(dbit);
 		if (result == ISC_R_NOMORE) {
-			/* Wrap around. */
+			/*
+			 * Wrap around.
+			 */
 			if (forward)
 				CHECK(dns_dbiterator_first(dbit));
 			else 
@@ -1329,7 +1331,8 @@ next_active(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *oldname,
  * Add a NXT record for "name", recording the change in "diff".
  */
 static isc_result_t
-add_nxt(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_diff_t *diff) {
+add_nxt(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_diff_t *diff)
+{
 	isc_result_t result;
 	dns_dbnode_t *node = NULL;
 	unsigned char buffer[DNS_NXT_BUFFERSIZE];
@@ -1342,16 +1345,22 @@ add_nxt(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_diff_t *diff)
 	target = dns_fixedname_name(&fixedname);	
 	
 	      
-	/* Find the successor name, aka NXT target. */
+	/*
+	 * Find the successor name, aka NXT target.
+	 */
 	CHECK(next_active(db, ver, name, target, ISC_TRUE));
 
-	/* Create the NXT RDATA. */
+	/*
+	 * Create the NXT RDATA.
+	 */
 	CHECK(dns_db_findnode(db, name, ISC_FALSE, &node));
 	dns_rdata_init(&rdata);
 	CHECK(dns_buildnxtrdata(db, ver, node, target, buffer, &rdata));
 	dns_db_detachnode(db, &node);	
 
-	/* Create a diff tuple, update the database, and record the change. */
+	/*
+	 * Create a diff tuple, update the database, and record the change.
+	 */
 	CHECK(dns_difftuple_create(diff->mctx, DNS_DIFFOP_ADD, name,
 				   3600,	/* XXXRTH */	   
 				   &rdata, &tuple));
@@ -1368,7 +1377,8 @@ add_nxt(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_diff_t *diff)
  * Add a placeholder NXT record for "name", recording the change in "diff".
  */
 static isc_result_t
-add_placeholder_nxt(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_diff_t *diff) {
+add_placeholder_nxt(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
+		    dns_diff_t *diff) {
 	isc_result_t result;
 	dns_difftuple_t *tuple = NULL;
 	isc_region_t r;
@@ -1647,11 +1657,14 @@ update_signatures(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *oldver,
 					dns_rdatatype_nxt, 0,
 					NULL, &nxt_diff));
 		} else {
-			/* This name is not obscured.  It should have a NXT. */
+			/*
+			 * This name is not obscured.  It should have a NXT.
+			 */
 			CHECK(rrset_exists(db, newver, &t->name,
 					   dns_rdatatype_nxt, 0, &flag));
 			if (! flag) {
-				add_placeholder_nxt(db, newver, &t->name, diff);
+				add_placeholder_nxt(db, newver, &t->name,
+						    diff);
 			}
 		}
 	}
diff --git a/bin/tests/dst/t_dst.c b/bin/tests/dst/t_dst.c
index 68400b3f29..d7b28cca97 100644
--- a/bin/tests/dst/t_dst.c
+++ b/bin/tests/dst/t_dst.c
@@ -247,7 +247,8 @@ io(char *name, int id, int alg, int type, isc_mem_t *mctx,
 
 	ret = dst_key_fromfile(name, id, alg, type, mctx, &key);
 	if (ret != ISC_R_SUCCESS) {
-		t_info("dst_key_fromfile(%d) returned: %s\n", alg, dst_result_totext(ret));
+		t_info("dst_key_fromfile(%d) returned: %s\n",
+		       alg, dst_result_totext(ret));
 		++*nfails;
 		return;
 	}
@@ -275,8 +276,9 @@ io(char *name, int id, int alg, int type, isc_mem_t *mctx,
 
 	ret = dst_key_tofile(key, type);
 	if (ret != 0) {
-		t_info("dst_key_tofile(%d) returned: %s\n", alg, dst_result_totext(ret));
-		(void) chdir(current);
+		t_info("dst_key_tofile(%d) returned: %s\n",
+		       alg, dst_result_totext(ret));
+		(void)chdir(current);
 		++*nfails;
 		return;
 	}
@@ -401,7 +403,10 @@ t1(void) {
 	generate(DST_ALG_RSA, mctx, 512, &nfails);
 	generate(DST_ALG_DSA, mctx, 512, &nfails);
 	generate(DST_ALG_DH, mctx, 512, &nfails);
-	generate(DST_ALG_DH, mctx, 768, &nfails); /* this one uses a constant */
+	/*
+	 * This one uses a constant.
+	 */
+	generate(DST_ALG_DH, mctx, 768, &nfails);
 	generate(DST_ALG_HMACMD5, mctx, 512, &nfails);
 
 	t_info("testing random number sequence generation\n");
@@ -420,7 +425,7 @@ t1(void) {
 
 #define	T_SIGMAX	512
 
-#undef	NEWSIG	/* define NEWSIG to generate the original signature file */
+#undef	NEWSIG	/* Define NEWSIG to generate the original signature file. */
 
 #ifdef	NEWSIG
 
diff --git a/bin/tests/names/t_names.c b/bin/tests/names/t_names.c
index 732e753573..3471ef9a83 100644
--- a/bin/tests/names/t_names.c
+++ b/bin/tests/names/t_names.c
@@ -87,13 +87,15 @@ pbuf(isc_buffer_t *pbuf) {
 #endif	/* NEED_PBUF */
 
 /*
- * compare data at buf with data in hex representation at exp_data,
+ * Compare data at buf with data in hex representation at exp_data,
  * of length exp_data_len, for equality.
- * return 0 if equal, else non-zero
+ * Return 0 if equal, else non-zero.
  */
 
 static int
-chkdata(unsigned char *buf, size_t buflen, char *exp_data, size_t exp_data_len) {
+chkdata(unsigned char *buf, size_t buflen, char *exp_data,
+	size_t exp_data_len)
+{
 	int		result;
 	unsigned char	*p;
 	unsigned char	*v;
@@ -1142,9 +1144,9 @@ t_dns_name_compare(void) {
 	}
 }
 
-char	*a30 =	"dns_name_rdatacompare(name1, name2) returns information about "
-		"the relative ordering of name1 and name2 as if they are part "
-		"of rdata in DNSSEC canonical form";
+char	*a30 =	"dns_name_rdatacompare(name1, name2) returns information "
+		"about the relative ordering of name1 and name2 as if they "
+		"are part of rdata in DNSSEC canonical form";
 
 /*
  * a31, a32 merged into a30.
@@ -2335,7 +2337,7 @@ test_dns_name_towire(char *testname, int dc_method, char *exp_data,
 				result = T_PASS;
 		} else {
 			t_info("dns_name_towire unexpectedly returned %s\n",
-					dns_result_totext(dns_result));
+			       dns_result_totext(dns_result));
 			result = T_FAIL;
 		}
 	} else {
diff --git a/bin/tests/rdata_test.c b/bin/tests/rdata_test.c
index 0b37c4ec85..697400c66c 100644
--- a/bin/tests/rdata_test.c
+++ b/bin/tests/rdata_test.c
@@ -513,7 +513,8 @@ viastruct(dns_rdata_t *rdata, isc_mem_t *mctx,
 		rdt = rdata->type;
 		result = dns_rdata_fromstruct(rdata2, rdc, rdt, sp, b);
 		if (result != ISC_R_SUCCESS)
-			fprintf(stdout, "viastruct: fromstuct %d %d return %s\n",
+			fprintf(stdout,
+				"viastruct: fromstuct %d %d return %s\n",
 				rdata->type, rdata->rdclass,
 				dns_result_totext(result));
 		else if (rdata->length != rdata2->length ||
@@ -839,7 +840,9 @@ main(int argc, char *argv[]) {
 	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
 	RUNTIME_CHECK(isc_lex_create(mctx, 256, &lex) == ISC_R_SUCCESS);
 
-	/* Set up to lex DNS master file. */
+	/*
+	 * Set up to lex DNS master file.
+	 */
 
 	specials['('] = 1;
 	specials[')'] = 1;
@@ -862,7 +865,9 @@ main(int argc, char *argv[]) {
 		if (token.type == isc_tokentype_eof)
 			break;
 	
-		/* get type */
+		/*
+		 * Get type.
+		 */
 		if (token.type == isc_tokentype_number) {
 			type = token.value.as_ulong;
 			isc_buffer_init(&tbuf, outbuf, sizeof(outbuf));
@@ -874,7 +879,8 @@ main(int argc, char *argv[]) {
 					&token.value.as_textregion);
 			if (result != ISC_R_SUCCESS) {
 				fprintf(stdout,
-				    "dns_rdatatype_fromtext returned %s(%d)\n",
+					"dns_rdatatype_fromtext "
+					"returned %s(%d)\n",
 					dns_result_totext(result), result);
 				fflush(stdout);
 				need_eol = 1;
@@ -886,13 +892,14 @@ main(int argc, char *argv[]) {
 		} else
 			continue;
 
-		if ((result = isc_lex_gettoken(lex, options | ISC_LEXOPT_NUMBER,
-					  &token)) != ISC_R_SUCCESS)
-				  break;
+		result = isc_lex_gettoken(lex, options | ISC_LEXOPT_NUMBER,
+					  &token)
+		if (result != ISC_R_SUCCESS)
+			break;
 		if (token.type == isc_tokentype_eol)
-				continue;
+			continue;
 		if (token.type == isc_tokentype_eof)
-				break;
+			break;
 		if (token.type == isc_tokentype_number) {
 			class = token.value.as_ulong;
 			isc_buffer_init(&tbuf, outbuf, sizeof(outbuf));
@@ -903,8 +910,8 @@ main(int argc, char *argv[]) {
 			result = dns_rdataclass_fromtext(&class,
 					&token.value.as_textregion);
 			if (result != ISC_R_SUCCESS) {
-				fprintf(stdout,
-				    "dns_rdataclass_fromtext returned %s(%d)\n",
+				fprintf(stdout, "dns_rdataclass_fromtext "
+					"returned %s(%d)\n",
 					dns_result_totext(result), result);
 				fflush(stdout);
 				need_eol = 1;
@@ -942,7 +949,9 @@ main(int argc, char *argv[]) {
 			}
 		}
 
-		/* Convert to wire and back? */
+		/*
+		 * Convert to wire and back?
+		 */
 		if (wire) {
 			result = dns_compress_init(&cctx, -1, mctx);
 			if (result != ISC_R_SUCCESS) {
diff --git a/bin/tests/zone2_test.c b/bin/tests/zone2_test.c
index 1a10f97415..5d039c23ae 100644
--- a/bin/tests/zone2_test.c
+++ b/bin/tests/zone2_test.c
@@ -233,7 +233,8 @@ query(dns_view_t *view) {
 			continue;
 		}
 		if (strcasecmp(buf, "journal") == 0) {
-			dns_journal_print(view->mctx, "dv.isc.org.ixfr", stdout);
+			dns_journal_print(view->mctx, "dv.isc.org.ixfr",
+					  stdout);
 			reload = 0;
 			continue;
 		}
@@ -257,7 +258,7 @@ query(dns_view_t *view) {
 				continue;
 			}
 			result = dns_zone_load(zone);
-			fprintf(stdout, "%s() returned %s\n", "dns_zone_reload",
+			fprintf(stdout, "dns_zone_reload() returned %s\n",
 				dns_result_totext(result));
 			reload = 0;
 			dns_zone_detach(&zone);
diff --git a/lib/dns/aclconf.c b/lib/dns/aclconf.c
index 46116f9160..7492fa5fbc 100644
--- a/lib/dns/aclconf.c
+++ b/lib/dns/aclconf.c
@@ -166,7 +166,7 @@ dns_acl_fromconfig(dns_c_ipmatchlist_t *caml,
 			break;
 
 		case dns_c_ipmatch_localnets:
-			de->type = dns_aclelementtype_localnets;			
+			de->type = dns_aclelementtype_localnets;
 			break;
 		case dns_c_ipmatch_acl:
 			de->type = dns_aclelementtype_nestedacl;
diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index 814088e4ce..07d8d4607d 100644
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -197,8 +197,8 @@ dns_db_create(isc_mem_t *mctx, char *db_type, dns_name_t *origin,
  *
  * Notes:
  *	All names in the database must be subdomains of 'origin' and in class
- *	'rdclass'.  The database makes its own copy of the origin, so the caller
- *	may do whatever they like with 'origin' and its storage once the
+ *	'rdclass'.  The database makes its own copy of the origin, so the
+ *	caller may do whatever they like with 'origin' and its storage once the
  *	call returns.
  *
  *	If 'cache' is ISC_TRUE, then cache semantics will be used, otherwise
diff --git a/lib/dns/include/dns/dnssec.h b/lib/dns/include/dns/dnssec.h
index 14eb7f85a9..0d1a495a76 100644
--- a/lib/dns/include/dns/dnssec.h
+++ b/lib/dns/include/dns/dnssec.h
@@ -107,9 +107,10 @@ dns_dnssec_verify(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key,
  */
 
 isc_result_t
-dns_dnssec_findzonekeys(dns_db_t *db, dns_dbversion_t *ver, dns_dbnode_t *node, 
-			dns_name_t *name, isc_mem_t *mctx, unsigned int maxkeys,
-			dst_key_t **keys, unsigned int *nkeys);
+dns_dnssec_findzonekeys(dns_db_t *db, dns_dbversion_t *ver, dns_dbnode_t *node,
+			dns_name_t *name, isc_mem_t *mctx,
+			unsigned int maxkeys, dst_key_t **keys,
+			unsigned int *nkeys);
 /*
  * 	Finds a set of zone keys.
  * 	XXX temporary - this should be handled in dns_zone_t.
diff --git a/lib/dns/include/dns/keyvalues.h b/lib/dns/include/dns/keyvalues.h
index 6bf4429809..7b71cee456 100644
--- a/lib/dns/include/dns/keyvalues.h
+++ b/lib/dns/include/dns/keyvalues.h
@@ -42,7 +42,7 @@
 #define DNS_KEYFLAG_RESERVED9	0x0040	/* reserved - must be zero */
 #define DNS_KEYFLAG_RESERVED10	0x0020	/* reserved - must be zero */
 #define DNS_KEYFLAG_RESERVED11	0x0010	/* reserved - must be zero */
-#define DNS_KEYFLAG_SIGNATORYMASK	0x000F	/* key can sign RR's of same name */
+#define DNS_KEYFLAG_SIGNATORYMASK 0x000F /* key can sign RR's of same name */
 
 #define DNS_KEYFLAG_RESERVEDMASK (DNS_KEYFLAG_RESERVED2 | \
 				  DNS_KEYFLAG_RESERVED4 | \
diff --git a/lib/dns/include/dns/tsig.h b/lib/dns/include/dns/tsig.h
index b301ac67a1..5761e35eb8 100644
--- a/lib/dns/include/dns/tsig.h
+++ b/lib/dns/include/dns/tsig.h
@@ -114,7 +114,8 @@ dns_tsigkey_free(dns_tsigkey_t **key);
 void
 dns_tsigkey_setdeleted(dns_tsigkey_t *key);
 /*
- *	Marks this key as deleted.  It will be deleted when no references exist.
+ *	Marks this key as deleted.  It will be deleted when no references
+ *	exist.
  *
  *	Requires:
  *		'key' is a valid TSIG key
@@ -134,7 +135,8 @@ dns_tsig_sign(dns_message_t *msg);
  *		ISC_R_SUCCESS
  *		ISC_R_NOMEMORY
  *		ISC_R_NOSPACE
- *		DNS_R_EXPECTEDTSIG - this is a response & msg->querytsig is NULL
+ *		DNS_R_EXPECTEDTSIG
+ *			- this is a response & msg->querytsig is NULL
  */
 
 isc_result_t
diff --git a/lib/dns/journal.c b/lib/dns/journal.c
index 94983d0a63..4faa5b1741 100644
--- a/lib/dns/journal.c
+++ b/lib/dns/journal.c
@@ -1023,7 +1023,7 @@ journal_file_create(isc_mem_t *mctx, const char *filename) {
 	
 	result = isc_stdio_close(fp);
 	if (result != ISC_R_SUCCESS) {
-		isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR,		
+		isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR,
 				 "%s: close: %s",
 				 filename, isc_result_totext(result));
 		(void)isc_file_remove(filename);
@@ -1247,7 +1247,7 @@ journal_next(dns_journal_t *j, journal_pos_t *pos) {
 	 * Check for offset wraparound.
 	 */
 	if (pos->offset + xhdr.size < pos->offset) {
-		isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR,		
+		isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR,
 				 "%s: offset too large",
 				 j->filename);
 		return (ISC_R_UNEXPECTED);		
@@ -1747,7 +1747,7 @@ roll_forward(dns_journal_t *j, dns_db_t *db) {
 		if (n_soa == 3)
 			n_soa = 1;
 		if (n_soa == 0) {
-			isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR,			
+			isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR,
 					 "%s: journal file corrupt: missing "
 					 "initial SOA", j->filename);
 			FAIL(ISC_R_UNEXPECTED);
diff --git a/lib/dns/message.c b/lib/dns/message.c
index 64ec85bb06..7484e54316 100644
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -509,7 +509,8 @@ msgreset(dns_message_t *msg, isc_boolean_t everything) {
 
 	if (msg->tsig != NULL) {
 		dns_rdata_freestruct(msg->tsig);
-		isc_mem_put(msg->mctx, msg->tsig, sizeof(dns_rdata_any_tsig_t));
+		isc_mem_put(msg->mctx, msg->tsig,
+			    sizeof(dns_rdata_any_tsig_t));
 		msg->tsig = NULL;
 	}
 
diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
index 9567276cde..743a972754 100644
--- a/lib/dns/rdata.c
+++ b/lib/dns/rdata.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: rdata.c,v 1.94 2000/05/24 02:45:08 tale Exp $ */
+/* $Id: rdata.c,v 1.95 2000/05/24 05:09:12 tale Exp $ */
 
 #include <config.h>
 #include <ctype.h>
@@ -746,7 +746,8 @@ dns_rdataclass_fromtext(dns_rdataclass_t *classp, isc_textregion_t *source) {
 	/*
 	 * Note: attrs is set and then used in the bit test with RESERVED
 	 * because testing "(flags & RESERVED) != 0" generates
-	 * warnings on IRIX about how the test always has the same value		* because it is all constants.
+	 * warnings on IRIX about how the test always has the same value
+	 * because it is all constants.
 	 */
 #define COMPARE(string, flags, type) \
 	if (((sizeof(string) - 1) == source->length) \
diff --git a/lib/dns/rdata/generic/cname_5.c b/lib/dns/rdata/generic/cname_5.c
index 6fb04f17b8..824350f553 100644
--- a/lib/dns/rdata/generic/cname_5.c
+++ b/lib/dns/rdata/generic/cname_5.c
@@ -15,14 +15,15 @@
  * SOFTWARE.
  */
 
-/* $Id: cname_5.c,v 1.30 2000/05/22 12:37:31 marka Exp $ */
+/* $Id: cname_5.c,v 1.31 2000/05/24 05:09:26 tale Exp $ */
 
 /* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */
 
 #ifndef RDATA_GENERIC_CNAME_5_C
 #define RDATA_GENERIC_CNAME_5_C
 
-#define RRTYPE_CNAME_ATTRIBUTES (DNS_RDATATYPEATTR_EXCLUSIVE | DNS_RDATATYPEATTR_SINGLETON)
+#define RRTYPE_CNAME_ATTRIBUTES \
+	(DNS_RDATATYPEATTR_EXCLUSIVE | DNS_RDATATYPEATTR_SINGLETON)
 
 static inline isc_result_t
 fromtext_cname(dns_rdataclass_t rdclass, dns_rdatatype_t type,
diff --git a/lib/dns/rdata/generic/gpos_27.c b/lib/dns/rdata/generic/gpos_27.c
index 7ef878ced6..7391ef9f33 100644
--- a/lib/dns/rdata/generic/gpos_27.c
+++ b/lib/dns/rdata/generic/gpos_27.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: gpos_27.c,v 1.20 2000/05/22 12:37:33 marka Exp $ */
+/* $Id: gpos_27.c,v 1.21 2000/05/24 05:09:27 tale Exp $ */
 
 /* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */
 
@@ -161,7 +161,8 @@ tostruct_gpos(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
 	gpos->lat_len = uint8_fromregion(&region);
 	isc_region_consume(&region, 1);
 	if (gpos->lat_len > 0) {
-		gpos->latitude = mem_maybedup(mctx, region.base, gpos->lat_len);
+		gpos->latitude =
+			mem_maybedup(mctx, region.base, gpos->lat_len);
 		if (gpos->latitude == NULL)
 			goto cleanup_longitude;
 		isc_region_consume(&region, gpos->lat_len);
@@ -171,7 +172,8 @@ tostruct_gpos(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
 	gpos->alt_len = uint8_fromregion(&region);
 	isc_region_consume(&region, 1);
 	if (gpos->lat_len > 0) {
-		gpos->altitude = mem_maybedup(mctx, region.base, gpos->alt_len);
+		gpos->altitude =
+			mem_maybedup(mctx, region.base, gpos->alt_len);
 		if (gpos->altitude == NULL)
 			goto cleanup_latitude;
 	} else 
diff --git a/lib/dns/rdata/generic/opt_41.h b/lib/dns/rdata/generic/opt_41.h
index 1ff0375051..73c419f88e 100644
--- a/lib/dns/rdata/generic/opt_41.h
+++ b/lib/dns/rdata/generic/opt_41.h
@@ -18,7 +18,7 @@
 #ifndef GENERIC_OPT_41_H
 #define GENERIC_OPT_41_H 1
 
-/* $Id: opt_41.h,v 1.6 2000/04/29 02:01:47 tale Exp $ */
+/* $Id: opt_41.h,v 1.7 2000/05/24 05:09:28 tale Exp $ */
 
 /* RFC 2671 */
 
@@ -41,9 +41,14 @@ typedef struct dns_rdata_opt {
 
 ISC_LANG_BEGINDECLS
 
-isc_result_t dns_rdata_opt_first(dns_rdata_opt_t *);
-isc_result_t dns_rdata_opt_next(dns_rdata_opt_t *);
-isc_result_t dns_rdata_opt_current(dns_rdata_opt_t *, dns_rdata_opt_opcode_t *);
+isc_result_t
+dns_rdata_opt_first(dns_rdata_opt_t *);
+
+isc_result_t
+dns_rdata_opt_next(dns_rdata_opt_t *);
+
+isc_result_t
+dns_rdata_opt_current(dns_rdata_opt_t *, dns_rdata_opt_opcode_t *);
 
 ISC_LANG_ENDDECLS
 
diff --git a/lib/dns/rdata/generic/txt_16.h b/lib/dns/rdata/generic/txt_16.h
index 80bb8f4a52..aab6e21234 100644
--- a/lib/dns/rdata/generic/txt_16.h
+++ b/lib/dns/rdata/generic/txt_16.h
@@ -18,7 +18,7 @@
 #ifndef GENERIC_TXT_16_H
 #define GENERIC_TXT_16_H 1
 
-/* $Id: txt_16.h,v 1.16 2000/04/29 02:01:51 tale Exp $ */
+/* $Id: txt_16.h,v 1.17 2000/05/24 05:09:29 tale Exp $ */
 
 
 typedef struct dns_rdata_txt_string {
@@ -39,9 +39,14 @@ typedef struct dns_rdata_txt {
 
 ISC_LANG_BEGINDECLS
 
-isc_result_t dns_rdata_txt_first(dns_rdata_txt_t *);
-isc_result_t dns_rdata_txt_next(dns_rdata_txt_t *);
-isc_result_t dns_rdata_txt_current(dns_rdata_txt_t *, dns_rdata_txt_string_t *);
+isc_result_t
+dns_rdata_txt_first(dns_rdata_txt_t *);
+
+isc_result_t
+dns_rdata_txt_next(dns_rdata_txt_t *);
+
+isc_result_t
+dns_rdata_txt_current(dns_rdata_txt_t *, dns_rdata_txt_string_t *);
 
 ISC_LANG_ENDDECLS
 
diff --git a/lib/dns/rdata/in_1/aaaa_28.c b/lib/dns/rdata/in_1/aaaa_28.c
index 4946444928..51f8c05b26 100644
--- a/lib/dns/rdata/in_1/aaaa_28.c
+++ b/lib/dns/rdata/in_1/aaaa_28.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: aaaa_28.c,v 1.24 2000/05/22 12:38:07 marka Exp $ */
+/* $Id: aaaa_28.c,v 1.25 2000/05/24 05:09:31 tale Exp $ */
 
 /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
 
@@ -104,7 +104,8 @@ fromwire_in_aaaa(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 }
 
 static inline isc_result_t
-towire_in_aaaa(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
+towire_in_aaaa(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
+{
 	isc_region_t region;
 
 	UNUSED(cctx);
diff --git a/lib/dns/rdata/in_1/naptr_35.c b/lib/dns/rdata/in_1/naptr_35.c
index a08be99da2..aa35c003a0 100644
--- a/lib/dns/rdata/in_1/naptr_35.c
+++ b/lib/dns/rdata/in_1/naptr_35.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: naptr_35.c,v 1.29 2000/05/22 12:38:08 marka Exp $ */
+/* $Id: naptr_35.c,v 1.30 2000/05/24 05:09:32 tale Exp $ */
 
 /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
 
@@ -191,7 +191,8 @@ fromwire_in_naptr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 }
 
 static inline isc_result_t
-towire_in_naptr(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
+towire_in_naptr(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
+{
 	dns_name_t name;
 	isc_region_t sr;
 
diff --git a/lib/dns/rdata/in_1/nsap_22.c b/lib/dns/rdata/in_1/nsap_22.c
index 01c5f8bc28..013a42e701 100644
--- a/lib/dns/rdata/in_1/nsap_22.c
+++ b/lib/dns/rdata/in_1/nsap_22.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: nsap_22.c,v 1.21 2000/05/22 12:38:10 marka Exp $ */
+/* $Id: nsap_22.c,v 1.22 2000/05/24 05:09:33 tale Exp $ */
 
 /* Reviewed: Fri Mar 17 10:41:07 PST 2000 by gson */
 
@@ -118,8 +118,8 @@ fromwire_in_nsap(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 }
 
 static inline isc_result_t
-towire_in_nsap(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
-
+towire_in_nsap(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
+{
 	REQUIRE(rdata->type == 22);
 	REQUIRE(rdata->rdclass == 1);
 
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 340c48ad0a..d33c71438d 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -720,8 +720,9 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
 		 *
 		 * XXXRTH  Should we attach to the socket?
 		 */
-		result = isc_socket_connect(query->tcpsocket, addrinfo->sockaddr,
-					    task, resquery_connected, query);
+		result = isc_socket_connect(query->tcpsocket,
+					    addrinfo->sockaddr, task,
+					    resquery_connected, query);
 		if (result != ISC_R_SUCCESS)
 			goto cleanup_query;
 		query->attributes |= RESQUERY_ATTR_CONNECTING;
@@ -903,8 +904,8 @@ resquery_send(resquery_t *query) {
 					  fctx->res->view->statickeys);
 		if (result == ISC_R_NOTFOUND)
 			result = dns_tsigkey_find(&fctx->qmessage->tsigkey,
-						  keyname, NULL,
-						  fctx->res->view->dynamickeys);
+						 keyname, NULL,
+						 fctx->res->view->dynamickeys);
 		if (result != ISC_R_SUCCESS && result != ISC_R_NOTFOUND)
 			goto cleanup_message;
 	}
@@ -1025,11 +1026,10 @@ resquery_connected(isc_task_t *task, isc_event_t *event) {
 			attrs |= DNS_DISPATCHATTR_MAKEQUERY;
 
 			result = dns_dispatch_createtcp(query->dispatchmgr,
-							query->tcpsocket,
-							query->fctx->res->taskmgr,
-							4096, 2, 1, 1, 3,
-							attrs,
-							&query->dispatch);
+						     query->tcpsocket,
+						     query->fctx->res->taskmgr,
+						     4096, 2, 1, 1, 3, attrs,
+						     &query->dispatch);
 		
 			/*
 			 * Regardless of whether dns_dispatch_create()
@@ -2956,8 +2956,8 @@ noanswer_response(fetchctx_t *fctx, dns_name_t *oqname) {
 					 *
 					 * Only one SOA is allowed.
 					 */
-					if (rdataset->type == dns_rdatatype_soa)
-					{
+					if (rdataset->type ==
+					    dns_rdatatype_soa) {
 						if (soa_name != NULL &&
 						    name != soa_name)
 							return (DNS_R_FORMERR);
diff --git a/lib/dns/sec/dst/dst_api.c b/lib/dns/sec/dst/dst_api.c
index ba395b42f1..fbbec2646c 100644
--- a/lib/dns/sec/dst/dst_api.c
+++ b/lib/dns/sec/dst/dst_api.c
@@ -19,7 +19,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: dst_api.c,v 1.39 2000/05/24 03:00:39 tale Exp $
+ * $Id: dst_api.c,v 1.40 2000/05/24 05:09:36 tale Exp $
  */
 
 #include <config.h>
@@ -154,7 +154,7 @@ dst_key_sign(const unsigned int mode, dst_key_t *key, dst_context_t *context,
  */
 
 isc_result_t
-dst_key_verify(const unsigned int mode, dst_key_t *key, dst_context_t *context, 
+dst_key_verify(const unsigned int mode, dst_key_t *key, dst_context_t *context,
 	       isc_region_t *data, isc_region_t *sig)
 {
 	RUNTIME_CHECK(isc_once_do(&once, initialize) == ISC_R_SUCCESS);
@@ -202,7 +202,8 @@ dst_key_verify(const unsigned int mode, dst_key_t *key, dst_context_t *context,
  */
 isc_result_t
 dst_key_digest(const unsigned int mode, const unsigned int alg,
-	       dst_context_t *context, isc_region_t *data, isc_buffer_t *digest)
+	       dst_context_t *context, isc_region_t *data,
+	       isc_buffer_t *digest)
 {
 	RUNTIME_CHECK(isc_once_do(&once, initialize) == ISC_R_SUCCESS);
 	REQUIRE((mode & DST_SIGMODE_ALL) != 0);
@@ -756,7 +757,8 @@ dst_key_isnullkey(const dst_key_t *key) {
 }
 
 isc_result_t
-dst_key_buildfilename(const dst_key_t *key, const int type, isc_buffer_t *out) {
+dst_key_buildfilename(const dst_key_t *key, const int type, isc_buffer_t *out)
+{
 	char *suffix;
 	unsigned int namelen;
 	isc_region_t r;
diff --git a/lib/dns/sec/dst/openssldh_link.c b/lib/dns/sec/dst/openssldh_link.c
index 6f05be7a39..1b8312d290 100644
--- a/lib/dns/sec/dst/openssldh_link.c
+++ b/lib/dns/sec/dst/openssldh_link.c
@@ -19,7 +19,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: openssldh_link.c,v 1.16 2000/05/15 21:30:45 bwelling Exp $
+ * $Id: openssldh_link.c,v 1.17 2000/05/24 05:09:37 tale Exp $
  */
 
 #if defined(OPENSSL)
@@ -484,8 +484,8 @@ dst_openssldh_from_file(dst_key_t *key, const isc_uint16_t id,
 			BN_free(dh->g);
 			dh->p = &bn768;
 			dh->g = &bn2;
-		}
-		else if (key->key_size == 1024 && BN_cmp(dh->p, &bn1024) == 0) {
+		} else if (key->key_size == 1024 &&
+			   BN_cmp(dh->p, &bn1024) == 0) {
 			BN_free(dh->p);
 			BN_free(dh->g);
 			dh->p = &bn1024;
diff --git a/lib/dns/sec/rename.h b/lib/dns/sec/rename.h
index 0d1cc40930..2611815edb 100644
--- a/lib/dns/sec/rename.h
+++ b/lib/dns/sec/rename.h
@@ -114,9 +114,11 @@
 #define CRYPTO_get_ex_new_index dst__openssl_CRYPTO_get_ex_new_index
 #define CRYPTO_get_id_callback dst__openssl_CRYPTO_get_id_callback
 #define CRYPTO_get_lock_name dst__openssl_CRYPTO_get_lock_name
-#define CRYPTO_get_locked_mem_functions dst__openssl_CRYPTO_get_locked_mem_functions
+#define CRYPTO_get_locked_mem_functions \
+	dst__openssl_CRYPTO_get_locked_mem_functions
 #define CRYPTO_get_locking_callback dst__openssl_CRYPTO_get_locking_callback
-#define CRYPTO_get_mem_debug_functions dst__openssl_CRYPTO_get_mem_debug_functions
+#define CRYPTO_get_mem_debug_functions \
+	dst__openssl_CRYPTO_get_mem_debug_functions
 #define CRYPTO_get_mem_debug_options dst__openssl_CRYPTO_get_mem_debug_options
 #define CRYPTO_get_mem_functions dst__openssl_CRYPTO_get_mem_functions
 #define CRYPTO_get_new_lockid dst__openssl_CRYPTO_get_new_lockid
@@ -135,9 +137,11 @@
 #define CRYPTO_set_add_lock_callback dst__openssl_CRYPTO_set_add_lock_callback
 #define CRYPTO_set_ex_data dst__openssl_CRYPTO_set_ex_data
 #define CRYPTO_set_id_callback dst__openssl_CRYPTO_set_id_callback
-#define CRYPTO_set_locked_mem_functions dst__openssl_CRYPTO_set_locked_mem_functions
+#define CRYPTO_set_locked_mem_functions \
+	dst__openssl_CRYPTO_set_locked_mem_functions
 #define CRYPTO_set_locking_callback dst__openssl_CRYPTO_set_locking_callback
-#define CRYPTO_set_mem_debug_functions dst__openssl_CRYPTO_set_mem_debug_functions
+#define CRYPTO_set_mem_debug_functions \
+	dst__openssl_CRYPTO_set_mem_debug_functions
 #define CRYPTO_set_mem_debug_options dst__openssl_CRYPTO_set_mem_debug_options
 #define CRYPTO_set_mem_functions dst__openssl_CRYPTO_set_mem_functions
 #define CRYPTO_thread_id dst__openssl_CRYPTO_thread_id
@@ -248,24 +252,36 @@
 #define md5_block_data_order dst__openssl_md5_block_data_order
 #define sha1_block_data_order dst__openssl_sha1_block_data_order
 #define sha1_block_host_order dst__openssl_sha1_block_host_order
-#define sk_CRYPTO_EX_DATA_FUNCS_delete dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_delete
-#define sk_CRYPTO_EX_DATA_FUNCS_delete_ptr dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_delete_ptr
-#define sk_CRYPTO_EX_DATA_FUNCS_dup dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_dup
-#define sk_CRYPTO_EX_DATA_FUNCS_find dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_find
-#define sk_CRYPTO_EX_DATA_FUNCS_free dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_free
-#define sk_CRYPTO_EX_DATA_FUNCS_insert dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_insert
+#define sk_CRYPTO_EX_DATA_FUNCS_delete \
+	dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_delete
+#define sk_CRYPTO_EX_DATA_FUNCS_delete_ptr \
+	dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_delete_ptr
+#define sk_CRYPTO_EX_DATA_FUNCS_dup \
+	dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_dup
+#define sk_CRYPTO_EX_DATA_FUNCS_find \
+	dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_find
+#define sk_CRYPTO_EX_DATA_FUNCS_free \
+	dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_free
+#define sk_CRYPTO_EX_DATA_FUNCS_insert \
+	dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_insert
 #define sk_CRYPTO_EX_DATA_FUNCS_new dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_new
-#define sk_CRYPTO_EX_DATA_FUNCS_new_null dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_new_null
+#define sk_CRYPTO_EX_DATA_FUNCS_new_null \
+	dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_new_null
 #define sk_CRYPTO_EX_DATA_FUNCS_num dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_num
 #define sk_CRYPTO_EX_DATA_FUNCS_pop dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_pop
-#define sk_CRYPTO_EX_DATA_FUNCS_pop_free dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_pop_free
+#define sk_CRYPTO_EX_DATA_FUNCS_pop_free \
+	dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_pop_free
 #define sk_CRYPTO_EX_DATA_FUNCS_push dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_push
 #define sk_CRYPTO_EX_DATA_FUNCS_set dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_set
-#define sk_CRYPTO_EX_DATA_FUNCS_set_cmp_func dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_set_cmp_func
-#define sk_CRYPTO_EX_DATA_FUNCS_shift dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_shift
+#define sk_CRYPTO_EX_DATA_FUNCS_set_cmp_func \
+	dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_set_cmp_func
+#define sk_CRYPTO_EX_DATA_FUNCS_shift \
+	dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_shift
 #define sk_CRYPTO_EX_DATA_FUNCS_sort dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_sort
-#define sk_CRYPTO_EX_DATA_FUNCS_unshift dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_unshift
-#define sk_CRYPTO_EX_DATA_FUNCS_value dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_value
+#define sk_CRYPTO_EX_DATA_FUNCS_unshift \
+	dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_unshift
+#define sk_CRYPTO_EX_DATA_FUNCS_value \
+	dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_value
 #define sk_CRYPTO_EX_DATA_FUNCS_zero dst__openssl_sk_CRYPTO_EX_DATA_FUNCS_zero
 #define sk_delete dst__openssl_sk_delete
 #define sk_delete_ptr dst__openssl_sk_delete_ptr
diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c
index 858ebd30e9..898cf063b1 100644
--- a/lib/dns/tsig.c
+++ b/lib/dns/tsig.c
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tsig.c,v 1.61 2000/05/22 23:17:22 bwelling Exp $
+ * $Id: tsig.c,v 1.62 2000/05/24 05:09:15 tale Exp $
  * Principal Author: Brian Wellington
  */
 
@@ -434,8 +434,8 @@ dns_tsig_sign(dns_message_t *msg) {
 			if (tsig.otherlen > 0) {
 				r.length = tsig.otherlen;
 				r.base = tsig.other;
-				ret = dst_key_sign(DST_SIGMODE_UPDATE, key->key,
-					       &ctx, &r, NULL);
+				ret = dst_key_sign(DST_SIGMODE_UPDATE,
+						   key->key, &ctx, &r, NULL);
 				if (ret != ISC_R_SUCCESS)
 					goto cleanup_other;
 			}
@@ -680,7 +680,8 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg,
 		sig_r.base = tsig->signature;
 		sig_r.length = tsig->siglen;
 
-		ret = dst_key_verify(DST_SIGMODE_INIT, key, &ctx, NULL, &sig_r);
+		ret = dst_key_verify(DST_SIGMODE_INIT, key, &ctx, NULL,
+				     &sig_r);
 		if (ret != ISC_R_SUCCESS)
 			goto cleanup_key;
 
@@ -738,7 +739,8 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg,
 		isc_buffer_usedregion(source, &source_r);
 		r.base = source_r.base + DNS_MESSAGE_HEADERLEN;
 		r.length = msg->sigstart - DNS_MESSAGE_HEADERLEN;
-		ret = dst_key_verify(DST_SIGMODE_UPDATE, key, &ctx, &r, &sig_r);
+		ret = dst_key_verify(DST_SIGMODE_UPDATE, key, &ctx, &r,
+				     &sig_r);
 		if (ret != ISC_R_SUCCESS)
 			goto cleanup_key;
 
@@ -746,7 +748,8 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg,
 		 * Digest the key name.
 		 */
 		dns_name_toregion(&tsigkey->name, &r);
-		ret = dst_key_verify(DST_SIGMODE_UPDATE, key, &ctx, &r, &sig_r);
+		ret = dst_key_verify(DST_SIGMODE_UPDATE, key, &ctx, &r,
+				     &sig_r);
 		if (ret != ISC_R_SUCCESS)
 			goto cleanup_key;
 
@@ -754,7 +757,8 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg,
 		isc_buffer_putuint16(&databuf, tsig->common.rdclass);
 		isc_buffer_putuint32(&databuf, msg->tsigset->ttl);
 		isc_buffer_usedregion(&databuf, &r);
-		ret = dst_key_verify(DST_SIGMODE_UPDATE, key, &ctx, &r, &sig_r);
+		ret = dst_key_verify(DST_SIGMODE_UPDATE, key, &ctx, &r,
+				     &sig_r);
 		if (ret != ISC_R_SUCCESS)
 			goto cleanup_key;
 
@@ -762,7 +766,8 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg,
 		 * Digest the key algorithm.
 		 */
 		dns_name_toregion(&tsigkey->algorithm, &r);
-		ret = dst_key_verify(DST_SIGMODE_UPDATE, key, &ctx, &r, &sig_r);
+		ret = dst_key_verify(DST_SIGMODE_UPDATE, key, &ctx, &r,
+				     &sig_r);
 		if (ret != ISC_R_SUCCESS)
 			goto cleanup_key;
 
@@ -775,7 +780,8 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg,
 		isc_buffer_putuint16(&databuf, tsig->error);
 		isc_buffer_putuint16(&databuf, tsig->otherlen);
 		isc_buffer_usedregion(&databuf, &r);
-		ret = dst_key_verify(DST_SIGMODE_UPDATE, key, &ctx, &r, &sig_r);
+		ret = dst_key_verify(DST_SIGMODE_UPDATE, key, &ctx, &r,
+				     &sig_r);
 
 		if (tsig->otherlen > 0) {
 			r.base = tsig->other;
@@ -978,8 +984,8 @@ dns_tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) {
 							      & 0xFFFFFFFF));
 		isc_buffer_putuint16(&databuf, tsig->fudge);
 		isc_buffer_usedregion(&databuf, &r);
-		ret = dst_key_verify(DST_SIGMODE_UPDATE, key, &msg->tsigctx, &r,
-				     NULL);
+		ret = dst_key_verify(DST_SIGMODE_UPDATE, key, &msg->tsigctx,
+				     &r, NULL);
 
 		sig_r.base = tsig->signature;
 		sig_r.length = tsig->siglen;
diff --git a/lib/dns/ttl.c b/lib/dns/ttl.c
index 1ef9ed8707..404168fd3e 100644
--- a/lib/dns/ttl.c
+++ b/lib/dns/ttl.c
@@ -39,8 +39,9 @@
 
 static isc_result_t bind_ttl(isc_textregion_t *source, isc_uint32_t *ttl);
 
-/* Helper for dns_ttl_totext(). */
-
+/*
+ * Helper for dns_ttl_totext().
+ */
 static isc_result_t
 ttlfmt(unsigned int t, char *s, isc_boolean_t verbose,
        isc_boolean_t space, isc_buffer_t *target)
@@ -65,8 +66,9 @@ ttlfmt(unsigned int t, char *s, isc_boolean_t verbose,
 	return (ISC_R_SUCCESS);
 }
 
-/* Derived from bind8 ns_format_ttl(). */
-
+/*
+ * Derived from bind8 ns_format_ttl().
+ */
 isc_result_t
 dns_ttl_totext(isc_uint32_t src, isc_boolean_t verbose, isc_buffer_t *target) {
 	unsigned secs, mins, hours, days, weeks, x;
@@ -94,7 +96,8 @@ dns_ttl_totext(isc_uint32_t src, isc_boolean_t verbose, isc_buffer_t *target) {
 		RETERR(ttlfmt(mins, "minute", verbose, ISC_TF(x > 0), target));
 		x++;
 	}
-	if (secs != 0 || (weeks == 0 && days == 0 && hours == 0 && mins == 0)) {
+	if (secs != 0 ||
+	    (weeks == 0 && days == 0 && hours == 0 && mins == 0)) {
 		RETERR(ttlfmt(secs, "second", verbose, ISC_TF(x > 0), target));
 		x++;
 	}
diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 350eb24d79..b847106eb2 100644
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -84,20 +84,26 @@ struct dns_validator {
 #define VALATTR_FOUNDNONEXISTENCE	0x02
 #define SHUTDOWN(v)		(((v)->attributes & VALATTR_SHUTDOWN) != 0)
 
-static void nullkeyvalidated(isc_task_t *task, isc_event_t *event);
-static inline isc_boolean_t containsnullkey(dns_validator_t *val,
-					    dns_rdataset_t *rdataset);
-static inline isc_result_t get_dst_key(dns_validator_t *val,
-				       dns_siginfo_t *siginfo,
-				       dns_rdataset_t *rdataset);
-static inline isc_result_t validate(dns_validator_t *val, isc_boolean_t resume);
-static inline isc_result_t nxtvalidate(dns_validator_t *val,
-				       isc_boolean_t resume);
-static inline isc_result_t proveunsecure(dns_validator_t *val,
-					 isc_boolean_t resume);
+static void
+nullkeyvalidated(isc_task_t *task, isc_event_t *event);
 
-static void validator_log(dns_validator_t *val, int level,
-			  const char *fmt, ...);
+static inline isc_boolean_t
+containsnullkey(dns_validator_t *val, dns_rdataset_t *rdataset);
+
+static inline isc_result_t
+get_dst_key(dns_validator_t *val, dns_siginfo_t *siginfo,
+	    dns_rdataset_t *rdataset);
+static inline isc_result_t
+validate(dns_validator_t *val, isc_boolean_t resume);
+
+static inline isc_result_t
+nxtvalidate(dns_validator_t *val, isc_boolean_t resume);
+
+static inline isc_result_t
+proveunsecure(dns_validator_t *val, isc_boolean_t resume);
+
+static void
+validator_log(dns_validator_t *val, int level, const char *fmt, ...);
 
 static void
 rdata_to_siginfo(dns_rdata_t *rdata, dns_siginfo_t *siginfo) {
diff --git a/lib/dns/view.c b/lib/dns/view.c
index 30b87a0125..1acb885296 100644
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -449,11 +449,11 @@ dns_view_createresolver(dns_view_t *view,
 	view->attributes &= ~DNS_VIEWATTR_ADBSHUTDOWN;
 
 	result = dns_requestmgr_create(view->mctx, timermgr, socketmgr,
-				       dns_resolver_taskmgr(view->resolver),
-				       dns_resolver_dispatchmgr(view->resolver),
-				       dns_resolver_dispatchv4(view->resolver),
-				       dns_resolver_dispatchv6(view->resolver),
-				       &view->requestmgr);
+				      dns_resolver_taskmgr(view->resolver),
+				      dns_resolver_dispatchmgr(view->resolver),
+				      dns_resolver_dispatchv4(view->resolver),
+				      dns_resolver_dispatchv6(view->resolver),
+				      &view->requestmgr);
 	if (result != ISC_R_SUCCESS) {
 		dns_adb_shutdown(view->adb);
 		dns_resolver_shutdown(view->resolver);
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 7cd47345b5..f84fca51e7 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.123 2000/05/23 04:38:22 gson Exp $ */
+/* $Id: zone.c,v 1.124 2000/05/24 05:09:19 tale Exp $ */
 
 #include <config.h>
 
@@ -242,7 +242,8 @@ static void notify_done(isc_task_t *task, isc_event_t *event);
 static void notify_send_toaddr(isc_task_t *task, isc_event_t *event);
 static isc_result_t zone_dump(dns_zone_t *);
 static void got_transfer_quota(isc_task_t *task, isc_event_t *event);
-static isc_result_t zmgr_start_xfrin_ifquota(dns_zonemgr_t *zmgr, dns_zone_t *zone);
+static isc_result_t zmgr_start_xfrin_ifquota(dns_zonemgr_t *zmgr,
+					     dns_zone_t *zone);
 static void zmgr_resume_xfrs(dns_zonemgr_t *zmgr);
 static void zonemgr_free(dns_zonemgr_t *zmgr);
 
@@ -2886,7 +2887,8 @@ zone_log(dns_zone_t *zone, const char *me, int level, const char *fmt, ...) {
 }
 
 static int
-message_count(dns_message_t *msg, dns_section_t section, dns_rdatatype_t type) {
+message_count(dns_message_t *msg, dns_section_t section, dns_rdatatype_t type)
+{
 	isc_result_t result;
 	dns_name_t *name;
 	dns_rdataset_t *curr;
@@ -3431,7 +3433,8 @@ got_transfer_quota(isc_task_t *task, isc_event_t *event) {
 						  view->dynamickeys);
 		if (result != ISC_R_SUCCESS && result != ISC_R_NOTFOUND) {
 			zone_log(zone, me, ISC_LOG_ERROR,
-				 "error getting tsig keys for zone transfer: %s",
+				 "error getting tsig keys "
+				 "for zone transfer: %s",
 				 isc_result_totext(result));
 			goto cleanup;
 		}
diff --git a/lib/isc/include/isc/lex.h b/lib/isc/include/isc/lex.h
index dae5f96dd0..deb32d8957 100644
--- a/lib/isc/include/isc/lex.h
+++ b/lib/isc/include/isc/lex.h
@@ -328,7 +328,7 @@ isc_lex_getsourcename(isc_lex_t *lex);
  */
 
 
-int
+unsigned long
 isc_lex_getsourceline(isc_lex_t *lex);
 /*
  * Return the input source name.
diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h
index 7ac2b89eed..a6e6f0aa60 100644
--- a/lib/isc/include/isc/util.h
+++ b/lib/isc/include/isc/util.h
@@ -65,27 +65,34 @@
 #include <isc/result.h>		/* Contractual promise. */
 
 #define LOCK(lp) do { \
-	ISC_UTIL_TRACE(fprintf(stderr, "LOCKING %p %s %d\n", (lp), __FILE__, __LINE__)); \
+	ISC_UTIL_TRACE(fprintf(stderr, "LOCKING %p %s %d\n", \
+			       (lp), __FILE__, __LINE__)); \
 	RUNTIME_CHECK(isc_mutex_lock((lp)) == ISC_R_SUCCESS); \
-	ISC_UTIL_TRACE(fprintf(stderr, "LOCKED %p %s %d\n", (lp), __FILE__, __LINE__)); \
+	ISC_UTIL_TRACE(fprintf(stderr, "LOCKED %p %s %d\n", (lp), \
+			       __FILE__, __LINE__)); \
 	} while (0)
 #define UNLOCK(lp) do { \
 	RUNTIME_CHECK(isc_mutex_unlock((lp)) == ISC_R_SUCCESS); \
-	ISC_UTIL_TRACE(fprintf(stderr, "UNLOCKED %p %s %d\n", (lp), __FILE__, __LINE__)); \
+	ISC_UTIL_TRACE(fprintf(stderr, "UNLOCKED %p %s %d\n", \
+			       (lp), __FILE__, __LINE__)); \
 	} while (0)
 
 #define BROADCAST(cvp) do { \
-	ISC_UTIL_TRACE(fprintf(stderr, "BROADCAST %p %s %d\n", (cvp), __FILE__, __LINE__)); \
+	ISC_UTIL_TRACE(fprintf(stderr, "BROADCAST %p %s %d\n", \
+			       (cvp), __FILE__, __LINE__)); \
 	RUNTIME_CHECK(isc_condition_broadcast((cvp)) == ISC_R_SUCCESS); \
 	} while (0)
 #define SIGNAL(cvp) do { \
-	ISC_UTIL_TRACE(fprintf(stderr, "SIGNAL %p %s %d\n", (cvp), __FILE__, __LINE__)); \
+	ISC_UTIL_TRACE(fprintf(stderr, "SIGNAL %p %s %d\n", \
+			       (cvp), __FILE__, __LINE__)); \
 	RUNTIME_CHECK(isc_condition_signal((cvp)) == ISC_R_SUCCESS); \
 	} while (0)
 #define WAIT(cvp, lp) do { \
-	ISC_UTIL_TRACE(fprintf(stderr, "WAIT %p LOCK %p %s %d\n", (cvp), (lp), __FILE__, __LINE__)); \
+	ISC_UTIL_TRACE(fprintf(stderr, "WAIT %p LOCK %p %s %d\n", \
+			       (cvp), (lp), __FILE__, __LINE__)); \
 	RUNTIME_CHECK(isc_condition_wait((cvp), (lp)) == ISC_R_SUCCESS); \
-	ISC_UTIL_TRACE(fprintf(stderr, "WAITED %p LOCKED %p %s %d\n", (cvp), (lp), __FILE__, __LINE__)); \
+	ISC_UTIL_TRACE(fprintf(stderr, "WAITED %p LOCKED %p %s %d\n", \
+			       (cvp), (lp), __FILE__, __LINE__)); \
 	} while (0)
 
 /*
@@ -99,12 +106,15 @@
 	isc_condition_waituntil((cvp), (lp), (tp))
 
 #define RWLOCK(lp, t) do { \
-	ISC_UTIL_TRACE(fprintf(stderr, "RWLOCK %p, %d %s %d\n", (lp), (t), __FILE__, __LINE__)); \
+	ISC_UTIL_TRACE(fprintf(stderr, "RWLOCK %p, %d %s %d\n", \
+			       (lp), (t), __FILE__, __LINE__)); \
 	RUNTIME_CHECK(isc_rwlock_lock((lp), (t)) == ISC_R_SUCCESS); \
-	ISC_UTIL_TRACE(fprintf(stderr, "RWLOCKED %p, %d %s %d\n", (lp), (t), __FILE__, __LINE__)); \
+	ISC_UTIL_TRACE(fprintf(stderr, "RWLOCKED %p, %d %s %d\n", \
+			       (lp), (t), __FILE__, __LINE__)); \
 	} while (0)
 #define RWUNLOCK(lp, t) do { \
-	ISC_UTIL_TRACE(fprintf(stderr, "RWUNLOCK %p, %d %s %d\n", (lp), (t), __FILE__, __LINE__)); \
+	ISC_UTIL_TRACE(fprintf(stderr, "RWUNLOCK %p, %d %s %d\n", \
+			       (lp), (t), __FILE__, __LINE__)); \
 	RUNTIME_CHECK(isc_rwlock_unlock((lp), (t)) == ISC_R_SUCCESS); \
 	} while (0)
 
diff --git a/lib/isc/inet_ntop.c b/lib/isc/inet_ntop.c
index fefdffc6eb..a00f6562dc 100644
--- a/lib/isc/inet_ntop.c
+++ b/lib/isc/inet_ntop.c
@@ -16,7 +16,8 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id: inet_ntop.c,v 1.5 1999/07/16 00:43:45 halley Exp $";
+static char rcsid[] =
+	"$Id: inet_ntop.c,v 1.6 2000/05/24 05:09:38 tale Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <config.h>
diff --git a/lib/isc/inet_pton.c b/lib/isc/inet_pton.c
index 5c849cf901..bdbc2a392e 100644
--- a/lib/isc/inet_pton.c
+++ b/lib/isc/inet_pton.c
@@ -16,7 +16,8 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id: inet_pton.c,v 1.4 1999/07/16 00:43:45 halley Exp $";
+static char rcsid[] =
+	"$Id: inet_pton.c,v 1.5 2000/05/24 05:09:39 tale Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <config.h>
diff --git a/lib/isc/lex.c b/lib/isc/lex.c
index 40d9d8ac1e..788aa38239 100644
--- a/lib/isc/lex.c
+++ b/lib/isc/lex.c
@@ -700,7 +700,7 @@ isc_lex_getsourcename(isc_lex_t *lex) {
 	return (source->name);
 }
 
-int
+unsigned long
 isc_lex_getsourceline(isc_lex_t *lex) {
 	inputsource *source;
 
diff --git a/lib/isc/netaddr.c b/lib/isc/netaddr.c
index 51f01167fd..7b3e1f6cdf 100644
--- a/lib/isc/netaddr.c
+++ b/lib/isc/netaddr.c
@@ -36,7 +36,8 @@ isc_netaddr_equal(const isc_netaddr_t *a, const isc_netaddr_t *b) {
 			return (ISC_FALSE);
 		break;
 	case AF_INET6:
-		if (memcmp(&a->type.in6, &b->type.in6, sizeof a->type.in6) != 0)
+		if (memcmp(&a->type.in6, &b->type.in6, sizeof a->type.in6)
+		    != 0)
 			return (ISC_FALSE);
 		break;
 	default:
diff --git a/lib/isc/ratelimiter.c b/lib/isc/ratelimiter.c
index dd3d50d99a..b65140c06f 100644
--- a/lib/isc/ratelimiter.c
+++ b/lib/isc/ratelimiter.c
@@ -182,7 +182,8 @@ ratelimiter_tick(isc_task_t *task, isc_event_t *event) {
 			 * No work left to do.  Stop the timer so that we don't
 			 * waste resources by having it fire periodically.
 			 */
-			result = isc_timer_reset(rl->timer, isc_timertype_inactive,
+			result = isc_timer_reset(rl->timer,
+						 isc_timertype_inactive,
 						 NULL, NULL, ISC_FALSE);
 			RUNTIME_CHECK(result == ISC_R_SUCCESS);
 			rl->state = isc_ratelimiter_worklimited;
diff --git a/lib/isc/symtab.c b/lib/isc/symtab.c
index 00b0eafbc2..ca3f94479f 100644
--- a/lib/isc/symtab.c
+++ b/lib/isc/symtab.c
@@ -99,10 +99,10 @@ isc_symtab_destroy(isc_symtab_t **symtabp) {
 		for (elt = HEAD(symtab->table[i]); elt != NULL; elt = nelt) {
 			nelt = NEXT(elt, link);
 			if (symtab->undefine_action != NULL)
-				(symtab->undefine_action)(elt->key,
-							  elt->type,
-							  elt->value,
-							  symtab->undefine_arg);
+			       (symtab->undefine_action)(elt->key,
+							 elt->type,
+							 elt->value,
+							 symtab->undefine_arg);
 			isc_mem_put(symtab->mctx, elt, sizeof *elt);
 		}
 	}
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index ed2c563bc2..1ae1d41639 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -392,7 +392,9 @@ process_cmsg(isc_socket_t *sock, struct msghdr *msg, isc_socketevent_t *dev) {
 			       sizeof(struct in6_pktinfo));
 			dev->attributes |= ISC_SOCKEVENTATTR_PKTINFO;
 			isc_sockaddr_fromin6(&sa, &dev->pktinfo.ipi6_addr, 53);
-			socket_log(sock, &sa, TRACE, "interface received on ifindex %u", dev->pktinfo.ipi6_ifindex);
+			socket_log(sock, &sa, TRACE,
+				   "interface received on ifindex %u",
+				   dev->pktinfo.ipi6_ifindex);
 			goto next;
 		}
 #endif
@@ -513,7 +515,9 @@ build_msghdr_send(isc_socket_t *sock, isc_socketevent_t *dev,
 		isc_sockaddr_t sa;
 
 		isc_sockaddr_fromin6(&sa, &dev->pktinfo.ipi6_addr, 53);
-		socket_log(sock, &sa, TRACE, "sendto pktinfo data, ifindex %u", dev->pktinfo.ipi6_ifindex);
+		socket_log(sock, &sa, TRACE,
+			   "sendto pktinfo data, ifindex %u",
+			   dev->pktinfo.ipi6_ifindex);
 
 		msg->msg_controllen = CMSG_SPACE(sizeof(struct in6_pktinfo));
 		msg->msg_control = (void *)sock->cmsg;
diff --git a/lib/lwres/gethost.c b/lib/lwres/gethost.c
index 44d09fa49f..ae1bc6fcc7 100644
--- a/lib/lwres/gethost.c
+++ b/lib/lwres/gethost.c
@@ -92,7 +92,8 @@ lwres_endhostent(void) {
 
 struct hostent *
 lwres_gethostbyname_r(const char *name, struct hostent *resbuf,
-		char *buf, int buflen, int *error) {
+		char *buf, int buflen, int *error)
+{
 	struct hostent *he;
 	int res;
 
@@ -110,8 +111,10 @@ lwres_gethostbyname_r(const char *name, struct hostent *resbuf,
 }
 
 struct hostent  *
-lwres_gethostbyaddr_r(const char *addr, int len, int type, struct hostent *resbuf,
-		char *buf, int buflen, int *error) {
+lwres_gethostbyaddr_r(const char *addr, int len, int type,
+		      struct hostent *resbuf, char *buf, int buflen,
+		      int *error)
+{
 	struct hostent *he;
 	int res;
 
diff --git a/lib/lwres/getipnode.c b/lib/lwres/getipnode.c
index 3df0797edc..da3cd4366a 100644
--- a/lib/lwres/getipnode.c
+++ b/lib/lwres/getipnode.c
@@ -405,7 +405,7 @@ scan_interfaces(int *have_v4, int *have_v6) {
 		cpsize = sizeof ifreq;
 		if (ifreq.ifr_addr.sa_len > sizeof (struct sockaddr))
 			cpsize += (int)ifreq.ifr_addr.sa_len -
-				(int)(sizeof (struct sockaddr));
+				(int)(sizeof(struct sockaddr));
 #else
 		cpsize = sizeof ifreq.ifr_name + ifreq.ifr_addr.sa_len;
 #endif /* HAVE_MINIMUM_IFREQ */
@@ -422,7 +422,8 @@ scan_interfaces(int *have_v4, int *have_v6) {
 			if (*have_v4 == 0) {
 				memcpy(&in4,
 				       &((struct sockaddr_in *)
-				       &ifreq.ifr_addr)->sin_addr, sizeof in4);
+				       &ifreq.ifr_addr)->sin_addr,
+				       sizeof(in4));
 				if (in4.s_addr == INADDR_ANY)
 					break;
 				n = ioctl(s, SIOCGIFFLAGS, (char *)&ifreq);
@@ -437,9 +438,10 @@ scan_interfaces(int *have_v4, int *have_v6) {
 			if (*have_v6 == 0) {
 				memcpy(&in6,
 				       &((struct sockaddr_in6 *)
-				       &ifreq.ifr_addr)->sin6_addr, sizeof in6);
+				       &ifreq.ifr_addr)->sin6_addr,
+				       sizeof(in6));
 				if (memcmp(&in6, &lwres_in6addr_any,
-					   sizeof in6) == 0)
+					   sizeof(in6)) == 0)
 					break;
 				n = ioctl(s, SIOCGIFFLAGS, (char *)&ifreq);
 				if (n < 0)
@@ -465,7 +467,8 @@ scan_interfaces(int *have_v4, int *have_v6) {
 }
 
 static struct hostent *
-copyandmerge(struct hostent *he1, struct hostent *he2, int af, int *error_num) {
+copyandmerge(struct hostent *he1, struct hostent *he2, int af, int *error_num)
+{
 	struct hostent *he = NULL;
 	int addresses = 1;	/* NULL terminator */
 	int names = 1;		/* NULL terminator */
diff --git a/lib/lwres/herror.c b/lib/lwres/herror.c
index f31d61b8bb..48b195bba4 100644
--- a/lib/lwres/herror.c
+++ b/lib/lwres/herror.c
@@ -50,7 +50,8 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)herror.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: herror.c,v 1.3 2000/04/28 02:08:14 tale Exp $";
+static const char rcsid[] =
+	"$Id: herror.c,v 1.4 2000/05/24 05:09:52 tale Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <config.h>
diff --git a/lib/lwres/include/lwres/list.h b/lib/lwres/include/lwres/list.h
index e222a6e8db..718c842629 100644
--- a/lib/lwres/include/lwres/list.h
+++ b/lib/lwres/include/lwres/list.h
@@ -28,7 +28,8 @@
 		(elt)->link.prev = (void *)(-1); \
 		(elt)->link.next = (void *)(-1); \
 	} while (0)
-#define LWRES_LINK_LINKED(elt, link) ((void *)((elt)->link.prev) != (void *)(-1))
+#define LWRES_LINK_LINKED(elt, link) \
+	((void *)((elt)->link.prev) != (void *)(-1))
 
 #define LWRES_LIST_HEAD(list) ((list).head)
 #define LWRES_LIST_TAIL(list) ((list).tail)
diff --git a/lib/lwres/include/lwres/lwbuffer.h b/lib/lwres/include/lwres/lwbuffer.h
index 35041bf998..f10c82011e 100644
--- a/lib/lwres/include/lwres/lwbuffer.h
+++ b/lib/lwres/include/lwres/lwbuffer.h
@@ -45,9 +45,9 @@
  *
  * The 'active region' is an (optional) subregion of the remaining region.
  * It extends from the current offset to an offset in the remaining region
- * that is selected with lwres_buffer_setactive().  Initially, the active region
- * is empty.  If the current offset advances beyond the chosen offset, the
- * active region will also be empty.
+ * that is selected with lwres_buffer_setactive().  Initially, the active
+ * region is empty.  If the current offset advances beyond the chosen offset,
+ * the active region will also be empty.
  *
  *  /----- used region -----\/-- available --\
  *  +----------------------------------------+
diff --git a/lib/lwres/include/lwres/lwres.h b/lib/lwres/include/lwres/lwres.h
index f2dc91b159..8ae8fec122 100644
--- a/lib/lwres/include/lwres/lwres.h
+++ b/lib/lwres/include/lwres/lwres.h
@@ -215,9 +215,9 @@ typedef struct {
 	} sortlist[LWRES_CONFMAXSORTLIST];
 	lwres_uint8_t	sortlistnxt;
 
-	lwres_uint8_t	resdebug;	/* non-zero if 'options debug' set */
-	lwres_uint8_t	ndots;		/* set to n in 'options ndots:n' */
-	lwres_uint8_t	no_tld_query;	/* non-zero if 'options no_tld_query' */
+	lwres_uint8_t	resdebug;      /* non-zero if 'options debug' set */
+	lwres_uint8_t	ndots;	       /* set to n in 'options ndots:n' */
+	lwres_uint8_t	no_tld_query;  /* non-zero if 'options no_tld_query' */
 } lwres_conf_t;
 	
 #define LWRES_ADDRTYPE_V4		0x00000001U	/* ipv4 */
diff --git a/lib/lwres/lwinetntop.c b/lib/lwres/lwinetntop.c
index dcf513f20c..61a0ddb6c6 100644
--- a/lib/lwres/lwinetntop.c
+++ b/lib/lwres/lwinetntop.c
@@ -16,7 +16,8 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id: lwinetntop.c,v 1.1 2000/02/04 06:02:51 halley Exp $";
+static char rcsid[] =
+	"$Id: lwinetntop.c,v 1.2 2000/05/24 05:09:53 tale Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <config.h>
@@ -52,8 +53,7 @@ static const char *inet_ntop6(const unsigned char *src, char *dst,
  *	Paul Vixie, 1996.
  */
 const char *
-lwres_net_ntop(int af, const void *src, char *dst, size_t size)
-{
+lwres_net_ntop(int af, const void *src, char *dst, size_t size) {
 	switch (af) {
 	case AF_INET:
 		return (inet_ntop4(src, dst, size));
@@ -80,8 +80,7 @@ lwres_net_ntop(int af, const void *src, char *dst, size_t size)
  *	Paul Vixie, 1996.
  */
 static const char *
-inet_ntop4(const unsigned char *src, char *dst, size_t size)
-{
+inet_ntop4(const unsigned char *src, char *dst, size_t size) {
 	static const char *fmt = "%u.%u.%u.%u";
 	char tmp[sizeof "255.255.255.255"];
 
@@ -102,8 +101,7 @@ inet_ntop4(const unsigned char *src, char *dst, size_t size)
  */
 #ifdef AF_INET6
 static const char *
-inet_ntop6(const unsigned char *src, char *dst, size_t size)
-{
+inet_ntop6(const unsigned char *src, char *dst, size_t size) {
 	/*
 	 * Note that int32_t and int16_t need only be "at least" large enough
 	 * to contain a value of the specified size.  On some systems, like
diff --git a/lib/lwres/lwpacket.c b/lib/lwres/lwpacket.c
index f499a5282f..3193a68e70 100644
--- a/lib/lwres/lwpacket.c
+++ b/lib/lwres/lwpacket.c
@@ -27,11 +27,11 @@
 
 #include "assert_p.h"
 
-#define LWPACKET_LENGTH (sizeof(lwres_uint16_t) * 4 + sizeof(lwres_uint32_t) * 5)
+#define LWPACKET_LENGTH \
+	(sizeof(lwres_uint16_t) * 4 + sizeof(lwres_uint32_t) * 5)
 
 lwres_result_t
-lwres_lwpacket_renderheader(lwres_buffer_t *b, lwres_lwpacket_t *pkt)
-{
+lwres_lwpacket_renderheader(lwres_buffer_t *b, lwres_lwpacket_t *pkt) {
 	REQUIRE(b != NULL);
 	REQUIRE(pkt != NULL);
 
@@ -52,8 +52,7 @@ lwres_lwpacket_renderheader(lwres_buffer_t *b, lwres_lwpacket_t *pkt)
 }
 
 lwres_result_t
-lwres_lwpacket_parseheader(lwres_buffer_t *b, lwres_lwpacket_t *pkt)
-{
+lwres_lwpacket_parseheader(lwres_buffer_t *b, lwres_lwpacket_t *pkt) {
 	lwres_uint32_t space;
 
 	REQUIRE(b != NULL);
diff --git a/lib/lwres/lwres_gabn.c b/lib/lwres/lwres_gabn.c
index 3b6ffd6c0d..5579b7f8b5 100644
--- a/lib/lwres/lwres_gabn.c
+++ b/lib/lwres/lwres_gabn.c
@@ -467,7 +467,8 @@ lwres_gabnresponse_free(lwres_context_t *ctx, lwres_gabnresponse_t **structp)
 
 	if (gabn->naliases > 0) {
 		CTXFREE(gabn->aliases, sizeof(char *) * gabn->naliases);
-		CTXFREE(gabn->aliaslen, sizeof(lwres_uint16_t) * gabn->naliases);
+		CTXFREE(gabn->aliaslen,
+			sizeof(lwres_uint16_t) * gabn->naliases);
 	}
 	addr = LWRES_LIST_HEAD(gabn->addrs);
 	while (addr != NULL) {
diff --git a/lib/omapi/message.c b/lib/omapi/message.c
index 78b0a7b519..115c92ef37 100644
--- a/lib/omapi/message.c
+++ b/lib/omapi/message.c
@@ -376,9 +376,10 @@ message_process(omapi_object_t *mo, omapi_object_t *po) {
 	if (protocol->key != NULL) {
 		if (protocol->verify_result == ISC_R_SUCCESS)
 			protocol->verify_result =
-				dst_key_verify(DST_SIGMODE_FINAL, protocol->key,
-					   &protocol->dstctx, NULL,
-					   &protocol->signature_in);
+				dst_key_verify(DST_SIGMODE_FINAL,
+					       protocol->key,
+					       &protocol->dstctx, NULL,
+					       &protocol->signature_in);
 
 		if (protocol->verify_result != ISC_R_SUCCESS) {
 			if (connection->is_client) {