upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace ISC_PRINT_QUADFORMAT with inttypes.h format constants

Browse source
This commit is contained in:
Ondřej Surý 2018-03-28 14:56:40 +02:00
parent 9e493798c6
commit 64fe6bbaf2
31 changed files with 122 additions and 204 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
bin/dig/dig.c
View file

@ -15,6 +15,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
#include <ctype.h> #include <ctype.h>
#include <inttypes.h>
#include <isc/app.h> #include <isc/app.h>
#include <isc/netaddr.h> #include <isc/netaddr.h>
@ -281,7 +282,7 @@ received(unsigned int bytes, isc_sockaddr_t *from, dig_query_t *query) {
#endif #endif
if (query->lookup->doing_xfr) { if (query->lookup->doing_xfr) {
printf(";; XFR size: %u records (messages %u, " printf(";; XFR size: %u records (messages %u, "
"bytes %" ISC_PRINT_QUADFORMAT "u)\n", "bytes %" PRIu64 ")\n",
query->rr_count, query->msg_count, query->rr_count, query->msg_count,
query->byte_count); query->byte_count);
} else { } else {
@ -299,14 +300,14 @@ received(unsigned int bytes, isc_sockaddr_t *from, dig_query_t *query) {
} else if (query->lookup->identify && !short_form) { } else if (query->lookup->identify && !short_form) {
diff = isc_time_microdiff(&query->time_recv, &query->time_sent); diff = isc_time_microdiff(&query->time_recv, &query->time_sent);
if (query->lookup->use_usec) if (query->lookup->use_usec)
printf(";; Received %" ISC_PRINT_QUADFORMAT "u bytes " printf(";; Received %" PRIu64 " bytes "
"from %s(%s) in %ld us\n\n", "from %s(%s) in %ld us\n\n",
query->lookup->doing_xfr query->lookup->doing_xfr
? query->byte_count ? query->byte_count
: (isc_uint64_t)bytes, : (isc_uint64_t)bytes,
fromtext, query->userarg, (long) diff); fromtext, query->userarg, (long) diff);
else else
printf(";; Received %" ISC_PRINT_QUADFORMAT "u bytes " printf(";; Received %" PRIu64 " bytes "
"from %s(%s) in %ld ms\n\n", "from %s(%s) in %ld ms\n\n",
query->lookup->doing_xfr query->lookup->doing_xfr
? query->byte_count ? query->byte_count
@ -360,10 +361,11 @@ say_message(dns_rdata_t *rdata, dig_query_t *query, isc_buffer_t *buf) {
diff = isc_time_microdiff(&query->time_recv, &query->time_sent); diff = isc_time_microdiff(&query->time_recv, &query->time_sent);
ADD_STRING(buf, " from server "); ADD_STRING(buf, " from server ");
ADD_STRING(buf, query->servname); ADD_STRING(buf, query->servname);
if (query->lookup->use_usec) if (query->lookup->use_usec) {
snprintf(store, sizeof(store), " in %" ISC_PLATFORM_QUADFORMAT "u us.", diff); snprintf(store, sizeof(store), " in %" PRIu64 " us.", diff);
else } else {
snprintf(store, sizeof(store), " in %" ISC_PLATFORM_QUADFORMAT "u ms.", diff / 1000); snprintf(store, sizeof(store), " in %" PRIu64 " ms.", diff / 1000);
}
ADD_STRING(buf, store); ADD_STRING(buf, store);
} }
ADD_STRING(buf, "\n"); ADD_STRING(buf, "\n");

5
bin/named/main.c
View file

@ -16,6 +16,7 @@
#include <ctype.h> #include <ctype.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <inttypes.h>
#include <isc/app.h> #include <isc/app.h>
#include <isc/backtrace.h> #include <isc/backtrace.h>
@ -1102,8 +1103,8 @@ setup(void) {
isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,
"adjusted limit on open files from " "adjusted limit on open files from "
"%" ISC_PRINT_QUADFORMAT "u to " "%" PRIu64 " to "
"%" ISC_PRINT_QUADFORMAT "u", "%" PRIu64,
old_openfiles, named_g_initopenfiles); old_openfiles, named_g_initopenfiles);
} }

17
bin/named/server.c
View file

@ -19,6 +19,7 @@
#include <ctype.h> #include <ctype.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <inttypes.h>
#include <isc/aes.h> #include <isc/aes.h>
#include <isc/app.h> #include <isc/app.h>
@ -3463,7 +3464,7 @@ configure_dnstap(const cfg_obj_t **maps, dns_view_t *view) {
cfg_obj_log(obj2, named_g_lctx, cfg_obj_log(obj2, named_g_lctx,
ISC_LOG_WARNING, ISC_LOG_WARNING,
"'dnstap-output size " "'dnstap-output size "
"%" ISC_PRINT_QUADFORMAT "u' " "%" PRIu64 "' "
"is too large for this " "is too large for this "
"system; reducing to %lu", "system; reducing to %lu",
max_size, (unsigned long)SIZE_MAX); max_size, (unsigned long)SIZE_MAX);
@ -3890,7 +3891,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
cfg_obj_log(obj, named_g_lctx, cfg_obj_log(obj, named_g_lctx,
ISC_LOG_WARNING, ISC_LOG_WARNING,
"'max-cache-size " "'max-cache-size "
"%" ISC_PRINT_QUADFORMAT "u' " "%" PRIu64 "' "
"is too large for this " "is too large for this "
"system; reducing to %lu", "system; reducing to %lu",
value, (unsigned long)SIZE_MAX); value, (unsigned long)SIZE_MAX);
@ -3914,8 +3915,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
cfg_obj_log(obj, named_g_lctx, cfg_obj_log(obj, named_g_lctx,
ISC_LOG_INFO, ISC_LOG_INFO,
"'max-cache-size %d%%' " "'max-cache-size %d%%' "
"- setting to %" ISC_PRINT_QUADFORMAT "uMB " "- setting to %" PRIu64 "MB "
"(out of %" ISC_PRINT_QUADFORMAT "uMB)", "(out of %" PRIu64 "MB)",
max_cache_size_percent, max_cache_size_percent,
(isc_uint64_t)(max_cache_size / (1024*1024)), (isc_uint64_t)(max_cache_size / (1024*1024)),
totalphys / (1024*1024)); totalphys / (1024*1024));
@ -6791,7 +6792,7 @@ set_limit(const cfg_obj_t **maps, const char *configname,
NAMED_LOGMODULE_SERVER, NAMED_LOGMODULE_SERVER,
result == ISC_R_SUCCESS ? result == ISC_R_SUCCESS ?
ISC_LOG_DEBUG(3) : ISC_LOG_WARNING, ISC_LOG_DEBUG(3) : ISC_LOG_WARNING,
"set maximum %s to %" ISC_PRINT_QUADFORMAT "u: %s", "set maximum %s to %" PRIu64 ": %s",
description, value, isc_result_totext(result)); description, value, isc_result_totext(result));
} }
@ -7242,7 +7243,7 @@ setup_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
cfg_obj_log(obj, named_g_lctx, cfg_obj_log(obj, named_g_lctx,
ISC_LOG_ERROR, ISC_LOG_ERROR,
"'lmdb-mapsize " "'lmdb-mapsize "
"%" ISC_PRINT_QUADFORMAT "d' " "%" PRId64 "' "
"is too small", "is too small",
mapsize); mapsize);
return (ISC_R_FAILURE); return (ISC_R_FAILURE);
@ -7250,7 +7251,7 @@ setup_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
cfg_obj_log(obj, named_g_lctx, cfg_obj_log(obj, named_g_lctx,
ISC_LOG_ERROR, ISC_LOG_ERROR,
"'lmdb-mapsize " "'lmdb-mapsize "
"%" ISC_PRINT_QUADFORMAT "d' " "%" PRId64 "' "
"is too large", "is too large",
mapsize); mapsize);
return (ISC_R_FAILURE); return (ISC_R_FAILURE);
@ -7971,7 +7972,7 @@ load_configuration(const char *filename, named_server_t *server,
if (result == ISC_R_SUCCESS && (isc_resourcevalue_t)maxsocks > nfiles) { if (result == ISC_R_SUCCESS && (isc_resourcevalue_t)maxsocks > nfiles) {
isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING,
"max open files (%" ISC_PRINT_QUADFORMAT "u)" "max open files (%" PRIu64 ")"
" is smaller than max sockets (%u)", " is smaller than max sockets (%u)",
nfiles, maxsocks); nfiles, maxsocks);
} }

