From ab8c79fdafd6d1ee722c1277ef32c14c6e0c9dd3 Mon Sep 17 00:00:00 2001
From: Jason Evans <jasone@canonware.com>
Date: Sun, 30 Mar 2014 11:21:09 -0700
Subject: [PATCH] Fix message formatting errors uncovered by p_test_fail()
 refactoring.

---
 test/unit/ckh.c        | 12 ++++++------
 test/unit/junk.c       |  2 +-
 test/unit/quarantine.c |  2 +-
 test/unit/rtree.c      |  5 +++--
 test/unit/zero.c       |  2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/test/unit/ckh.c b/test/unit/ckh.c
index 69fd7f52..b214c279 100644
--- a/test/unit/ckh.c
+++ b/test/unit/ckh.c
@@ -29,7 +29,7 @@ TEST_BEGIN(test_count_insert_search_remove)
 	assert_false(ckh_new(&ckh, 2, ckh_string_hash, ckh_string_keycomp),
 	    "Unexpected ckh_new() error");
 	assert_zu_eq(ckh_count(&ckh), 0,
-	    "ckh_count() should return %zu, but it returned %zu", 0,
+	    "ckh_count() should return %zu, but it returned %zu", ZU(0),
 	    ckh_count(&ckh));
 
 	/* Insert. */
@@ -101,11 +101,11 @@ TEST_END
 
 TEST_BEGIN(test_insert_iter_remove)
 {
-#define	NITEMS 1000
+#define	NITEMS ZU(1000)
 	ckh_t ckh;
 	void **p[NITEMS];
 	void *q, *r;
-	unsigned i;
+	size_t i;
 
 	assert_false(ckh_new(&ckh, 2, ckh_pointer_hash, ckh_pointer_keycomp),
 	    "Unexpected ckh_new() error");
@@ -116,7 +116,7 @@ TEST_BEGIN(test_insert_iter_remove)
 	}
 
 	for (i = 0; i < NITEMS; i++) {
-		unsigned j;
+		size_t j;
 
 		for (j = i; j < NITEMS; j++) {
 			assert_false(ckh_insert(&ckh, p[j], p[j]),
@@ -152,7 +152,7 @@ TEST_BEGIN(test_insert_iter_remove)
 
 			for (tabind = 0; ckh_iter(&ckh, &tabind, &q, &r) ==
 			    false;) {
-				unsigned k;
+				size_t k;
 
 				assert_ptr_eq(q, r, "Key and val not equal");
 
@@ -188,7 +188,7 @@ TEST_BEGIN(test_insert_iter_remove)
 	}
 
 	assert_zu_eq(ckh_count(&ckh), 0,
-	    "ckh_count() should return %zu, but it returned %zu", 0,
+	    "ckh_count() should return %zu, but it returned %zu", ZU(0),
 	    ckh_count(&ckh));
 	ckh_delete(&ckh);
 #undef NITEMS
diff --git a/test/unit/junk.c b/test/unit/junk.c
index ef8f9c16..85bbf9e2 100644
--- a/test/unit/junk.c
+++ b/test/unit/junk.c
@@ -73,7 +73,7 @@ test_junk(size_t sz_min, size_t sz_max)
 		if (sz_prev > 0) {
 			assert_c_eq(s[0], 'a',
 			    "Previously allocated byte %zu/%zu is corrupted",
-			    0, sz_prev);
+			    ZU(0), sz_prev);
 			assert_c_eq(s[sz_prev-1], 'a',
 			    "Previously allocated byte %zu/%zu is corrupted",
 			    sz_prev-1, sz_prev);
diff --git a/test/unit/quarantine.c b/test/unit/quarantine.c
index 45349237..bbd48a51 100644
--- a/test/unit/quarantine.c
+++ b/test/unit/quarantine.c
@@ -21,7 +21,7 @@ quarantine_clear(void)
 
 TEST_BEGIN(test_quarantine)
 {
-#define	SZ		256
+#define	SZ		ZU(256)
 #define	NQUARANTINED	(QUARANTINE_SIZE/SZ)
 	void *quarantined[NQUARANTINED+1];
 	size_t i, j;
diff --git a/test/unit/rtree.c b/test/unit/rtree.c
index 5e7a4113..5463055f 100644
--- a/test/unit/rtree.c
+++ b/test/unit/rtree.c
@@ -48,8 +48,9 @@ TEST_BEGIN(test_rtree_bits)
 				assert_u_eq(rtree_get(rtree, keys[k]), 1,
 				    "rtree_get() should return previously set "
 				    "value and ignore insignificant key bits; "
-				    "i=%u, j=%u, k=%u, set key=%#x, "
-				    "get key=%#x", i, j, k, keys[j], keys[k]);
+				    "i=%u, j=%u, k=%u, set key=%#"PRIxPTR", "
+				    "get key=%#"PRIxPTR, i, j, k, keys[j],
+				    keys[k]);
 			}
 			assert_u_eq(rtree_get(rtree,
 			    (((uintptr_t)1) << (sizeof(uintptr_t)*8-i))), 0,
diff --git a/test/unit/zero.c b/test/unit/zero.c
index 2fdae2fd..65a8f0c9 100644
--- a/test/unit/zero.c
+++ b/test/unit/zero.c
@@ -20,7 +20,7 @@ test_zero(size_t sz_min, size_t sz_max)
 		if (sz_prev > 0) {
 			assert_c_eq(s[0], 'a',
 			    "Previously allocated byte %zu/%zu is corrupted",
-			    0, sz_prev);
+			    ZU(0), sz_prev);
 			assert_c_eq(s[sz_prev-1], 'a',
 			    "Previously allocated byte %zu/%zu is corrupted",
 			    sz_prev-1, sz_prev);