Fix more MinGW build warnings.

3 files changed, 34 insertions, 31 deletions

diff --git a/test/unit/atomic.c b/test/unit/atomic.c
index a774836..9217ca9 100644
--- a/test/unit/atomic.c
+++ b/test/unit/atomic.c
@@ -97,7 +97,7 @@ TEST_STRUCT(z, size_t)
 TEST_BEGIN(test_atomic_z)
 {
 
-	TEST_BODY(z, size_t, size_t, zu, "#zx");
+	TEST_BODY(z, size_t, size_t, zu, "#"PRIzx);
 }
 TEST_END
 
diff --git a/test/unit/ckh.c b/test/unit/ckh.c
index c212648..1f22baf 100644
--- a/test/unit/ckh.c
+++ b/test/unit/ckh.c
@@ -35,15 +35,15 @@ TEST_BEGIN(test_count_insert_search_remove)
 	assert_false(ckh_new(tsd, &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", ZU(0),
+	    "ckh_count() should return %"PRIzu", but it returned %"PRIzu, ZU(0),
 	    ckh_count(&ckh));
 
 	/* Insert. */
 	for (i = 0; i < sizeof(strs)/sizeof(const char *); i++) {
 		ckh_insert(tsd, &ckh, strs[i], strs[i]);
 		assert_zu_eq(ckh_count(&ckh), i+1,
-		    "ckh_count() should return %zu, but it returned %zu", i+1,
-		    ckh_count(&ckh));
+		    "ckh_count() should return %"PRIzu", but it returned "
+		    "%"PRIzu, i+1, ckh_count(&ckh));
 	}
 
 	/* Search. */
@@ -65,9 +65,9 @@ TEST_BEGIN(test_count_insert_search_remove)
 		ks = (i & 1) ? strs[i] : (const char *)NULL;
 		vs = (i & 2) ? strs[i] : (const char *)NULL;
 		assert_ptr_eq((void *)ks, (void *)k.s,
-		    "Key mismatch, i=%zu", i);
+		    "Key mismatch, i=%"PRIzu, i);
 		assert_ptr_eq((void *)vs, (void *)v.s,
-		    "Value mismatch, i=%zu", i);
+		    "Value mismatch, i=%"PRIzu, i);
 	}
 	assert_true(ckh_search(&ckh, missing, NULL, NULL),
 	    "Unexpected ckh_search() success");
@@ -91,13 +91,13 @@ TEST_BEGIN(test_count_insert_search_remove)
 		ks = (i & 1) ? strs[i] : (const char *)NULL;
 		vs = (i & 2) ? strs[i] : (const char *)NULL;
 		assert_ptr_eq((void *)ks, (void *)k.s,
-		    "Key mismatch, i=%zu", i);
+		    "Key mismatch, i=%"PRIzu, i);
 		assert_ptr_eq((void *)vs, (void *)v.s,
-		    "Value mismatch, i=%zu", i);
+		    "Value mismatch, i=%"PRIzu, i);
 		assert_zu_eq(ckh_count(&ckh),
 		    sizeof(strs)/sizeof(const char *) - i - 1,
-		    "ckh_count() should return %zu, but it returned %zu",
-		    sizeof(strs)/sizeof(const char *) - i - 1,
+		    "ckh_count() should return %"PRIzu", but it returned "
+		    "%"PRIzu, sizeof(strs)/sizeof(const char *) - i - 1,
 		    ckh_count(&ckh));
 	}
 
@@ -137,8 +137,8 @@ TEST_BEGIN(test_insert_iter_remove)
 		}
 
 		assert_zu_eq(ckh_count(&ckh), NITEMS,
-		    "ckh_count() should return %zu, but it returned %zu",
-		    NITEMS, ckh_count(&ckh));
+		    "ckh_count() should return %"PRIzu", but it returned "
+		    "%"PRIzu, NITEMS, ckh_count(&ckh));
 
 		for (j = i + 1; j < NITEMS; j++) {
 			assert_false(ckh_search(&ckh, p[j], NULL, NULL),
@@ -167,17 +167,20 @@ TEST_BEGIN(test_insert_iter_remove)
 				for (k = 0; k < NITEMS; k++) {
 					if (p[k] == q) {
 						assert_false(seen[k],
-						    "Item %zu already seen", k);
+						    "Item %"PRIzu" already "
+						    "seen", k);
 						seen[k] = true;
 						break;
 					}
 				}
 			}
 