24
bin/named/statschannel.c
View file

@ -13,6 +13,8 @@
#include <config.h> #include <config.h>
#include <inttypes.h>
#include <isc/buffer.h> #include <isc/buffer.h>
#include <isc/httpd.h> #include <isc/httpd.h>
#include <isc/json.h> #include <isc/json.h>
@ -1106,7 +1108,7 @@ dump_counters(isc_stats_t *stats, isc_statsformat_t type, void *arg,
switch (dumparg.type) { switch (dumparg.type) {
case isc_statsformat_file: case isc_statsformat_file:
fp = arg; fp = arg;
fprintf(fp, "%20" ISC_PRINT_QUADFORMAT "u %s\n", fprintf(fp, "%20" PRIu64 " %s\n",
value, desc[idx]); value, desc[idx]);
break; break;
case isc_statsformat_xml: case isc_statsformat_xml:
@ -1134,7 +1136,7 @@ dump_counters(isc_stats_t *stats, isc_statsformat_t type, void *arg,
ISC_XMLCHAR ISC_XMLCHAR
"counter")); "counter"));
TRY0(xmlTextWriterWriteFormatString(writer, TRY0(xmlTextWriterWriteFormatString(writer,
"%" ISC_PRINT_QUADFORMAT "u", value)); "%" PRIu64, value));
TRY0(xmlTextWriterEndElement(writer)); TRY0(xmlTextWriterEndElement(writer));
/* </counter> */ /* </counter> */
@ -1151,7 +1153,7 @@ dump_counters(isc_stats_t *stats, isc_statsformat_t type, void *arg,
ISC_XMLCHAR ISC_XMLCHAR
desc[idx])); desc[idx]));
TRY0(xmlTextWriterWriteFormatString(writer, TRY0(xmlTextWriterWriteFormatString(writer,
"%" ISC_PRINT_QUADFORMAT "u", value)); "%" PRIu64, value));
TRY0(xmlTextWriterEndElement(writer)); TRY0(xmlTextWriterEndElement(writer));
/* counter */ /* counter */
} }
@ -1203,7 +1205,7 @@ rdtypestat_dump(dns_rdatastatstype_t type, isc_uint64_t val, void *arg) {
switch (dumparg->type) { switch (dumparg->type) {
case isc_statsformat_file: case isc_statsformat_file:
fp = dumparg->arg; fp = dumparg->arg;
fprintf(fp, "%20" ISC_PRINT_QUADFORMAT "u %s\n", val, typestr); fprintf(fp, "%20" PRIu64 " %s\n", val, typestr);
break; break;
case isc_statsformat_xml: case isc_statsformat_xml:
#ifdef HAVE_LIBXML2 #ifdef HAVE_LIBXML2
@ -1215,7 +1217,7 @@ rdtypestat_dump(dns_rdatastatstype_t type, isc_uint64_t val, void *arg) {
ISC_XMLCHAR typestr)); ISC_XMLCHAR typestr));
TRY0(xmlTextWriterWriteFormatString(writer, TRY0(xmlTextWriterWriteFormatString(writer,
"%" ISC_PRINT_QUADFORMAT "u", "%" PRIu64,
val)); val));
TRY0(xmlTextWriterEndElement(writer)); /* type */ TRY0(xmlTextWriterEndElement(writer)); /* type */
@ -1282,7 +1284,7 @@ rdatasetstats_dump(dns_rdatastatstype_t type, isc_uint64_t val, void *arg) {
switch (dumparg->type) { switch (dumparg->type) {
case isc_statsformat_file: case isc_statsformat_file:
fp = dumparg->arg; fp = dumparg->arg;
fprintf(fp, "%20" ISC_PRINT_QUADFORMAT "u %s%s%s\n", val, fprintf(fp, "%20" PRIu64 " %s%s%s\n", val,
stale ? "#" : "", nxrrset ? "!" : "", typestr); stale ? "#" : "", nxrrset ? "!" : "", typestr);
break; break;
case isc_statsformat_xml: case isc_statsformat_xml:
@ -1298,7 +1300,7 @@ rdatasetstats_dump(dns_rdatastatstype_t type, isc_uint64_t val, void *arg) {
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "counter")); TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "counter"));
TRY0(xmlTextWriterWriteFormatString(writer, TRY0(xmlTextWriterWriteFormatString(writer,
"%" ISC_PRINT_QUADFORMAT "u", "%" PRIu64,
val)); val));
TRY0(xmlTextWriterEndElement(writer)); /* counter */ TRY0(xmlTextWriterEndElement(writer)); /* counter */
@ -1349,7 +1351,7 @@ opcodestat_dump(dns_opcode_t code, isc_uint64_t val, void *arg) {
switch (dumparg->type) { switch (dumparg->type) {
case isc_statsformat_file: case isc_statsformat_file:
fp = dumparg->arg; fp = dumparg->arg;
fprintf(fp, "%20" ISC_PRINT_QUADFORMAT "u %s\n", val, codebuf); fprintf(fp, "%20" PRIu64 " %s\n", val, codebuf);
break; break;
case isc_statsformat_xml: case isc_statsformat_xml:
#ifdef HAVE_LIBXML2 #ifdef HAVE_LIBXML2
@ -1358,7 +1360,7 @@ opcodestat_dump(dns_opcode_t code, isc_uint64_t val, void *arg) {
TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "name", TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "name",
ISC_XMLCHAR codebuf )); ISC_XMLCHAR codebuf ));
TRY0(xmlTextWriterWriteFormatString(writer, TRY0(xmlTextWriterWriteFormatString(writer,
"%" ISC_PRINT_QUADFORMAT "u", "%" PRIu64,
val)); val));
TRY0(xmlTextWriterEndElement(writer)); /* counter */ TRY0(xmlTextWriterEndElement(writer)); /* counter */
#endif #endif
@ -1406,7 +1408,7 @@ rcodestat_dump(dns_rcode_t code, isc_uint64_t val, void *arg) {
switch (dumparg->type) { switch (dumparg->type) {
case isc_statsformat_file: case isc_statsformat_file:
fp = dumparg->arg; fp = dumparg->arg;
fprintf(fp, "%20" ISC_PRINT_QUADFORMAT "u %s\n", val, codebuf); fprintf(fp, "%20" PRIu64 " %s\n", val, codebuf);
break; break;
case isc_statsformat_xml: case isc_statsformat_xml:
#ifdef HAVE_LIBXML2 #ifdef HAVE_LIBXML2
@ -1415,7 +1417,7 @@ rcodestat_dump(dns_rcode_t code, isc_uint64_t val, void *arg) {
TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "name", TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "name",
ISC_XMLCHAR codebuf )); ISC_XMLCHAR codebuf ));
TRY0(xmlTextWriterWriteFormatString(writer, TRY0(xmlTextWriterWriteFormatString(writer,
"%" ISC_PRINT_QUADFORMAT "u", "%" PRIu64,
val)); val));
TRY0(xmlTextWriterEndElement(writer)); /* counter */ TRY0(xmlTextWriterEndElement(writer)); /* counter */
#endif #endif

