Replace ISC_PRINT_QUADFORMAT with inttypes.h format constants

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

View File

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

View File

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

View File

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