From: Mark Andrews <marka@isc.org>
Date: Thu, 15 Feb 2018 03:21:42 +0000 (+1100)
Subject: use %u instead of %d
X-Git-Tag: v9.10.8rc1~91^2~18
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=cb2c567e6d98c9ed204ca78724c881fc8563e602;p=thirdparty%2Fbind9.git

use %u instead of %d
---

diff --git a/lib/samples/resolve.c b/lib/samples/resolve.c
index bbf5f149298..18c7344045d 100644
--- a/lib/samples/resolve.c
+++ b/lib/samples/resolve.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2012-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2012-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -222,7 +222,7 @@ addserver(dns_client_t *client, const char *addrstr, const char *port,
 		name = dns_fixedname_name(&fname);
 		result = dns_name_fromtext(name, &b, dns_rootname, 0, NULL);
 		if (result != ISC_R_SUCCESS) {
-			fprintf(stderr, "failed to convert qname: %d\n",
+			fprintf(stderr, "failed to convert qname: %u\n",
 				result);
 			exit(1);
 		}
@@ -231,7 +231,7 @@ addserver(dns_client_t *client, const char *addrstr, const char *port,
 	result = dns_client_setservers(client, dns_rdataclass_in, name,
 				       &servers);
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "set server failed: %d\n", result);
+		fprintf(stderr, "set server failed: %u\n", result);
 		exit(1);
 	}
 }
@@ -371,7 +371,7 @@ main(int argc, char *argv[]) {
 	isc_lib_register();
 	result = dns_lib_init();
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "dns_lib_init failed: %d\n", result);
+		fprintf(stderr, "dns_lib_init failed: %u\n", result);
 		exit(1);
 	}
 
@@ -401,7 +401,7 @@ main(int argc, char *argv[]) {
 	result = dns_client_createx2(mctx, actx, taskmgr, socketmgr, timermgr,
 				    clientopt, &client, addr4, addr6);
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "dns_client_create failed: %d, %s\n", result,
+		fprintf(stderr, "dns_client_create failed: %u, %s\n", result,
 			isc_result_totext(result));
 		exit(1);
 	}
@@ -413,7 +413,7 @@ main(int argc, char *argv[]) {
 
 		result = irs_resconf_load(mctx, "/etc/resolv.conf", &resconf);
 		if (result != ISC_R_SUCCESS && result != ISC_R_FILENOTFOUND) {
-			fprintf(stderr, "irs_resconf_load failed: %d\n",
+			fprintf(stderr, "irs_resconf_load failed: %u\n",
 				result);
 			exit(1);
 		}
@@ -422,7 +422,7 @@ main(int argc, char *argv[]) {
 					       NULL, nameservers);
 		if (result != ISC_R_SUCCESS) {
 			irs_resconf_destroy(&resconf);
-			fprintf(stderr, "dns_client_setservers failed: %d\n",
+			fprintf(stderr, "dns_client_setservers failed: %u\n",
 				result);
 			exit(1);
 		}
@@ -454,7 +454,7 @@ main(int argc, char *argv[]) {
 	qname = dns_fixedname_name(&qname0);
 	result = dns_name_fromtext(qname, &b, dns_rootname, 0, NULL);
 	if (result != ISC_R_SUCCESS)
-		fprintf(stderr, "failed to convert qname: %d\n", result);
+		fprintf(stderr, "failed to convert qname: %u\n", result);
 
 	/* Perform resolution */
 	resopt = DNS_CLIENTRESOPT_ALLOWRUN;
diff --git a/util/copyrights b/util/copyrights
index b6da042d530..bd11fbe110d 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -4146,7 +4146,7 @@
 ./lib/samples/Makefile-postinstall.in		MAKE	2009,2012,2013,2014
 ./lib/samples/Makefile.in			MAKE	2009,2012,2013,2014,2015,2016,2017
 ./lib/samples/nsprobe.c				C	2009,2010,2011,2012,2013,2014,2015,2018
-./lib/samples/resolve.c				C	2009,2012,2013,2014,2015,2016,2017
+./lib/samples/resolve.c				C	2009,2012,2013,2014,2015,2016,2017,2018
 ./lib/samples/rootkey.sh			SH	2013
 ./lib/samples/sample-async.c			C	2009,2013,2014,2015
 ./lib/samples/sample-gai.c			C	2009,2012,2013,2014,2015