Commit c7dd0a56bf81fa93327a1ec3c949a7d59a53f40d

Jacques Germishuys 2014-07-12T14:44:58

Use p_snprintf also in tests

diff --git a/tests/clar_libgit2.h b/tests/clar_libgit2.h
index 0744877..f515542 100644
--- a/tests/clar_libgit2.h
+++ b/tests/clar_libgit2.h
@@ -3,6 +3,7 @@
 
 #include "clar.h"
 #include <git2.h>
+#include <posix.h>
 #include "common.h"
 
 /**
@@ -51,7 +52,7 @@ GIT_INLINE(void) clar__assert_in_range(
 {
 	if (lo > val || hi < val) {
 		char buf[128];
-		snprintf(buf, sizeof(buf), "%d not in [%d,%d]", val, lo, hi);
+		p_snprintf(buf, sizeof(buf), "%d not in [%d,%d]", val, lo, hi);
 		clar__fail(file, line, err, buf, should_abort);
 	}
 }
diff --git a/tests/refs/pack.c b/tests/refs/pack.c
index 7f5c611..dbe377d 100644
--- a/tests/refs/pack.c
+++ b/tests/refs/pack.c
@@ -91,12 +91,12 @@ void test_refs_pack__symbolic(void)
 	/* make a bunch of references */
 
 	for (i = 0; i < 100; ++i) {
-		snprintf(name, sizeof(name), "refs/heads/symbolic-%03d", i);
+		p_snprintf(name, sizeof(name), "refs/heads/symbolic-%03d", i);
 		cl_git_pass(git_reference_symbolic_create(
 			&ref, g_repo, name, "refs/heads/master", 0, NULL, NULL));
 		git_reference_free(ref);
 
-		snprintf(name, sizeof(name), "refs/heads/direct-%03d", i);
+		p_snprintf(name, sizeof(name), "refs/heads/direct-%03d", i);
 		cl_git_pass(git_reference_create(&ref, g_repo, name, &head, 0, NULL, NULL));
 		git_reference_free(ref);
 	}
diff --git a/tests/stress/diff.c b/tests/stress/diff.c
index 3d20926..0dda44d 100644
--- a/tests/stress/diff.c
+++ b/tests/stress/diff.c
@@ -97,14 +97,14 @@ void test_stress_diff__rename_big_files(void)
 	cl_git_pass(git_repository_index(&index, g_repo));
 
 	for (i = 0; i < 100; i += 1) {
-		snprintf(tmp, sizeof(tmp), "renames/newfile%03d", i);
+		p_snprintf(tmp, sizeof(tmp), "renames/newfile%03d", i);
 		for (j = i * 256; j > 0; --j)
 			git_buf_printf(&b, "more content %d\n", i);
 		cl_git_mkfile(tmp, b.ptr);
 	}
 
 	for (i = 0; i < 100; i += 1) {
-		snprintf(tmp, sizeof(tmp), "renames/newfile%03d", i);
+		p_snprintf(tmp, sizeof(tmp), "renames/newfile%03d", i);
 		cl_git_pass(git_index_add_bypath(index, tmp + strlen("renames/")));
 	}
 
@@ -128,15 +128,15 @@ void test_stress_diff__rename_many_files(void)
 	git_buf_printf(&b, "%08d\n" ANOTHER_POEM "%08d\n" ANOTHER_POEM ANOTHER_POEM, 0, 0);
 
 	for (i = 0; i < 2500; i += 1) {
-		snprintf(tmp, sizeof(tmp), "renames/newfile%03d", i);
-		snprintf(b.ptr, 9, "%08d", i);
+		p_snprintf(tmp, sizeof(tmp), "renames/newfile%03d", i);
+		p_snprintf(b.ptr, 9, "%08d", i);
 		b.ptr[8] = '\n';
 		cl_git_mkfile(tmp, b.ptr);
 	}
 	git_buf_free(&b);
 
 	for (i = 0; i < 2500; i += 1) {
-		snprintf(tmp, sizeof(tmp), "renames/newfile%03d", i);
+		p_snprintf(tmp, sizeof(tmp), "renames/newfile%03d", i);
 		cl_git_pass(git_index_add_bypath(index, tmp + strlen("renames/")));
 	}
 
diff --git a/tests/threads/refdb.c b/tests/threads/refdb.c
index 94a21f2..078267a 100644
--- a/tests/threads/refdb.c
+++ b/tests/threads/refdb.c
@@ -58,7 +58,7 @@ void test_threads_refdb__iterator(void)
 	/* make a bunch of references */
 
 	for (r = 0; r < 200; ++r) {
-		snprintf(name, sizeof(name), "refs/heads/direct-%03d", r);
+		p_snprintf(name, sizeof(name), "refs/heads/direct-%03d", r);
 		cl_git_pass(git_reference_create(&ref, g_repo, name, &head, 0, NULL, NULL));
 		git_reference_free(ref);
 	}
@@ -102,7 +102,7 @@ static void *create_refs(void *arg)
 	cl_git_pass(git_reference_name_to_id(&head, g_repo, "HEAD"));
 
 	for (i = 0; i < 10; ++i) {
-		snprintf(name, sizeof(name), "refs/heads/thread-%03d-%02d", *id, i);
+		p_snprintf(name, sizeof(name), "refs/heads/thread-%03d-%02d", *id, i);
 		cl_git_pass(git_reference_create(&ref[i], g_repo, name, &head, 0, NULL, NULL));
 
 		if (i == 5) {
@@ -127,7 +127,7 @@ static void *delete_refs(void *arg)
 	char name[128];
 
 	for (i = 0; i < 10; ++i) {
-		snprintf(
+		p_snprintf(
 			name, sizeof(name), "refs/heads/thread-%03d-%02d", (*id) & ~0x3, i);
 
 		if (!git_reference_lookup(&ref, g_repo, name)) {
@@ -167,7 +167,7 @@ void test_threads_refdb__edit_while_iterate(void)
 	/* make a bunch of references */
 
 	for (r = 0; r < 50; ++r) {
-		snprintf(name, sizeof(name), "refs/heads/starter-%03d", r);
+		p_snprintf(name, sizeof(name), "refs/heads/starter-%03d", r);
 		cl_git_pass(git_reference_create(&ref, g_repo, name, &head, 0, NULL, NULL));
 		git_reference_free(ref);
 	}