format string bugs and improved format string checking [RT #1578]

bin/dig/dighost.c

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.220 2001/08/06 05:50:20 marka Exp $ */
+/* $Id: dighost.c,v 1.221 2001/08/08 22:54:14 gson Exp $ */
 
 /*
  * Notice to programmers:  Do not use this code as an example of how to
@@ -1601,7 +1601,7 @@ send_tcp_connect(dig_query_t *query) {
 	dig_query_t *next;
 	dig_lookup_t *l;
 
-	debug("send_tcp_connect(%lx)", query);
+	debug("send_tcp_connect(%p)", query);
 
 	l = query->lookup;
 	query->waiting_connect = ISC_TRUE;
@@ -1670,7 +1670,7 @@ send_udp(dig_query_t *query) {
 	dig_query_t *next;
 	isc_result_t result;
 
-	debug("send_udp(%lx)", query);
+	debug("send_udp(%p)", query);
 
 	l = query->lookup;
 	bringup_timer(query, UDP_TIMEOUT);
@@ -2292,7 +2292,7 @@ recv_done(isc_task_t *task, isc_event_t *event) {
 		if (l->current_query == query)
 			l->current_query = NULL;
 		if (next != NULL) {
-			debug("sending query %lx\n", next);
+			debug("sending query %p\n", next);
 			if (l->tcp_mode)
 				send_tcp_connect(next);
 			else

bin/dig/include/dig/dig.h

@@ -15,16 +15,19 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.h,v 1.70 2001/07/28 01:01:02 bwelling Exp $ */
+/* $Id: dig.h,v 1.71 2001/08/08 22:54:15 gson Exp $ */
 
 #ifndef DIG_H
 #define DIG_H
 
 #include <dns/rdatalist.h>
+
 #include <dst/dst.h>
+
 #include <isc/boolean.h>
 #include <isc/buffer.h>
 #include <isc/bufferlist.h>
+#include <isc/formatcheck.h>
 #include <isc/lang.h>
 #include <isc/list.h>
 #include <isc/mem.h>
@@ -191,10 +194,10 @@ isc_result_t
 get_reverse(char reverse[MXNAME], char *value, isc_boolean_t nibble);
 
 void
-fatal(const char *format, ...);
+fatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
 
 void
-debug(const char *format, ...);
+debug(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
 
 void
 check_result(isc_result_t result, const char *msg);

bin/dnssec/dnssectool.h

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssectool.h,v 1.14 2001/03/31 02:12:26 bwelling Exp $ */
+/* $Id: dnssectool.h,v 1.15 2001/08/08 22:54:16 gson Exp $ */
 
 #ifndef DNSSECTOOL_H
 #define DNSSECTOOL_H 1
@@ -37,7 +37,7 @@ void
 check_result(isc_result_t result, const char *message);
 
 void
-vbprintf(int level, const char *fmt, ...);
+vbprintf(int level, const char *fmt, ...) ISC_FORMAT_PRINTF(2, 3);
 
 void
 type_format(const dns_rdatatype_t type, char *cp, unsigned int size);

bin/named/client.c

@@ -15,10 +15,11 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.c,v 1.175 2001/07/26 20:42:38 bwelling Exp $ */
+/* $Id: client.c,v 1.176 2001/08/08 22:54:18 gson Exp $ */
 
 #include <config.h>
 
+#include <isc/formatcheck.h>
 #include <isc/mutex.h>
 #include <isc/once.h>
 #include <isc/print.h>
@@ -2247,6 +2248,11 @@ ns_client_name(ns_client_t *client, char *peerbuf, size_t len) {
 		snprintf(peerbuf, len, "@%p", client);
 }
 
+static void
+ns_client_logv(ns_client_t *client, isc_logcategory_t *category,
+	   isc_logmodule_t *module, int level, const char *fmt, va_list ap)
+     ISC_FORMAT_PRINTF(5, 0);
+
 static void
 ns_client_logv(ns_client_t *client, isc_logcategory_t *category,
 	   isc_logmodule_t *module, int level, const char *fmt, va_list ap)

bin/named/include/named/client.h

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.h,v 1.58 2001/06/15 23:28:29 gson Exp $ */
+/* $Id: client.h,v 1.59 2001/08/08 22:54:23 gson Exp $ */
 
 #ifndef NAMED_CLIENT_H
 #define NAMED_CLIENT_H 1
@@ -314,7 +314,7 @@ ns_client_checkacl(ns_client_t  *client,
 void
 ns_client_log(ns_client_t *client, isc_logcategory_t *category,
 	      isc_logmodule_t *module, int level,
-	      const char *fmt, ...);
+	      const char *fmt, ...) ISC_FORMAT_PRINTF(5, 6);
 
 void
 ns_client_aclmsg(const char *msg, dns_name_t *name, dns_rdataclass_t rdclass,

bin/named/include/named/lwdclient.h

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwdclient.h,v 1.12 2001/01/22 22:29:04 gson Exp $ */
+/* $Id: lwdclient.h,v 1.13 2001/08/08 22:54:24 gson Exp $ */
 
 #ifndef NAMED_LWDCLIENT_H
 #define NAMED_LWDCLIENT_H 1
@@ -224,6 +224,7 @@ void ns_lwdclient_processnoop(ns_lwdclient_t *, lwres_buffer_t *);
 
 void ns_lwdclient_errorpktsend(ns_lwdclient_t *, isc_uint32_t);
 
-void ns_lwdclient_log(int level, const char *format, ...);
+void ns_lwdclient_log(int level, const char *format, ...)
+     ISC_FORMAT_PRINTF(2, 3);
 
 #endif /* NAMED_LWDCLIENT_H */

bin/named/include/named/main.h

@@ -15,12 +15,12 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: main.h,v 1.7 2001/01/09 21:40:23 bwelling Exp $ */
+/* $Id: main.h,v 1.8 2001/08/08 22:54:26 gson Exp $ */
 
 #ifndef NAMED_MAIN_H
 #define NAMED_MAIN_H 1
 
 void
-ns_main_earlyfatal(const char *format, ...);
+ns_main_earlyfatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
 
 #endif /* NAMED_MAIN_H */

bin/named/lwdgnba.c

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwdgnba.c,v 1.12 2001/01/22 22:29:01 gson Exp $ */
+/* $Id: lwdgnba.c,v 1.13 2001/08/08 22:54:19 gson Exp $ */
 
 #include <config.h>
 
@@ -98,7 +98,7 @@ byaddr_done(isc_task_t *task, isc_event_t *event) {
 		if (result != ISC_R_SUCCESS)
 			goto out;
 		ns_lwdclient_log(50, "found name '%.*s'",
-				 client->recv_buffer.used - b.used,
+				 (int)(client->recv_buffer.used - b.used),
 				 (char *)(b.base) + b.used);
 		if (gnba->realname == NULL) {
 			gnba->realname = (char *)(b.base) + b.used;

bin/named/main.c

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: main.c,v 1.118 2001/08/08 20:36:13 gson Exp $ */
+/* $Id: main.c,v 1.119 2001/08/08 22:54:20 gson Exp $ */
 
 #include <config.h>
 
@@ -124,6 +124,10 @@ assertion_failed(const char *file, int line, isc_assertiontype_t type,
 	exit(1);
 }
 
+static void
+library_fatal_error(const char *file, int line, const char *format,
+		    va_list args) ISC_FORMAT_PRINTF(3, 0);
+
 static void
 library_fatal_error(const char *file, int line, const char *format,
 		    va_list args)
@@ -160,6 +164,10 @@ library_fatal_error(const char *file, int line, const char *format,
 	exit(1);
 }
 
+static void
+library_unexpected_error(const char *file, int line, const char *format,
+			 va_list args) ISC_FORMAT_PRINTF(3, 0);
+
 static void
 library_unexpected_error(const char *file, int line, const char *format,
 			 va_list args)

bin/named/xfrout.c

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrout.c,v 1.100 2001/06/18 19:04:32 gson Exp $ */
+/* $Id: xfrout.c,v 1.101 2001/08/08 22:54:22 gson Exp $ */
 
 #include <config.h>
 
@@ -1619,6 +1619,12 @@ xfrout_client_shutdown(void *arg, isc_result_t result) {
  * Log outgoing zone transfer messages in a format like
  * <client>: transfer of <zone>: <message>
  */
+
+static void
+xfrout_logv(ns_client_t *client, dns_name_t *zonename,
+	    dns_rdataclass_t rdclass, int level, const char *fmt, va_list ap)
+     ISC_FORMAT_PRINTF(5, 0);
+
 static void
 xfrout_logv(ns_client_t *client, dns_name_t *zonename,
 	    dns_rdataclass_t rdclass, int level, const char *fmt, va_list ap)
@@ -1640,8 +1646,7 @@ xfrout_logv(ns_client_t *client, dns_name_t *zonename,
  */
 static void
 xfrout_log1(ns_client_t *client, dns_name_t *zonename,
-	    dns_rdataclass_t rdclass, int level, const char *fmt, ...)
-{
+	    dns_rdataclass_t rdclass, int level, const char *fmt, ...) {
 	va_list ap;
 	va_start(ap, fmt);
 	xfrout_logv(client, zonename, rdclass, level, fmt, ap);

bin/nsupdate/nsupdate.c

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsupdate.c,v 1.102 2001/07/26 03:15:10 mayer Exp $ */
+/* $Id: nsupdate.c,v 1.103 2001/08/08 22:54:27 gson Exp $ */
 
 #include <config.h>
 
@@ -141,6 +141,14 @@ typedef struct nsu_requestinfo {
 static void
 sendrequest(isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr,
 	    dns_message_t *msg, dns_request_t **request);
+static void
+fatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
+
+static void
+debug(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
+
+static void
+ddebug(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
 
 #define STATUS_MORE	(isc_uint16_t)0
 #define STATUS_SEND	(isc_uint16_t)1
@@ -1557,7 +1565,7 @@ recvsoa(isc_task_t *task, isc_event_t *event) {
 			fatal("could not talk to specified name server");
 		else if (++ns_inuse >= lwconf->nsnext)
 			fatal("could not talk to any default name server");
-		ddebug("Destroying request [%lx]", request);
+		ddebug("Destroying request [%p]", request);
 		dns_request_destroy(&request);
 		dns_message_renderreset(soaquery);
 		sendrequest(localaddr, &servers[ns_inuse], soaquery, &request);

bin/tests/adb_test.c

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb_test.c,v 1.61 2001/01/09 21:40:48 bwelling Exp $ */
+/* $Id: adb_test.c,v 1.62 2001/08/08 22:54:28 gson Exp $ */
 
 #include <config.h>
 
@@ -62,6 +62,10 @@ isc_mutex_t client_lock;
 isc_stdtime_t now;
 dns_adb_t *adb;
 
+static void
+check_result(isc_result_t result, const char *format, ...)
+     ISC_FORMAT_PRINTF(2, 3);
+
 static void
 check_result(isc_result_t result, const char *format, ...) {
 	va_list args;

bin/tests/db/t_db.c

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_db.c,v 1.28 2001/05/15 05:32:53 halley Exp $ */
+/* $Id: t_db.c,v 1.29 2001/08/08 22:54:30 gson Exp $ */
 
 #include <config.h>
 
@@ -563,8 +563,6 @@ t_dns_db_class(char **av) {
 	dns_rdataclass_t	rdataclass;
 	dns_rdataclass_t	db_rdataclass;
 	isc_textregion_t	textregion;
-	isc_buffer_t		isc_buffer;
-	char			buf[CLASSBUFLEN];
 
 	filename = T_ARG(0);
 	class = T_ARG(1);
@@ -612,10 +610,11 @@ t_dns_db_class(char **av) {
 	if (db_rdataclass == rdataclass)
 		result = T_PASS;
 	else {
-		isc_buffer_init(&isc_buffer, buf, CLASSBUFLEN);
-		dns_rdataclass_totext(db_rdataclass, &isc_buffer);
-		t_info("dns_db_class returned %.*s, expected %s\n",
-			isc_buffer.used, isc_buffer.base, class);
+		char classbuf[DNS_RDATACLASS_FORMATSIZE];
+		dns_rdataclass_format(db_rdataclass,
+				      classbuf, sizeof(classbuf));
+		t_info("dns_db_class returned %s, expected %s\n",
+		       classbuf, class);
 		result = T_FAIL;
 	}
 
@@ -1894,7 +1893,7 @@ t_dns_db_closeversion_2(char **av) {
 	    (dns_result == DNS_R_NXDOMAIN) ||
 	    (dns_result == DNS_R_NXRRSET)) {
 
-		t_info("dns_db_find %s returned %d\n", existing_name,
+		t_info("dns_db_find %s returned %s\n", existing_name,
 		       dns_result_totext(dns_result));
 		dns_rdataset_disassociate(&found_rdataset);
 		dns_db_detachnode(db, &nodep);

bin/tests/dst/t_dst.c

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_dst.c,v 1.46 2001/07/26 22:09:25 bwelling Exp $ */
+/* $Id: t_dst.c,v 1.47 2001/08/08 22:54:31 gson Exp $ */
 
 #include <config.h>
 
@@ -64,7 +64,7 @@ cleandir(char *path) {
 
 	dirp = opendir(path);
 	if (dirp == NULL) {
-		t_info("opendir(%s) failed %d\n", path, opendir);
+		t_info("opendir(%s) failed %d\n", path, errno);
 		return;
 	}
 
@@ -364,7 +364,7 @@ t1(void) {
 	mctx = NULL;
 	isc_result = isc_mem_create(0, 0, &mctx);
 	if (isc_result != ISC_R_SUCCESS) {
-		t_info("isc_mem_create failed %d\n",
+		t_info("isc_mem_create failed %s\n",
 		       isc_result_totext(isc_result));
 		t_result(T_UNRESOLVED);
 		return;
@@ -372,21 +372,21 @@ t1(void) {
 	ectx = NULL;
 	isc_result = isc_entropy_create(mctx, &ectx);
 	if (isc_result != ISC_R_SUCCESS) {
-		t_info("isc_entropy_create failed %d\n",
+		t_info("isc_entropy_create failed %s\n",
 		       isc_result_totext(isc_result));
 		t_result(T_UNRESOLVED);
 		return;
 	}
 	result = isc_entropy_createfilesource(ectx, "randomfile");
 	if (isc_result != ISC_R_SUCCESS) {
-		t_info("isc_entropy_create failed %d\n",
+		t_info("isc_entropy_create failed %s\n",
 		       isc_result_totext(isc_result));
 		t_result(T_UNRESOLVED);
 		return;
 	}
 	isc_result = dst_lib_init(mctx, ectx, ISC_ENTROPY_BLOCKING);
 	if (isc_result != ISC_R_SUCCESS) {
-		t_info("dst_lib_init failed %d\n",
+		t_info("dst_lib_init failed %s\n",
 		       isc_result_totext(isc_result));
 		t_result(T_UNRESOLVED);
 		return;
@@ -846,26 +846,26 @@ t2_vfy(char **av) {
 	mctx = NULL;
 	isc_result = isc_mem_create(0, 0, &mctx);
 	if (isc_result != ISC_R_SUCCESS) {
-		t_info("isc_mem_create failed %d\n",
+		t_info("isc_mem_create failed %s\n",
 		       isc_result_totext(isc_result));
 		return(T_UNRESOLVED);
 	}
 	ectx = NULL;
 	isc_result = isc_entropy_create(mctx, &ectx);
 	if (isc_result != ISC_R_SUCCESS) {
-		t_info("isc_entropy_create failed %d\n",
+		t_info("isc_entropy_create failed %s\n",
 		       isc_result_totext(isc_result));
 		return(T_UNRESOLVED);
 	}
 	result = isc_entropy_createfilesource(ectx, "randomfile");
 	if (isc_result != ISC_R_SUCCESS) {
-		t_info("isc_entropy_create failed %d\n",
+		t_info("isc_entropy_create failed %s\n",
 		       isc_result_totext(isc_result));
 		return(T_UNRESOLVED);
 	}
 	isc_result = dst_lib_init(mctx, ectx, ISC_ENTROPY_BLOCKING);
 	if (isc_result != ISC_R_SUCCESS) {
-		t_info("dst_lib_init failed %d\n",
+		t_info("dst_lib_init failed %s\n",
 		       isc_result_totext(isc_result));
 		return(T_UNRESOLVED);
 	}

bin/tests/tasks/t_tasks.c

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_tasks.c,v 1.28 2001/04/25 01:23:13 gson Exp $ */
+/* $Id: t_tasks.c,v 1.29 2001/08/08 22:54:33 gson Exp $ */
 
 #include <config.h>
 
@@ -57,7 +57,7 @@ t1_callback(isc_task_t *task, isc_event_t *event) {
 	for (i = 0; i < 1000000; i++)
 		j += 100;
 
-	t_info("task %s\n", event->ev_arg);
+	t_info("task %s\n", (char *)event->ev_arg);
 	isc_event_free(&event);
 }
 
@@ -65,7 +65,7 @@ static void
 t1_shutdown(isc_task_t *task, isc_event_t *event) {
 	UNUSED(task);
 
-	t_info("shutdown %s\n", event->ev_arg);
+	t_info("shutdown %s\n", (char *)event->ev_arg);
 	isc_event_free(&event);
 }
 
@@ -73,7 +73,7 @@ static void
 my_tick(isc_task_t *task, isc_event_t *event) {
 	UNUSED(task);
 
-	t_info("%s\n", event->ev_arg);
+	t_info("%s\n", (char *)event->ev_arg);
 	isc_event_free(&event);
 }
 
@@ -1316,12 +1316,12 @@ t10_event2(isc_task_t *task, isc_event_t *event) {
 	tag_match = 0;
 
 	if (T_debug) {
-		t_info("Event %p,%d,%d,%s\n",
+		t_info("Event %p,%d,%p,%s\n",
 		       event->ev_sender,
 		       (int)event->ev_type,
 		       event->ev_tag,
 		       event->ev_attributes & ISC_EVENTATTR_NOPURGE ?
-		       		"NP" : "P");
+		       "NP" : "P");
 	}
 
 	if ((T10_purge_sender == 0) ||
@@ -1345,13 +1345,13 @@ t10_event2(isc_task_t *task, isc_event_t *event) {
 
 	if (sender_match && type_match && tag_match) {
 		if (event->ev_attributes & ISC_EVENTATTR_NOPURGE) {
-			t_info("event %p,%d,%d matched but was not purgable\n",
+			t_info("event %p,%d,%p matched but was not purgable\n",
 				event->ev_sender, (int)event->ev_type,
 			       event->ev_tag);
 			++T10_eventcnt;
 		} else {
-			t_info("*** event %p,%d,%d not purged\n",
-				event->ev_sender, (int)event->ev_type,
+			t_info("*** event %p,%d,%p not purged\n",
+			       event->ev_sender, (int)event->ev_type,
 			       event->ev_tag);
 		}
 	} else {

bin/tests/timers/t_timers.c

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_timers.c,v 1.21 2001/04/13 02:19:37 tale Exp $ */
+/* $Id: t_timers.c,v 1.22 2001/08/08 22:54:34 gson Exp $ */
 
 #include <config.h>
 
@@ -792,7 +792,7 @@ t5_tick_event(isc_task_t *task, isc_event_t *event) {
 					     isc_timertype_ticker, &expires,
 					     &interval, ISC_TRUE);
 		if (isc_result != ISC_R_SUCCESS) {
-			t_info("isc_timer_reset failed %d\n",
+			t_info("isc_timer_reset failed %s\n",
 			       isc_result_totext(isc_result));
 			++T5_nfails;
 		}

lib/dns/adb.c

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb.c,v 1.180 2001/06/11 04:26:41 gson Exp $ */
+/* $Id: adb.c,v 1.181 2001/08/08 22:54:36 gson Exp $ */
 
 /*
  * Implementation notes
@@ -461,6 +461,9 @@ static isc_result_t find_err_map[FIND_ERR_MAX] = {
 	ISC_R_NOTFOUND		/* not YET found */
 };
 
+static void
+DP(int level, const char *format, ...) ISC_FORMAT_PRINTF(2, 3);
+
 static void
 DP(int level, const char *format, ...) {
 	va_list args;

lib/dns/callbacks.c

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: callbacks.c,v 1.11 2001/01/09 21:50:41 bwelling Exp $ */
+/* $Id: callbacks.c,v 1.12 2001/08/08 22:54:37 gson Exp $ */
 
 #include <config.h>
 
@@ -25,7 +25,16 @@
 #include <dns/log.h>
 
 static void
-stdio_error_warn_callback(dns_rdatacallbacks_t *, const char *, ...);
+stdio_error_warn_callback(dns_rdatacallbacks_t *, const char *, ...)
+     ISC_FORMAT_PRINTF(2, 3);
+
+static void
+isclog_error_callback(dns_rdatacallbacks_t *callbacks, const char *fmt, ...)
+     ISC_FORMAT_PRINTF(2, 3);
+
+static void
+isclog_warn_callback(dns_rdatacallbacks_t *callbacks, const char *fmt, ...)
+     ISC_FORMAT_PRINTF(2, 3);
 
 /*
  * Private

lib/dns/dispatch.c

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dispatch.c,v 1.100 2001/05/14 23:10:19 gson Exp $ */
+/* $Id: dispatch.c,v 1.101 2001/08/08 22:54:38 gson Exp $ */
 
 #include <config.h>
 
@@ -180,6 +180,10 @@ static void qid_destroy(isc_mem_t *mctx, dns_qid_t **qidp);
 
 #define LVL(x) ISC_LOG_DEBUG(x)
 
+static void
+mgr_log(dns_dispatchmgr_t *mgr, int level, const char *fmt, ...)
+     ISC_FORMAT_PRINTF(3, 4);
+
 static void
 mgr_log(dns_dispatchmgr_t *mgr, int level, const char *fmt, ...) {
 	char msgbuf[2048];
@@ -197,6 +201,10 @@ mgr_log(dns_dispatchmgr_t *mgr, int level, const char *fmt, ...) {
 		      level, "dispatchmgr %p: %s", mgr, msgbuf);
 }
 
+static void
+dispatch_log(dns_dispatch_t *disp, int level, const char *fmt, ...)
+     ISC_FORMAT_PRINTF(3, 4);
+
 static void
 dispatch_log(dns_dispatch_t *disp, int level, const char *fmt, ...) {
 	char msgbuf[2048];
@@ -214,6 +222,11 @@ dispatch_log(dns_dispatch_t *disp, int level, const char *fmt, ...) {
 		      level, "dispatch %p: %s", disp, msgbuf);
 }
 
+static void
+request_log(dns_dispatch_t *disp, dns_dispentry_t *resp,
+	    int level, const char *fmt, ...)
+     ISC_FORMAT_PRINTF(4, 5);
+
 static void
 request_log(dns_dispatch_t *disp, dns_dispentry_t *resp,
 	    int level, const char *fmt, ...)

lib/dns/gen.c

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gen.c,v 1.64 2001/07/16 05:10:20 mayer Exp $ */
+/* $Id: gen.c,v 1.65 2001/08/08 22:54:39 gson Exp $ */
 
 #include <config.h>
 
@@ -84,7 +84,7 @@
 #define DIGESTTYPE "rdata->type"
 #define DIGESTDEF "use_default = ISC_TRUE"
 
-char copyright[] =
+const char copyright[] =
 "/*\n"
 " * Copyright (C) 1998%s Internet Software Consortium.\n"
 " *\n"