6
bin/named/zoneconf.c
View file

@ -11,6 +11,8 @@
#include <config.h> #include <config.h>
#include <inttypes.h>
#include <isc/buffer.h> #include <isc/buffer.h>
#include <isc/file.h> #include <isc/file.h>
#include <isc/mem.h> #include <isc/mem.h>
@ -1272,7 +1274,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
cfg_obj_log(obj, named_g_lctx, cfg_obj_log(obj, named_g_lctx,
ISC_LOG_ERROR, ISC_LOG_ERROR,
"'max-journal-size " "'max-journal-size "
"%" ISC_PRINT_QUADFORMAT "d' " "%" PRId64 "' "
"is too large", "is too large",
value); value);
RETERR(ISC_R_RANGE); RETERR(ISC_R_RANGE);
@ -1405,7 +1407,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
cfg_obj_log(obj, named_g_lctx, cfg_obj_log(obj, named_g_lctx,
ISC_LOG_ERROR, ISC_LOG_ERROR,
"'max-journal-size " "'max-journal-size "
"%" ISC_PRINT_QUADFORMAT "d' " "%" PRId64 "' "
"is too large", "is too large",
value); value);
RETERR(ISC_R_RANGE); RETERR(ISC_R_RANGE);

51
configure vendored
View file

@ -727,7 +727,6 @@ ISC_PLATFORM_RLIMITTYPE
ISC_PLATFORM_HAVESTATNSEC ISC_PLATFORM_HAVESTATNSEC
ISC_PLATFORM_HAVESYSUNH ISC_PLATFORM_HAVESYSUNH
LIBCAP_LIBS LIBCAP_LIBS
ISC_PLATFORM_QUADFORMAT
DST_EXTRA_SRCS DST_EXTRA_SRCS
DST_EXTRA_OBJS DST_EXTRA_OBJS
USE_ISC_SPNEGO USE_ISC_SPNEGO
@ -19188,56 +19187,6 @@ fi
# Determine the printf format characters to use when printing
# values of type isc_int64_t. This will normally be "ll", but where
# the compiler treats "long long" as a alias for "long" and printf
# doesn't know about "long long" use "l". Hopefully the sprintf
# will produce a inconsistent result in the later case. If the compiler
# fails due to seeing "%lld" we fall back to "l".
#
# Digital Unix 4.0 (gcc?) (long long) is 64 bits as is its long. It uses
# %ld even for (long long)/
#
# Win32 uses "%I64d", but that's defined elsewhere since we don't use
# configure on Win32.
#
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking printf format modifier for 64-bit integers" >&5
$as_echo_n "checking printf format modifier for 64-bit integers... " >&6; }
if test "$cross_compiling" = yes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming target platform uses ll" >&5
$as_echo "assuming target platform uses ll" >&6; }
ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "ll"'
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
main() {
long long int j = 0;
char buf[100];
buf[0] = 0;
sprintf(buf, "%lld", j);
exit((sizeof(long long int) != sizeof(long int))? 0 :
(strcmp(buf, "0") != 0));
}
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ll" >&5
$as_echo "ll" >&6; }
ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "ll"'
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: l" >&5
$as_echo "l" >&6; }
ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "l"'
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
# #
# Security Stuff # Security Stuff
# #

34
configure.in
View file