-			for (j = 0; j < i + 1; j++)
-				assert_true(seen[j], "Item %zu not seen", j);
+			for (j = 0; j < i + 1; j++) {
+				assert_true(seen[j], "Item %"PRIzu" not seen",
+				    j);
+			}
 			for (; j < NITEMS; j++)
-				assert_false(seen[j], "Item %zu seen", j);
+				assert_false(seen[j], "Item %"PRIzu" seen", j);
 		}
 	}
 
@@ -196,8 +199,8 @@ TEST_BEGIN(test_insert_iter_remove)
 	}
 
 	assert_zu_eq(ckh_count(&ckh), 0,
-	    "ckh_count() should return %zu, but it returned %zu", ZU(0),
-	    ckh_count(&ckh));
+	    "ckh_count() should return %"PRIzu", but it returned %"PRIzu,
+	    ZU(0), ckh_count(&ckh));
 	ckh_delete(tsd, &ckh);
 #undef NITEMS
 }
diff --git a/test/unit/junk.c b/test/unit/junk.c
index 733f661..8499d06 100644
--- a/test/unit/junk.c
+++ b/test/unit/junk.c
@@ -30,8 +30,8 @@ arena_dalloc_junk_small_intercept(void *ptr, arena_bin_info_t *bin_info)
 	arena_dalloc_junk_small_orig(ptr, bin_info);
 	for (i = 0; i < bin_info->reg_size; i++) {
 		assert_c_eq(((char *)ptr)[i], 0x5a,
-		    "Missing junk fill for byte %zu/%zu of deallocated region",
-		    i, bin_info->reg_size);
+		    "Missing junk fill for byte %"PRIzu"/%"PRIzu" of "
+		    "deallocated region", i, bin_info->reg_size);
 	}
 	if (ptr == watch_for_junking)
 		saw_junking = true;
@@ -45,8 +45,8 @@ arena_dalloc_junk_large_intercept(void *ptr, size_t usize)
 	arena_dalloc_junk_large_orig(ptr, usize);
 	for (i = 0; i < usize; i++) {
 		assert_c_eq(((char *)ptr)[i], 0x5a,
-		    "Missing junk fill for byte %zu/%zu of deallocated region",
-		    i, usize);
+		    "Missing junk fill for byte %"PRIzu"/%"PRIzu" of "
+		    "deallocated region", i, usize);
 	}
 	if (ptr == watch_for_junking)
 		saw_junking = true;
@@ -89,18 +89,18 @@ test_junk(size_t sz_min, size_t sz_max)
 	    sz_prev = sz, sz = sallocx(s, 0)) {
 		if (sz_prev > 0) {
 			assert_c_eq(s[0], 'a',
-			    "Previously allocated byte %zu/%zu is corrupted",
-			    ZU(0), sz_prev);
+			    "Previously allocated byte %"PRIzu"/%"PRIzu" is "
+			    "corrupted", ZU(0), sz_prev);
 			assert_c_eq(s[sz_prev-1], 'a',
-			    "Previously allocated byte %zu/%zu is corrupted",
-			    sz_prev-1, sz_prev);
+			    "Previously allocated byte %"PRIzu"/%"PRIzu" is "
+			    "corrupted", sz_prev-1, sz_prev);
 		}
 
 		for (i = sz_prev; i < sz; i++) {
 			if (opt_junk_alloc) {
 				assert_c_eq(s[i], 0xa5,
-				    "Newly allocated byte %zu/%zu isn't "
-				    "junk-filled", i, sz);
+				    "Newly allocated byte %"PRIzu"/%"PRIzu
+				    " isn't junk-filled", i, sz);
 			}
 			s[i] = 'a';
 		}
@@ -111,15 +111,15 @@ test_junk(size_t sz_min, size_t sz_max)
 			assert_ptr_not_null((void *)s,
 			    "Unexpected rallocx() failure");
 			assert_true(!opt_junk_free || saw_junking,
-			    "Expected region of size %zu to be junk-filled",
-			    sz);
+			    "Expected region of size %"PRIzu" to be "
+			    "junk-filled", sz);
 		}
 	}
 
 	watch_junking(s);
 	dallocx(s, 0);
 	assert_true(!opt_junk_free || saw_junking,
-	    "Expected region of size %zu to be junk-filled", sz);
+	    "Expected region of size %"PRIzu" to be junk-filled", sz);
 
 	if (opt_junk_free) {
 		arena_dalloc_junk_small = arena_dalloc_junk_small_orig;