diff options
| author |   florian <florian@openbsd.org> | 2020-01-09 13:47:12 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2020-01-09 13:47:12 +0000 |
| commit | ad3b53661d6e8c6ff17607778560ff02c209fc9d (patch) | |
| tree | ad116f7232545d5c82adc4e17de67db281f9e7d6 /usr.sbin/bind/lib/isc/mem.c | |
| parent | unifdef network defines: (diff) | |
| download | wireguard-openbsd-ad3b53661d6e8c6ff17607778560ff02c209fc9d.tar.xz wireguard-openbsd-ad3b53661d6e8c6ff17607778560ff02c209fc9d.zip | |
unifdef printf and string functions:
#undef ISC_PLATFORM_NEEDVSNPRINTF
#undef ISC_PLATFORM_NEEDSPRINTF
#undef ISC_PLATFORM_NEEDPRINTF
#undef ISC_PLATFORM_NEEDFPRINTF
#define ISC_PLATFORM_QUADFORMAT "ll"
#undef ISC_PLATFORM_NEEDSTRSEP
#undef ISC_PLATFORM_NEEDSTRLCPY
#undef ISC_PLATFORM_NEEDSTRLCAT
#undef ISC_PLATFORM_NEEDSTRTOUL
#undef ISC_PLATFORM_NEEDMEMMOVE
#undef ISC_PLATFORM_NEEDSTRCASESTR
Diffstat (limited to 'usr.sbin/bind/lib/isc/mem.c')
| -rw-r--r-- | usr.sbin/bind/lib/isc/mem.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/usr.sbin/bind/lib/isc/mem.c b/usr.sbin/bind/lib/isc/mem.c index 5f64f59eaf6..221a80d11aa 100644 --- a/usr.sbin/bind/lib/isc/mem.c +++ b/usr.sbin/bind/lib/isc/mem.c @@ -33,7 +33,7 @@ #include <isc/ondestroy.h> #include <isc/string.h> #include <isc/mutex.h> -#include <isc/print.h> + #include <isc/util.h> #include <isc/xml.h> @@ -2373,20 +2373,20 @@ xml_renderctx(isc__mem_t *ctx, summarystat_t *summary, summary->total += ctx->total; TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "total")); TRY0(xmlTextWriterWriteFormatString(writer, - "%" ISC_PRINT_QUADFORMAT "u", + "%llu", (isc_uint64_t)ctx->total)); TRY0(xmlTextWriterEndElement(writer)); /* total */ summary->inuse += ctx->inuse; TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "inuse")); TRY0(xmlTextWriterWriteFormatString(writer, - "%" ISC_PRINT_QUADFORMAT "u", + "%llu", (isc_uint64_t)ctx->inuse)); TRY0(xmlTextWriterEndElement(writer)); /* inuse */ TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "maxinuse")); TRY0(xmlTextWriterWriteFormatString(writer, - "%" ISC_PRINT_QUADFORMAT "u", + "%llu", (isc_uint64_t)ctx->maxinuse)); TRY0(xmlTextWriterEndElement(writer)); /* maxinuse */ @@ -2395,7 +2395,7 @@ xml_renderctx(isc__mem_t *ctx, summarystat_t *summary, summary->blocksize += ctx->basic_table_count * NUM_BASIC_BLOCKS * ctx->mem_target; TRY0(xmlTextWriterWriteFormatString(writer, - "%" ISC_PRINT_QUADFORMAT "u", + "%llu", (isc_uint64_t) ctx->basic_table_count * NUM_BASIC_BLOCKS * @@ -2411,13 +2411,13 @@ xml_renderctx(isc__mem_t *ctx, summarystat_t *summary, TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "hiwater")); TRY0(xmlTextWriterWriteFormatString(writer, - "%" ISC_PRINT_QUADFORMAT "u", + "%llu", (isc_uint64_t)ctx->hi_water)); TRY0(xmlTextWriterEndElement(writer)); /* hiwater */ TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "lowater")); TRY0(xmlTextWriterWriteFormatString(writer, - "%" ISC_PRINT_QUADFORMAT "u", + "%llu", (isc_uint64_t)ctx->lo_water)); TRY0(xmlTextWriterEndElement(writer)); /* lowater */ @@ -2461,31 +2461,31 @@ isc_mem_renderxml(xmlTextWriterPtr writer) { TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "TotalUse")); TRY0(xmlTextWriterWriteFormatString(writer, - "%" ISC_PRINT_QUADFORMAT "u", + "%llu", summary.total)); TRY0(xmlTextWriterEndElement(writer)); /* TotalUse */ TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "InUse")); TRY0(xmlTextWriterWriteFormatString(writer, - "%" ISC_PRINT_QUADFORMAT "u", + "%llu", summary.inuse)); TRY0(xmlTextWriterEndElement(writer)); /* InUse */ TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "BlockSize")); TRY0(xmlTextWriterWriteFormatString(writer, - "%" ISC_PRINT_QUADFORMAT "u", + "%llu", summary.blocksize)); TRY0(xmlTextWriterEndElement(writer)); /* BlockSize */ TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "ContextSize")); TRY0(xmlTextWriterWriteFormatString(writer, - "%" ISC_PRINT_QUADFORMAT "u", + "%llu", summary.contextsize)); TRY0(xmlTextWriterEndElement(writer)); /* ContextSize */ TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "Lost")); TRY0(xmlTextWriterWriteFormatString(writer, - "%" ISC_PRINT_QUADFORMAT "u", + "%llu", lost)); TRY0(xmlTextWriterEndElement(writer)); /* Lost */ |