@ -2753,40 +2753,6 @@ AC_SUBST(USE_ISC_SPNEGO)
AC_SUBST(DST_EXTRA_OBJS) AC_SUBST(DST_EXTRA_OBJS)
AC_SUBST(DST_EXTRA_SRCS) AC_SUBST(DST_EXTRA_SRCS)
# Determine the printf format characters to use when printing
# values of type isc_int64_t. This will normally be "ll", but where
# the compiler treats "long long" as a alias for "long" and printf
# doesn't know about "long long" use "l". Hopefully the sprintf
# will produce a inconsistent result in the later case. If the compiler
# fails due to seeing "%lld" we fall back to "l".
#
# Digital Unix 4.0 (gcc?) (long long) is 64 bits as is its long. It uses
# %ld even for (long long)/
#
# Win32 uses "%I64d", but that's defined elsewhere since we don't use
# configure on Win32.
#
AC_MSG_CHECKING(printf format modifier for 64-bit integers)
AC_TRY_RUN([
#include <stdio.h>
main() {
long long int j = 0;
char buf[100];
buf[0] = 0;
sprintf(buf, "%lld", j);
exit((sizeof(long long int) != sizeof(long int))? 0 :
(strcmp(buf, "0") != 0));
}
],
[AC_MSG_RESULT(ll)
ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "ll"'],
[AC_MSG_RESULT(l)
ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "l"'],
[AC_MSG_RESULT(assuming target platform uses ll)
ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "ll"'])
AC_SUBST(ISC_PLATFORM_QUADFORMAT)
# #
# Security Stuff # Security Stuff
# #

12
contrib/dnsperf-2.1.0.0-1/dnsperf.c
View file

@ -36,6 +36,8 @@
*** DNS Performance Testing Tool *** DNS Performance Testing Tool
***/ ***/
#include <inttypes.h>
#include <errno.h> #include <errno.h>
#include <math.h> #include <math.h>
#include <pthread.h> #include <pthread.h>
@ -278,16 +280,16 @@ print_statistics(const config_t *config, const times_t *times, stats_t *stats)
printf("Statistics:\n\n"); printf("Statistics:\n\n");
printf(" %s sent: %" ISC_PRINT_QUADFORMAT "u\n", printf(" %s sent: %" PRIu64 "\n",
units, stats->num_sent); units, stats->num_sent);
printf(" %s completed: %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)\n", printf(" %s completed: %" PRIu64 " (%.2lf%%)\n",
units, stats->num_completed, units, stats->num_completed,
SAFE_DIV(100.0 * stats->num_completed, stats->num_sent)); 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, units, stats->num_timedout,
SAFE_DIV(100.0 * stats->num_timedout, stats->num_sent)); SAFE_DIV(100.0 * stats->num_timedout, stats->num_sent));
if (stats->num_interrupted > 0) if (stats->num_interrupted > 0)
printf(" %s interrupted: %" ISC_PRINT_QUADFORMAT "u " printf(" %s interrupted: %" PRIu64 " "
"(%.2lf%%)\n", "(%.2lf%%)\n",
units, stats->num_interrupted, units, stats->num_interrupted,
SAFE_DIV(100.0 * stats->num_interrupted, SAFE_DIV(100.0 * stats->num_interrupted,
@ -303,7 +305,7 @@ print_statistics(const config_t *config, const times_t *times, stats_t *stats)
first_rcode = ISC_FALSE; first_rcode = ISC_FALSE;
else else
printf(", "); printf(", ");
printf("%s %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)", printf("%s %" PRIu64 " (%.2lf%%)",
perf_dns_rcode_strings[i], stats->rcodecounts[i], perf_dns_rcode_strings[i], stats->rcodecounts[i],
(stats->rcodecounts[i] * 100.0) / stats->num_completed); (stats->rcodecounts[i] * 100.0) / stats->num_completed);
} }

9
contrib/dnsperf-2.1.0.0-1/resperf.c
View file

@ -41,6 +41,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <inttypes.h>
#include <sys/time.h> #include <sys/time.h>
@ -387,11 +388,11 @@ print_statistics(void) {
printf("\nStatistics:\n\n"); printf("\nStatistics:\n\n");
printf(" Queries sent: %" ISC_PRINT_QUADFORMAT "u\n", printf(" Queries sent: %" PRIu64 "\n",
num_queries_sent); num_queries_sent);
printf(" Queries completed: %" ISC_PRINT_QUADFORMAT "u\n", printf(" Queries completed: %" PRIu64 "\n",
num_responses_received); num_responses_received);
printf(" Queries lost: %" ISC_PRINT_QUADFORMAT "u\n", printf(" Queries lost: %" PRIu64 "\n",
num_queries_sent - num_responses_received); num_queries_sent - num_responses_received);
printf(" Response codes: "); printf(" Response codes: ");
first_rcode = ISC_TRUE; first_rcode = ISC_TRUE;
@ -402,7 +403,7 @@ print_statistics(void) {
first_rcode = ISC_FALSE; first_rcode = ISC_FALSE;
else else
printf(", "); printf(", ");
printf("%s %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)", printf("%s %" PRIu64 " (%.2lf%%)",
perf_dns_rcode_strings[i], rcodecounts[i], perf_dns_rcode_strings[i], rcodecounts[i],
(rcodecounts[i] * 100.0) / num_responses_received); (rcodecounts[i] * 100.0) / num_responses_received);
} }

5
lib/bind9/check.c
View file

@ -14,6 +14,7 @@
#include <config.h> #include <config.h>
#include <stdlib.h> #include <stdlib.h>
#include <inttypes.h>
#include <isc/aes.h> #include <isc/aes.h>
#include <isc/base64.h> #include <isc/base64.h>
@ -1565,7 +1566,7 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
cfg_obj_log(obj, logctx, cfg_obj_log(obj, logctx,
ISC_LOG_ERROR, ISC_LOG_ERROR,
"'lmdb-mapsize " "'lmdb-mapsize "
"%" ISC_PRINT_QUADFORMAT "d' " "%" PRId64 "' "
"is too small", "is too small",
mapsize); mapsize);
if (result == ISC_R_SUCCESS) if (result == ISC_R_SUCCESS)
@ -1574,7 +1575,7 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
cfg_obj_log(obj, logctx, cfg_obj_log(obj, logctx,
ISC_LOG_ERROR, ISC_LOG_ERROR,
"'lmdb-mapsize " "'lmdb-mapsize "
"%" ISC_PRINT_QUADFORMAT "d' " "%" PRId64 "' "
"is too large", "is too large",
mapsize); mapsize);
if (result == ISC_R_SUCCESS) if (result == ISC_R_SUCCESS)

4
lib/dns/badcache.c
View file

@ -13,6 +13,8 @@
#include <config.h> #include <config.h>
#include <inttypes.h>
#include <isc/buffer.h> #include <isc/buffer.h>
#include <isc/log.h> #include <isc/log.h>
#include <isc/hash.h> #include <isc/hash.h>
@ -429,7 +431,7 @@ dns_badcache_print(dns_badcache_t *bc, const char *cachename, FILE *fp) {
t = isc_time_microdiff(&bad->expire, &now); t = isc_time_microdiff(&bad->expire, &now);
t /= 1000; t /= 1000;
fprintf(fp, "; %s/%s [ttl " fprintf(fp, "; %s/%s [ttl "
"%" ISC_PLATFORM_QUADFORMAT "u]\n", "%" PRIu64 "]\n",
namebuf, typebuf, t); namebuf, typebuf, t);
} }
} }

30
lib/dns/cache.c
View file

@ -14,6 +14,8 @@
#include <config.h> #include <config.h>
#include <inttypes.h>
#include <isc/json.h> #include <isc/json.h>
#include <isc/mem.h> #include <isc/mem.h>
#include <isc/print.h> #include <isc/print.h>
@ -1401,47 +1403,47 @@ dns_cache_dumpstats(dns_cache_t *cache, FILE *fp) {
getcounters(cache->stats, isc_statsformat_file, getcounters(cache->stats, isc_statsformat_file,
dns_cachestatscounter_max, indices, values); dns_cachestatscounter_max, indices, values);
fprintf(fp, "%20" ISC_PRINT_QUADFORMAT "u %s\n", fprintf(fp, "%20" PRIu64 " %s\n",
values[dns_cachestatscounter_hits], values[dns_cachestatscounter_hits],
"cache hits"); "cache hits");
fprintf(fp, "%20" ISC_PRINT_QUADFORMAT "u %s\n", fprintf(fp, "%20" PRIu64 " %s\n",
values[dns_cachestatscounter_misses], values[dns_cachestatscounter_misses],
"cache misses"); "cache misses");
fprintf(fp, "%20" ISC_PRINT_QUADFORMAT "u %s\n", fprintf(fp, "%20" PRIu64 " %s\n",
values[dns_cachestatscounter_queryhits], values[dns_cachestatscounter_queryhits],
"cache hits (from query)"); "cache hits (from query)");
fprintf(fp, "%20" ISC_PRINT_QUADFORMAT "u %s\n", fprintf(fp, "%20" PRIu64 " %s\n",
values[dns_cachestatscounter_querymisses], values[dns_cachestatscounter_querymisses],
"cache misses (from query)"); "cache misses (from query)");
fprintf(fp, "%20" ISC_PRINT_QUADFORMAT "u %s\n", fprintf(fp, "%20" PRIu64 " %s\n",
values[dns_cachestatscounter_deletelru], values[dns_cachestatscounter_deletelru],
"cache records deleted due to memory exhaustion"); "cache records deleted due to memory exhaustion");
fprintf(fp, "%20" ISC_PRINT_QUADFORMAT "u %s\n", fprintf(fp, "%20" PRIu64 " %s\n",
values[dns_cachestatscounter_deletettl], values[dns_cachestatscounter_deletettl],
"cache records deleted due to TTL expiration"); "cache records deleted due to TTL expiration");
fprintf(fp, "%20u %s\n", dns_db_nodecount(cache->db), fprintf(fp, "%20u %s\n", dns_db_nodecount(cache->db),
"cache database nodes"); "cache database nodes");
fprintf(fp, "%20" ISC_PLATFORM_QUADFORMAT "u %s\n", fprintf(fp, "%20" PRIu64 " %s\n",
(isc_uint64_t) dns_db_hashsize(cache->db), (isc_uint64_t) dns_db_hashsize(cache->db),
"cache database hash buckets"); "cache database hash buckets");
fprintf(fp, "%20" ISC_PLATFORM_QUADFORMAT "u %s\n", fprintf(fp, "%20" PRIu64 " %s\n",
(isc_uint64_t) isc_mem_total(cache->mctx), (isc_uint64_t) isc_mem_total(cache->mctx),
"cache tree memory total"); "cache tree memory total");
fprintf(fp, "%20" ISC_PLATFORM_QUADFORMAT "u %s\n", fprintf(fp, "%20" PRIu64 " %s\n",
(isc_uint64_t) isc_mem_inuse(cache->mctx), (isc_uint64_t) isc_mem_inuse(cache->mctx),
"cache tree memory in use"); "cache tree memory in use");
fprintf(fp, "%20" ISC_PLATFORM_QUADFORMAT "u %s\n", fprintf(fp, "%20" PRIu64 " %s\n",
(isc_uint64_t) isc_mem_maxinuse(cache->mctx), (isc_uint64_t) isc_mem_maxinuse(cache->mctx),
"cache tree highest memory in use"); "cache tree highest memory in use");
fprintf(fp, "%20" ISC_PLATFORM_QUADFORMAT "u %s\n", fprintf(fp, "%20" PRIu64 " %s\n",
(isc_uint64_t) isc_mem_total(cache->hmctx), (isc_uint64_t) isc_mem_total(cache->hmctx),
"cache heap memory total"); "cache heap memory total");
fprintf(fp, "%20" ISC_PLATFORM_QUADFORMAT "u %s\n", fprintf(fp, "%20" PRIu64 " %s\n",
(isc_uint64_t) isc_mem_inuse(cache->hmctx), (isc_uint64_t) isc_mem_inuse(cache->hmctx),
"cache heap memory in use"); "cache heap memory in use");
fprintf(fp, "%20" ISC_PLATFORM_QUADFORMAT "u %s\n", fprintf(fp, "%20" PRIu64 " %s\n",
(isc_uint64_t) isc_mem_maxinuse(cache->hmctx), (isc_uint64_t) isc_mem_maxinuse(cache->hmctx),
"cache heap highest memory in use"); "cache heap highest memory in use");
} }
@ -1456,7 +1458,7 @@ renderstat(const char *name, isc_uint64_t value, xmlTextWriterPtr writer) {
TRY0(xmlTextWriterWriteAttribute(writer, TRY0(xmlTextWriterWriteAttribute(writer,
ISC_XMLCHAR "name", ISC_XMLCHAR name)); ISC_XMLCHAR "name", ISC_XMLCHAR name));
TRY0(xmlTextWriterWriteFormatString(writer, TRY0(xmlTextWriterWriteFormatString(writer,
"%" ISC_PRINT_QUADFORMAT "u", "%" PRIu64 "",
value)); value));
TRY0(xmlTextWriterEndElement(writer)); /* counter */ TRY0(xmlTextWriterEndElement(writer)); /* counter */

2
lib/dns/rbt.c
View file

@ -14,9 +14,7 @@
#include <config.h> #include <config.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifdef HAVE_INTTYPES_H
#include <inttypes.h> /* uintptr_t */ #include <inttypes.h> /* uintptr_t */
#endif
#include <isc/crc64.h> #include <isc/crc64.h>
#include <isc/file.h> #include <isc/file.h>

8
lib/dns/rbtdb.c
View file

@ -15,9 +15,7 @@
/* #define inline */ /* #define inline */
#ifdef HAVE_INTTYPES_H #include <inttypes.h>
#include <inttypes.h> /* uintptr_t */
#endif
#include <isc/crc64.h> #include <isc/crc64.h>
#include <isc/event.h> #include <isc/event.h>
@ -9849,8 +9847,8 @@ rehash_gluetable(rbtdb_version_t *version) {
isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
DNS_LOGMODULE_ZONE, ISC_LOG_DEBUG(3), DNS_LOGMODULE_ZONE, ISC_LOG_DEBUG(3),
"rehash_gluetable(): " "rehash_gluetable(): "
"resized glue table from %"ISC_PRINT_QUADFORMAT"u to " "resized glue table from %" PRIu64 " to "
"%"ISC_PRINT_QUADFORMAT"u", "%" PRIu64,
(isc_uint64_t) oldsize, (isc_uint64_t) oldsize,
(isc_uint64_t) version->glue_table_size); (isc_uint64_t) version->glue_table_size);

5
lib/dns/resolver.c
View file

@ -13,6 +13,7 @@
#include <config.h> #include <config.h>
#include <ctype.h> #include <ctype.h>
#include <inttypes.h>
#include <isc/counter.h> #include <isc/counter.h>
#include <isc/log.h> #include <isc/log.h>
@ -10612,8 +10613,8 @@ dns_resolver_logfetch(dns_fetch_t *fetch, isc_log_t *lctx,
dns_name_format(&fctx->domain, domainbuf, sizeof(domainbuf)); dns_name_format(&fctx->domain, domainbuf, sizeof(domainbuf));
isc_log_write(lctx, category, module, level, isc_log_write(lctx, category, module, level,
"fetch completed at %s:%d for %s in " "fetch completed at %s:%d for %s in "
"%" ISC_PRINT_QUADFORMAT "u." "%" PRIu64 "."
"%06" ISC_PRINT_QUADFORMAT "u: %s/%s " "%06" PRIu64 ": %s/%s "
"[domain:%s,referral:%u,restart:%u,qrysent:%u," "[domain:%s,referral:%u,restart:%u,qrysent:%u,"
"timeout:%u,lame:%u,quota:%u,neterr:%u," "timeout:%u,lame:%u,quota:%u,neterr:%u,"
"badresp:%u,adberr:%u,findfail:%u,valfail:%u," "badresp:%u,adberr:%u,findfail:%u,valfail:%u,"

8
lib/dns/rpz.c
View file

@ -13,6 +13,8 @@
#include <config.h> #include <config.h>
#include <inttypes.h>
#include <isc/buffer.h> #include <isc/buffer.h>
#include <isc/mem.h> #include <isc/mem.h>
#include <isc/net.h> #include <isc/net.h>
@ -553,7 +555,7 @@ fix_qname_skip_recurse(dns_rpz_zones_t *rpzs) {
set: set:
isc_log_write(dns_lctx, DNS_LOGCATEGORY_RPZ, DNS_LOGMODULE_RBTDB, isc_log_write(dns_lctx, DNS_LOGCATEGORY_RPZ, DNS_LOGMODULE_RBTDB,
DNS_RPZ_DEBUG_QUIET, DNS_RPZ_DEBUG_QUIET,
"computed RPZ qname_skip_recurse mask=0x%llx", "computed RPZ qname_skip_recurse mask=0x%" PRIx64,
(isc_uint64_t) mask); (isc_uint64_t) mask);
rpzs->have.qname_skip_recurse = mask; rpzs->have.qname_skip_recurse = mask;
} }
@ -1624,7 +1626,7 @@ dns_rpz_dbupdate_callback(dns_db_t *db, void *fn_arg) {
DNS_LOGMODULE_MASTER, ISC_LOG_INFO, DNS_LOGMODULE_MASTER, ISC_LOG_INFO,
"rpz: %s: new zone version came " "rpz: %s: new zone version came "
"too soon, deferring update for " "too soon, deferring update for "
"%llu seconds", dname, defer); "%" PRIu64 " seconds", dname, defer);
isc_interval_set(&interval, (unsigned int)defer, 0); isc_interval_set(&interval, (unsigned int)defer, 0);
dns_db_currentversion(zone->db, &zone->dbversion); dns_db_currentversion(zone->db, &zone->dbversion);
result = isc_timer_reset(zone->updatetimer, result = isc_timer_reset(zone->updatetimer,
@ -1814,7 +1816,7 @@ finish_update(dns_rpz_zone_t *rpz) {
DNS_LOGMODULE_MASTER, ISC_LOG_INFO, DNS_LOGMODULE_MASTER, ISC_LOG_INFO,
"rpz: %s: new zone version came " "rpz: %s: new zone version came "
"too soon, deferring update for " "too soon, deferring update for "
"%llu seconds", dname, defer); "%" PRIu64 " seconds", dname, defer);
isc_interval_set(&interval, (unsigned int)defer, 0); isc_interval_set(&interval, (unsigned int)defer, 0);
isc_timer_reset(rpz->updatetimer, isc_timertype_once, isc_timer_reset(rpz->updatetimer, isc_timertype_once,
NULL, &interval, ISC_TRUE); NULL, &interval, ISC_TRUE);

2
lib/dns/tests/rbt_serialize_test.c
View file

@ -22,9 +22,7 @@
#include <unistd.h> #include <unistd.h>
#include <sys/mman.h> #include <sys/mman.h>
#ifdef HAVE_INTTYPES_H
#include <inttypes.h> /* uintptr_t */ #include <inttypes.h> /* uintptr_t */
#endif
#include <dns/rbt.h> #include <dns/rbt.h>
#include <dns/fixedname.h> #include <dns/fixedname.h>

2
lib/dns/tests/rbt_test.c
View file

@ -19,9 +19,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_INTTYPES_H
#include <inttypes.h> /* uintptr_t */ #include <inttypes.h> /* uintptr_t */
#endif
#include <dns/rbt.h> #include <dns/rbt.h>
#include <dns/fixedname.h> #include <dns/fixedname.h>

5
lib/dns/tests/tsig_test.c
View file

@ -16,6 +16,7 @@
#include <atf-c.h> #include <atf-c.h>
#include <unistd.h> #include <unistd.h>
#include <inttypes.h>
#include <isc/mem.h> #include <isc/mem.h>
#include <isc/print.h> #include <isc/print.h>
@ -28,10 +29,6 @@
#include "dnstest.h" #include "dnstest.h"
#ifdef HAVE_INTTYPES_H
#include <inttypes.h> /* uintptr_t */
#endif
#define TEST_ORIGIN "test" #define TEST_ORIGIN "test"
/* /*

4
lib/dns/xfrin.c
View file

@ -14,6 +14,8 @@
#include <config.h> #include <config.h>
#include <inttypes.h>
#include <isc/mem.h> #include <isc/mem.h>
#include <isc/print.h> #include <isc/print.h>
#include <isc/random.h> #include <isc/random.h>
@ -1466,7 +1468,7 @@ maybe_free(dns_xfrin_ctx_t *xfr) {
persec = (xfr->nbytes * 1000) / msecs; persec = (xfr->nbytes * 1000) / msecs;
xfrin_log(xfr, ISC_LOG_INFO, xfrin_log(xfr, ISC_LOG_INFO,
"Transfer completed: %d messages, %d records, " "Transfer completed: %d messages, %d records, "
"%" ISC_PRINT_QUADFORMAT "u bytes, " "%" PRIu64 " bytes, "
"%u.%03u secs (%u bytes/sec)", "%u.%03u secs (%u bytes/sec)",
xfr->nmsg, xfr->nrecs, xfr->nbytes, xfr->nmsg, xfr->nrecs, xfr->nbytes,
(unsigned int) (msecs / 1000), (unsigned int) (msecs % 1000), (unsigned int) (msecs / 1000), (unsigned int) (msecs % 1000),

7
lib/isc/buffer.c
View file

@ -13,6 +13,9 @@
#include <config.h> #include <config.h>
#include <inttypes.h>
#include <stdarg.h>
#include <isc/buffer.h> #include <isc/buffer.h>
#include <isc/mem.h> #include <isc/mem.h>
#include <isc/print.h> #include <isc/print.h>
@ -20,8 +23,6 @@
#include <isc/string.h> #include <isc/string.h>
#include <isc/util.h> #include <isc/util.h>
#include <stdarg.h>
void void
isc__buffer_init(isc_buffer_t *b, void *base, unsigned int length) { isc__buffer_init(isc_buffer_t *b, void *base, unsigned int length) {
/* /*
@ -476,7 +477,7 @@ isc_buffer_putdecint(isc_buffer_t *b, isc_int64_t v) {
REQUIRE(ISC_BUFFER_VALID(b)); REQUIRE(ISC_BUFFER_VALID(b));
/* xxxwpk do it more low-level way ? */ /* xxxwpk do it more low-level way ? */
l = snprintf(buf, 21, "%" ISC_PRINT_QUADFORMAT "d", v); l = snprintf(buf, 21, "%" PRId64, v);
RUNTIME_CHECK(l <= 21); RUNTIME_CHECK(l <= 21);
if (ISC_UNLIKELY(b->autore)) { if (ISC_UNLIKELY(b->autore)) {
result = isc_buffer_reserve(&b, l); result = isc_buffer_reserve(&b, l);

3
lib/isc/include/isc/platform.h.in
View file

@ -166,9 +166,6 @@
***/ ***/
/*! \brief /*! \brief
* The printf format string modifier to use with isc_uint64_t values.
*/
@ISC_PLATFORM_QUADFORMAT@
/* /*
* If the system needs strlcpy(), ISC_PLATFORM_NEEDSTRLCPY will be defined. * If the system needs strlcpy(), ISC_PLATFORM_NEEDSTRLCPY will be defined.

5
lib/isc/include/isc/print.h
View file

@ -22,11 +22,6 @@
#include <isc/lang.h> #include <isc/lang.h>
#include <isc/platform.h> #include <isc/platform.h>
/***
*** Macros
***/
#define ISC_PRINT_QUADFORMAT ISC_PLATFORM_QUADFORMAT
/*** /***
*** Functions *** Functions
***/ ***/

30
lib/isc/mem.c
View file

@ -16,7 +16,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stddef.h> #include <stddef.h>
#include <inttypes.h>
#include <limits.h> #include <limits.h>
#include <isc/bind9.h> #include <isc/bind9.h>
@ -2369,33 +2369,33 @@ xml_renderctx(isc__mem_t *ctx, summarystat_t *summary,
summary->total += ctx->total; summary->total += ctx->total;
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "total")); TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "total"));
TRY0(xmlTextWriterWriteFormatString(writer, TRY0(xmlTextWriterWriteFormatString(writer,
"%" ISC_PRINT_QUADFORMAT "u", "%" PRIu64 "",
(isc_uint64_t)ctx->total)); (isc_uint64_t)ctx->total));
TRY0(xmlTextWriterEndElement(writer)); /* total */ TRY0(xmlTextWriterEndElement(writer)); /* total */
summary->inuse += ctx->inuse; summary->inuse += ctx->inuse;
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "inuse")); TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "inuse"));
TRY0(xmlTextWriterWriteFormatString(writer, TRY0(xmlTextWriterWriteFormatString(writer,
"%" ISC_PRINT_QUADFORMAT "u", "%" PRIu64 "",
(isc_uint64_t)ctx->inuse)); (isc_uint64_t)ctx->inuse));
TRY0(xmlTextWriterEndElement(writer)); /* inuse */ TRY0(xmlTextWriterEndElement(writer)); /* inuse */
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "maxinuse")); TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "maxinuse"));
TRY0(xmlTextWriterWriteFormatString(writer, TRY0(xmlTextWriterWriteFormatString(writer,
"%" ISC_PRINT_QUADFORMAT "u", "%" PRIu64 "",
(isc_uint64_t)ctx->maxinuse)); (isc_uint64_t)ctx->maxinuse));
TRY0(xmlTextWriterEndElement(writer)); /* maxinuse */ TRY0(xmlTextWriterEndElement(writer)); /* maxinuse */
summary->malloced += ctx->malloced; summary->malloced += ctx->malloced;
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "malloced")); TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "malloced"));
TRY0(xmlTextWriterWriteFormatString(writer, TRY0(xmlTextWriterWriteFormatString(writer,
"%" ISC_PRINT_QUADFORMAT "u", "%" PRIu64 "",
(isc_uint64_t)ctx->malloced)); (isc_uint64_t)ctx->malloced));
TRY0(xmlTextWriterEndElement(writer)); /* malloced */ TRY0(xmlTextWriterEndElement(writer)); /* malloced */
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "maxmalloced")); TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "maxmalloced"));
TRY0(xmlTextWriterWriteFormatString(writer, TRY0(xmlTextWriterWriteFormatString(writer,
"%" ISC_PRINT_QUADFORMAT "u", "%" PRIu64 "",
(isc_uint64_t)ctx->maxmalloced)); (isc_uint64_t)ctx->maxmalloced));
TRY0(xmlTextWriterEndElement(writer)); /* maxmalloced */ TRY0(xmlTextWriterEndElement(writer)); /* maxmalloced */
@ -2404,7 +2404,7 @@ xml_renderctx(isc__mem_t *ctx, summarystat_t *summary,
summary->blocksize += ctx->basic_table_count * summary->blocksize += ctx->basic_table_count *
NUM_BASIC_BLOCKS * ctx->mem_target; NUM_BASIC_BLOCKS * ctx->mem_target;
TRY0(xmlTextWriterWriteFormatString(writer, TRY0(xmlTextWriterWriteFormatString(writer,
"%" ISC_PRINT_QUADFORMAT "u", "%" PRIu64 "",
(isc_uint64_t) (isc_uint64_t)
ctx->basic_table_count * ctx->basic_table_count *
NUM_BASIC_BLOCKS * NUM_BASIC_BLOCKS *
@ -2420,13 +2420,13 @@ xml_renderctx(isc__mem_t *ctx, summarystat_t *summary,
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "hiwater")); TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "hiwater"));
TRY0(xmlTextWriterWriteFormatString(writer, TRY0(xmlTextWriterWriteFormatString(writer,
"%" ISC_PRINT_QUADFORMAT "u", "%" PRIu64 "",
(isc_uint64_t)ctx->hi_water)); (isc_uint64_t)ctx->hi_water));
TRY0(xmlTextWriterEndElement(writer)); /* hiwater */ TRY0(xmlTextWriterEndElement(writer)); /* hiwater */
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "lowater")); TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "lowater"));
TRY0(xmlTextWriterWriteFormatString(writer, TRY0(xmlTextWriterWriteFormatString(writer,
"%" ISC_PRINT_QUADFORMAT "u", "%" PRIu64 "",
(isc_uint64_t)ctx->lo_water)); (isc_uint64_t)ctx->lo_water));
TRY0(xmlTextWriterEndElement(writer)); /* lowater */ TRY0(xmlTextWriterEndElement(writer)); /* lowater */
@ -2470,37 +2470,37 @@ isc_mem_renderxml(xmlTextWriterPtr writer) {
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "TotalUse")); TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "TotalUse"));
TRY0(xmlTextWriterWriteFormatString(writer, TRY0(xmlTextWriterWriteFormatString(writer,
"%" ISC_PRINT_QUADFORMAT "u", "%" PRIu64 "",
summary.total)); summary.total));
TRY0(xmlTextWriterEndElement(writer)); /* TotalUse */ TRY0(xmlTextWriterEndElement(writer)); /* TotalUse */
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "InUse")); TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "InUse"));
TRY0(xmlTextWriterWriteFormatString(writer, TRY0(xmlTextWriterWriteFormatString(writer,
"%" ISC_PRINT_QUADFORMAT "u", "%" PRIu64 "",
summary.inuse)); summary.inuse));
TRY0(xmlTextWriterEndElement(writer)); /* InUse */ TRY0(xmlTextWriterEndElement(writer)); /* InUse */
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "Malloced")); TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "Malloced"));
TRY0(xmlTextWriterWriteFormatString(writer, TRY0(xmlTextWriterWriteFormatString(writer,
"%" ISC_PRINT_QUADFORMAT "u", "%" PRIu64 "",
summary.malloced)); summary.malloced));
TRY0(xmlTextWriterEndElement(writer)); /* InUse */ TRY0(xmlTextWriterEndElement(writer)); /* InUse */
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "BlockSize")); TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "BlockSize"));
TRY0(xmlTextWriterWriteFormatString(writer, TRY0(xmlTextWriterWriteFormatString(writer,
"%" ISC_PRINT_QUADFORMAT "u", "%" PRIu64 "",
summary.blocksize)); summary.blocksize));
TRY0(xmlTextWriterEndElement(writer)); /* BlockSize */ TRY0(xmlTextWriterEndElement(writer)); /* BlockSize */
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "ContextSize")); TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "ContextSize"));
TRY0(xmlTextWriterWriteFormatString(writer, TRY0(xmlTextWriterWriteFormatString(writer,
"%" ISC_PRINT_QUADFORMAT "u", "%" PRIu64 "",
summary.contextsize)); summary.contextsize));
TRY0(xmlTextWriterEndElement(writer)); /* ContextSize */ TRY0(xmlTextWriterEndElement(writer)); /* ContextSize */
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "Lost")); TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "Lost"));
TRY0(xmlTextWriterWriteFormatString(writer, TRY0(xmlTextWriterWriteFormatString(writer,
"%" ISC_PRINT_QUADFORMAT "u", "%" PRIu64 "",
lost)); lost));
TRY0(xmlTextWriterEndElement(writer)); /* Lost */ TRY0(xmlTextWriterEndElement(writer)); /* Lost */

