Attachment #199883 for bug #232774

View | Details | Raw Unified | Return to bug 232774
Collapse All | Expand All

Lines 3-9 Link Here

(-)dns/dnsperf/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= dnsperf	4	PORTNAME= dnsperf
5	PORTVERSION= 2.1.0.0	5	PORTVERSION= 2.1.0.0
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= dns benchmarks net	7	CATEGORIES= dns benchmarks net
8	MASTER_SITES= ftp://ftp.nominum.com/pub/nominum/${PORTNAME}/${PORTVERSION}/	8	MASTER_SITES= ftp://ftp.nominum.com/pub/nominum/${PORTNAME}/${PORTVERSION}/
9	DISTNAME= ${PORTNAME}-src-${PORTVERSION}-1	9	DISTNAME= ${PORTNAME}-src-${PORTVERSION}-1




--- datafile.c.orig	2015-12-16 00:46:49 UTC
+++ datafile.c
@@ -23,7 +23,9 @@
 
 #define ISC_BUFFER_USEINLINE
 
+#include <isc/boolean.h>
 #include <isc/buffer.h>
+#include <isc/int.h>
 #include <isc/mem.h>
 
 #include "datafile.h"




--- dns.c.orig	2015-12-16 00:46:50 UTC
+++ dns.c
@@ -41,9 +41,11 @@
 #define ISC_BUFFER_USEINLINE
 
 #include <isc/base64.h>
+#include <isc/boolean.h>
 #include <isc/buffer.h>
 #include <isc/hmacmd5.h>
 #include <isc/hmacsha.h>
+#include <isc/int.h>
 #include <isc/lex.h>
 #include <isc/mem.h>
 #include <isc/region.h>




--- dnsperf.c.orig	2015-12-16 00:46:49 UTC
+++ dnsperf.c
@@ -52,8 +52,10 @@
 
 #define ISC_BUFFER_USEINLINE
 
+#include <isc/boolean.h>
 #include <isc/buffer.h>
 #include <isc/file.h>
+#include <isc/int.h>
 #include <isc/list.h>
 #include <isc/mem.h>
 #include <isc/netaddr.h>
