Factor 40 and 41 constants from source.

6 files changed, 13 insertions, 13 deletions

diff --git a/tests/blame/blame_helpers.c b/tests/blame/blame_helpers.c
index 9bb77a52d..21cd1a615 100644
--- a/tests/blame/blame_helpers.c
+++ b/tests/blame/blame_helpers.c
@@ -17,7 +17,7 @@ void hunk_message(size_t idx, const git_blame_hunk *hunk, const char *fmt, ...)
 void check_blame_hunk_index(git_repository *repo, git_blame *blame, int idx,
 		int start_line, int len, char boundary, const char *commit_id, const char *orig_path)
 {
-	char expected[41] = {0}, actual[41] = {0};
+	char expected[GIT_OID_HEXSZ+1] = {0}, actual[GIT_OID_HEXSZ+1] = {0};
 	const git_blame_hunk *hunk = git_blame_get_hunk_byindex(blame, idx);
 	cl_assert(hunk);
 
diff --git a/tests/checkout/conflict.c b/tests/checkout/conflict.c
index b8ae80576..943371dac 100644
--- a/tests/checkout/conflict.c
+++ b/tests/checkout/conflict.c
@@ -48,7 +48,7 @@ static git_index *g_index;
 
 struct checkout_index_entry {
 	uint16_t mode;
-	char oid_str[41];
+	char oid_str[GIT_OID_HEXSZ+1];
 	int stage;
 	char path[128];
 };
diff --git a/tests/merge/merge_helpers.h b/tests/merge/merge_helpers.h
index fddf8fab1..554c24b7c 100644
--- a/tests/merge/merge_helpers.h
+++ b/tests/merge/merge_helpers.h
@@ -49,7 +49,7 @@
 
 struct merge_index_entry {
 	uint16_t mode;
-	char oid_str[41];
+	char oid_str[GIT_OID_HEXSZ+1];
 	int stage;
 	char path[128];
 };
@@ -70,9 +70,9 @@ struct merge_reuc_entry {
 	unsigned int ancestor_mode;
 	unsigned int our_mode;
 	unsigned int their_mode;
-	char ancestor_oid_str[41];
-	char our_oid_str[41];
-	char their_oid_str[41];
+	char ancestor_oid_str[GIT_OID_HEXSZ+1];
+	char our_oid_str[GIT_OID_HEXSZ+1];
+	char their_oid_str[GIT_OID_HEXSZ+1];
 };
 
 struct merge_index_conflict_data {
diff --git a/tests/object/raw/chars.c b/tests/object/raw/chars.c
index 206bf7119..cde0bdbf6 100644
--- a/tests/object/raw/chars.c
+++ b/tests/object/raw/chars.c
@@ -12,7 +12,7 @@ void test_object_raw_chars__find_invalid_chars_in_oid(void)
 		0xb7, 0x75, 0x21, 0x3c, 0x23,
 		0xa8, 0xbd, 0x74, 0xf5, 0xe0,
 	};
-	char in[41] = "16a67770b7d8d72317c4b775213c23a8bd74f5e0";
+	char in[] = "16a67770b7d8d72317c4b775213c23a8bd74f5e0";
 	unsigned int i;
 
 	for (i = 0; i < 256; i++) {
diff --git a/tests/pack/packbuilder.c b/tests/pack/packbuilder.c
index 1059424ed..12273ec85 100644
--- a/tests/pack/packbuilder.c
+++ b/tests/pack/packbuilder.c
@@ -93,7 +93,7 @@ void test_pack_packbuilder__create_pack(void)
 	git_buf buf = GIT_BUF_INIT, path = GIT_BUF_INIT;
 	git_hash_ctx ctx;
 	git_oid hash;
-	char hex[41]; hex[40] = '\0';
+	char hex[GIT_OID_HEXSZ+1]; hex[GIT_OID_HEXSZ] = '\0';
 
 	seed_packbuilder();
 
@@ -135,7 +135,7 @@ void test_pack_packbuilder__create_pack(void)
 
 void test_pack_packbuilder__get_hash(void)
 {
-	char hex[41]; hex[40] = '\0';
+	char hex[GIT_OID_HEXSZ+1]; hex[GIT_OID_HEXSZ] = '\0';
 
 	seed_packbuilder();
 
diff --git a/tests/revwalk/basic.c b/tests/revwalk/basic.c
index b015db18b..ff05fa249 100644
--- a/tests/revwalk/basic.c
+++ b/tests/revwalk/basic.c
@@ -49,12 +49,12 @@ static const int result_bytes = 24;
 static int get_commit_index(git_oid *raw_oid)
 {
 	int i;
-	char oid[40];
+	char oid[GIT_OID_HEXSZ];
 
 	git_oid_fmt(oid, raw_oid);
 
 	for (i = 0; i < commit_count; ++i)
-		if (memcmp(oid, commit_ids[i], 40) == 0)
+		if (memcmp(oid, commit_ids[i], GIT_OID_HEXSZ) == 0)
 			return i;
 
 	return -1;
@@ -74,9 +74,9 @@ static int test_walk_only(git_revwalk *walk,
 	while (git_revwalk_next(&oid, walk) == 0) {
 		result_array[i++] = get_commit_index(&oid);
 		/*{
-			char str[41];
+			char str[GIT_OID_HEXSZ+1];
 			git_oid_fmt(str, &oid);
-			str[40] = 0;
+			str[GIT_OID_HEXSZ] = 0;
 			printf("  %d) %s\n", i, str);
 		}*/
 	}