10
lib/isc/tests/atomic_test.c
View file

@ -10,7 +10,9 @@
*/ */
#include <config.h> #include <config.h>
#include <stdlib.h> #include <stdlib.h>
#include <inttypes.h>
#include <atf-c.h> #include <atf-c.h>
@ -149,8 +151,8 @@ ATF_TC_BODY(atomic_xaddq, tc) {
isc_test_end(); isc_test_end();
printf("64-bit counter %"ISC_PRINT_QUADFORMAT"d, " printf("64-bit counter %" PRId64 ", "
"expected %"ISC_PRINT_QUADFORMAT"d\n", "expected %" PRId64 "\n",
counter_64, EXPECTED_COUNT_64); counter_64, EXPECTED_COUNT_64);
ATF_CHECK_EQ(counter_64, EXPECTED_COUNT_64); ATF_CHECK_EQ(counter_64, EXPECTED_COUNT_64);
@ -304,8 +306,8 @@ ATF_TC_BODY(atomic_storeq, tc) {
(isc_uint64_t) r); (isc_uint64_t) r);
val |= ((isc_uint64_t) val << 32); val |= ((isc_uint64_t) val << 32);
printf("64-bit store 0x%"ISC_PRINT_QUADFORMAT"x, " printf("64-bit store 0x%" PRIx64 ", "
"expected 0x%"ISC_PRINT_QUADFORMAT"x\n", "expected 0x%" PRIx64 "\n",
(isc_uint64_t) store_64, val); (isc_uint64_t) store_64, val);
ATF_CHECK_EQ((isc_uint64_t) store_64, val); ATF_CHECK_EQ((isc_uint64_t) store_64, val);