@@ -280,16 +282,16 @@ print_statistics(const config_t *config, const times_t
 
 	printf("Statistics:\n\n");
 
-	printf("  %s sent:         %" ISC_PRINT_QUADFORMAT "u\n",
+	printf("  %s sent:         %" PRIu64 "\n",
                units, stats->num_sent);
-	printf("  %s completed:    %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)\n",
+	printf("  %s completed:    %" PRIu64 " (%.2lf%%)\n",
 	       units, stats->num_completed,
 	       SAFE_DIV(100.0 * stats->num_completed, stats->num_sent));
-	printf("  %s lost:         %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)\n",
+	printf("  %s lost:         %" PRIu64 " (%.2lf%%)\n",
 	       units, stats->num_timedout,
 	       SAFE_DIV(100.0 * stats->num_timedout, stats->num_sent));
 	if (stats->num_interrupted > 0)
-		printf("  %s interrupted:  %" ISC_PRINT_QUADFORMAT "u "
+		printf("  %s interrupted:  %" PRIu64 " "
                        "(%.2lf%%)\n",
 		       units, stats->num_interrupted,
 		       SAFE_DIV(100.0 * stats->num_interrupted,
@@ -305,7 +307,7 @@ print_statistics(const config_t *config, const times_t
 			first_rcode = ISC_FALSE;
 		else
 			printf(", ");
-		printf("%s %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)",
+		printf("%s %" PRIu64 " (%.2lf%%)",
 		       perf_dns_rcode_strings[i], stats->rcodecounts[i],
 		       (stats->rcodecounts[i] * 100.0) / stats->num_completed);
 	}

Line 0 Link Here

(-)dns/dnsperf/files/patch-log.c (+11 lines)
	1	--- log.c.orig 2015-12-16 00:46:50 UTC
	2	+++ log.c
	3	@@ -20,6 +20,8 @@
	4	#include <stdio.h>
	5	#include <stdlib.h>
	6
	7	+#include <isc/int.h>
	8	+
	9	#include "log.h"
	10	#include "util.h"
	11




--- opt.c.orig	2015-12-16 00:46:50 UTC
+++ opt.c
@@ -22,7 +22,9 @@
 
 #include <netinet/in.h>
 
+#include <isc/boolean.h>
 #include <isc/file.h>
+#include <isc/int.h>
 #include <isc/parseint.h>
 #include <isc/result.h>
 

Line 0 Link Here

(-)dns/dnsperf/files/patch-os.c (+11 lines)
	1	--- os.c.orig 2015-12-16 00:46:49 UTC
	2	+++ os.c
	3	@@ -22,6 +22,8 @@
	4
	5	#include <sys/select.h>
	6
	7	+#include <isc/boolean.h>
	8	+#include <isc/int.h>
	9	#include <isc/result.h>
	10	#include <isc/types.h>
	11




--- resperf.c.orig	2015-12-16 00:46:50 UTC
+++ resperf.c
@@ -46,8 +46,10 @@
 
 #include <sys/time.h>
 
+#include <isc/boolean.h>
 #include <isc/buffer.h>
 #include <isc/file.h>
+#include <isc/int.h>
 #include <isc/list.h>
 #include <isc/mem.h>
 #include <isc/print.h>
@@ -389,11 +391,11 @@ print_statistics(void) {
 
 	printf("\nStatistics:\n\n");
 
-	printf("  Queries sent:         %" ISC_PRINT_QUADFORMAT "u\n",
+	printf("  Queries sent:         %" PRIu64 "\n",
                num_queries_sent);
-	printf("  Queries completed:    %" ISC_PRINT_QUADFORMAT "u\n",
+	printf("  Queries completed:    %" PRIu64 "\n",
                num_responses_received);
-	printf("  Queries lost:         %" ISC_PRINT_QUADFORMAT "u\n",
+	printf("  Queries lost:         %" PRIu64 "\n",
 	       num_queries_sent - num_responses_received);
 	printf("  Response codes:       ");
 	first_rcode = ISC_TRUE;
@@ -404,7 +406,7 @@ print_statistics(void) {
 			first_rcode = ISC_FALSE;
 		else
 			printf(", ");
-		printf("%s %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)",
+		printf("%s %" PRIu64 " (%.2lf%%)",
 		       perf_dns_rcode_strings[i], rcodecounts[i],
 		       (rcodecounts[i] * 100.0) / num_responses_received);
 	}

Return to bug 232774

Line 0 Link Here

(-)dns/dnsperf/files/patch-datafile.c (+12 lines)
	1	--- datafile.c.orig 2015-12-16 00:46:49 UTC
	2	+++ datafile.c
	3	@@ -23,7 +23,9 @@
	4
	5	#define ISC_BUFFER_USEINLINE
	6
	7	+#include <isc/boolean.h>
	8	#include <isc/buffer.h>
	9	+#include <isc/int.h>
	10	#include <isc/mem.h>
	11
	12	#include "datafile.h"

Line 0 Link Here

(-)dns/dnsperf/files/patch-dns.c (+14 lines)
	1	--- dns.c.orig 2015-12-16 00:46:50 UTC
	2	+++ dns.c
	3	@@ -41,9 +41,11 @@
	4	#define ISC_BUFFER_USEINLINE
	5
	6	#include <isc/base64.h>
	7	+#include <isc/boolean.h>
	8	#include <isc/buffer.h>
	9	#include <isc/hmacmd5.h>
	10	#include <isc/hmacsha.h>
	11	+#include <isc/int.h>
	12	#include <isc/lex.h>
	13	#include <isc/mem.h>
	14	#include <isc/region.h>

Line 0 Link Here

(-)dns/dnsperf/files/patch-dnsperf.c (+43 lines)
	1	--- dnsperf.c.orig 2015-12-16 00:46:49 UTC
	2	+++ dnsperf.c
	3	@@ -52,8 +52,10 @@
	4
	5	#define ISC_BUFFER_USEINLINE
	6
	7	+#include <isc/boolean.h>
	8	#include <isc/buffer.h>
	9	#include <isc/file.h>
	10	+#include <isc/int.h>
	11	#include <isc/list.h>
	12	#include <isc/mem.h>
	13	#include <isc/netaddr.h>
	14	@@ -280,16 +282,16 @@ print_statistics(const config_t *config, const times_t
	15
	16	printf("Statistics:\n\n");
	17
	18	- printf(" %s sent: %" ISC_PRINT_QUADFORMAT "u\n",
	19	+ printf(" %s sent: %" PRIu64 "\n",
	20	units, stats->num_sent);
	21	- printf(" %s completed: %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)\n",
	22	+ printf(" %s completed: %" PRIu64 " (%.2lf%%)\n",
	23	units, stats->num_completed,
	24	SAFE_DIV(100.0 * stats->num_completed, stats->num_sent));
	25	- printf(" %s lost: %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)\n",
	26	+ printf(" %s lost: %" PRIu64 " (%.2lf%%)\n",
	27	units, stats->num_timedout,
	28	SAFE_DIV(100.0 * stats->num_timedout, stats->num_sent));
	29	if (stats->num_interrupted > 0)
	30	- printf(" %s interrupted: %" ISC_PRINT_QUADFORMAT "u "
	31	+ printf(" %s interrupted: %" PRIu64 " "
	32	"(%.2lf%%)\n",
	33	units, stats->num_interrupted,
	34	SAFE_DIV(100.0 * stats->num_interrupted,
	35	@@ -305,7 +307,7 @@ print_statistics(const config_t *config, const times_t
	36	first_rcode = ISC_FALSE;
	37	else
	38	printf(", ");
	39	- printf("%s %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)",
	40	+ printf("%s %" PRIu64 " (%.2lf%%)",
	41	perf_dns_rcode_strings[i], stats->rcodecounts[i],
	42	(stats->rcodecounts[i] * 100.0) / stats->num_completed);
	43	}

Line 0 Link Here

(-)dns/dnsperf/files/patch-opt.c (+12 lines)
	1	--- opt.c.orig 2015-12-16 00:46:50 UTC
	2	+++ opt.c
	3	@@ -22,7 +22,9 @@
	4
	5	#include <netinet/in.h>
	6
	7	+#include <isc/boolean.h>
	8	#include <isc/file.h>
	9	+#include <isc/int.h>
	10	#include <isc/parseint.h>
	11	#include <isc/result.h>
	12

Line 0 Link Here

(-)dns/dnsperf/files/patch-resperf.c (+37 lines)
	1	--- resperf.c.orig 2015-12-16 00:46:50 UTC
	2	+++ resperf.c
	3	@@ -46,8 +46,10 @@
	4
	5	#include <sys/time.h>
	6
	7	+#include <isc/boolean.h>
	8	#include <isc/buffer.h>
	9	#include <isc/file.h>
	10	+#include <isc/int.h>
	11	#include <isc/list.h>
	12	#include <isc/mem.h>
	13	#include <isc/print.h>
	14	@@ -389,11 +391,11 @@ print_statistics(void) {
	15
	16	printf("\nStatistics:\n\n");
	17
	18	- printf(" Queries sent: %" ISC_PRINT_QUADFORMAT "u\n",
	19	+ printf(" Queries sent: %" PRIu64 "\n",
	20	num_queries_sent);
	21	- printf(" Queries completed: %" ISC_PRINT_QUADFORMAT "u\n",
	22	+ printf(" Queries completed: %" PRIu64 "\n",
	23	num_responses_received);
	24	- printf(" Queries lost: %" ISC_PRINT_QUADFORMAT "u\n",
	25	+ printf(" Queries lost: %" PRIu64 "\n",
	26	num_queries_sent - num_responses_received);
	27	printf(" Response codes: ");
	28	first_rcode = ISC_TRUE;
	29	@@ -404,7 +406,7 @@ print_statistics(void) {
	30	first_rcode = ISC_FALSE;
	31	else
	32	printf(", ");
	33	- printf("%s %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)",
	34	+ printf("%s %" PRIu64 " (%.2lf%%)",
	35	perf_dns_rcode_strings[i], rcodecounts[i],
	36	(rcodecounts[i] * 100.0) / num_responses_received);
	37	}