3
lib/isc/tests/hash_test.c
View file

@ -17,6 +17,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <inttypes.h>
#include <isc/hash.h> #include <isc/hash.h>
@ -1835,7 +1836,7 @@ ATF_TC_BODY(isc_crc64, tc) {
} }
isc_crc64_final(&crc); isc_crc64_final(&crc);
snprintf(str, sizeof(str), snprintf(str, sizeof(str),
"0x%016" ISC_PRINT_QUADFORMAT "X", crc); "0x%016" PRIX64, crc);
ATF_CHECK_STREQ(str, testcase->result); ATF_CHECK_STREQ(str, testcase->result);
testcase++; testcase++;

4
lib/isc/tests/task_test.c
View file

@ -15,11 +15,9 @@
#include <atf-c.h> #include <atf-c.h>
#ifdef HAVE_INTTYPES_H
#include <inttypes.h> /* uintptr_t */
#endif
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <inttypes.h>
#include <isc/condition.h> #include <isc/condition.h>
#include <isc/mem.h> #include <isc/mem.h>

4
lib/isc/unix/socket.c
View file

@ -34,9 +34,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_INTTYPES_H #include <inttypes.h>
#include <inttypes.h> /* uintptr_t */
#endif
#include <isc/buffer.h> #include <isc/buffer.h>
#include <isc/bufferlist.h> #include <isc/bufferlist.h>

2
lib/isc/win32/include/isc/platform.h.in
View file

@ -50,8 +50,6 @@
#define ISC_PLATFORM_NEEDPTON #define ISC_PLATFORM_NEEDPTON
#define ISC_PLATFORM_HAVESOCKADDRSTORAGE #define ISC_PLATFORM_HAVESOCKADDRSTORAGE
#define ISC_PLATFORM_QUADFORMAT "I64"
#define ISC_PLATFORM_NEEDSTRSEP #define ISC_PLATFORM_NEEDSTRSEP
#define ISC_PLATFORM_NEEDSTRLCPY #define ISC_PLATFORM_NEEDSTRLCPY
#define ISC_PLATFORM_NEEDSTRLCAT #define ISC_PLATFORM_NEEDSTRLCAT

3
lib/isccfg/parser.c
View file

@ -14,6 +14,7 @@
#include <config.h> #include <config.h>
#include <stdlib.h> #include <stdlib.h>
#include <inttypes.h>
#include <isc/buffer.h> #include <isc/buffer.h>
#include <isc/dir.h> #include <isc/dir.h>
@ -976,7 +977,7 @@ void
cfg_print_uint64(cfg_printer_t *pctx, const cfg_obj_t *obj) { cfg_print_uint64(cfg_printer_t *pctx, const cfg_obj_t *obj) {
char buf[32]; char buf[32];
snprintf(buf, sizeof(buf), "%" ISC_PRINT_QUADFORMAT "u", snprintf(buf, sizeof(buf), "%" PRIu64,
obj->value.uint64); obj->value.uint64);
cfg_print_cstr(pctx, buf); cfg_print_cstr(pctx, buf);
} }

6
lib/ns/update.c
View file

@ -11,6 +11,8 @@
#include <config.h> #include <config.h>
#include <inttypes.h>
#include <isc/netaddr.h> #include <isc/netaddr.h>
#include <isc/print.h> #include <isc/print.h>
#include <isc/serial.h> #include <isc/serial.h>
@ -3196,8 +3198,8 @@ update_action(isc_task_t *task, isc_event_t *event) {
if (result == ISC_R_SUCCESS && records > maxrecords) { if (result == ISC_R_SUCCESS && records > maxrecords) {
update_log(client, zone, ISC_LOG_ERROR, update_log(client, zone, ISC_LOG_ERROR,
"records in zone (%" "records in zone (%"
ISC_PRINT_QUADFORMAT PRIu64
"u) exceeds max-records (%u)", ") exceeds max-records (%u)",
records, maxrecords); records, maxrecords);
result = DNS_R_TOOMANYRECORDS; result = DNS_R_TOOMANYRECORDS;
goto failure; goto failure;