Merge pull request #1690 from nulltoken/fix/warnings

Fix Win32/64 compilation warnings & memory leak

4 files changed, 5 insertions, 3 deletions

diff --git a/tests-clar/checkout/index.c b/tests-clar/checkout/index.c
index 9d8b321ae..982bf9ee5 100644
--- a/tests-clar/checkout/index.c
+++ b/tests-clar/checkout/index.c
@@ -587,6 +587,8 @@ void test_checkout_index__target_directory_from_bare(void)
 
 	cl_git_pass(git_futils_rmdir_r(
 		"alternative", NULL, GIT_RMDIR_REMOVE_FILES));
+
+	git_object_free(head);
 }
 
 void test_checkout_index__can_get_repo_from_index(void)
diff --git a/tests-clar/clar/sandbox.h b/tests-clar/clar/sandbox.h
index 1ca6fcae8..5622bfab7 100644
--- a/tests-clar/clar/sandbox.h
+++ b/tests-clar/clar/sandbox.h
@@ -45,7 +45,7 @@ find_tmp_path(char *buffer, size_t length)
 #else
 	DWORD env_len;
 
-	if ((env_len = GetEnvironmentVariable("CLAR_TMP", buffer, length)) > 0 &&
+	if ((env_len = GetEnvironmentVariable("CLAR_TMP", buffer, (DWORD)length)) > 0 &&
 		env_len < length)
 		return 0;
 
diff --git a/tests-clar/diff/rename.c b/tests-clar/diff/rename.c
index 2b1873bd5..9efd9281c 100644
--- a/tests-clar/diff/rename.c
+++ b/tests-clar/diff/rename.c
@@ -516,7 +516,7 @@ void test_diff_rename__working_directory_changes(void)
 	cl_git_pass(git_oid_fromstr(&id, blobsha));
 	cl_git_pass(git_blob_lookup(&blob, g_repo, &id));
 	cl_git_pass(git_buf_set(
-		&content, git_blob_rawcontent(blob), git_blob_rawsize(blob)));
+		&content, git_blob_rawcontent(blob), (size_t)git_blob_rawsize(blob)));
 	cl_git_rewritefile("renames/songof7cities.txt", content.ptr);
 	git_blob_free(blob);
 
diff --git a/tests-clar/merge/trees/automerge.c b/tests-clar/merge/trees/automerge.c
index 04a7beff6..746ce5068 100644
--- a/tests-clar/merge/trees/automerge.c
+++ b/tests-clar/merge/trees/automerge.c
@@ -122,7 +122,7 @@ void test_merge_trees_automerge__automerge(void)
 	cl_assert(entry->file_size == strlen(AUTOMERGEABLE_MERGED_FILE));
 
 	cl_git_pass(git_object_lookup((git_object **)&blob, repo, &entry->oid, GIT_OBJ_BLOB));
-	cl_assert(memcmp(git_blob_rawcontent(blob), AUTOMERGEABLE_MERGED_FILE, entry->file_size) == 0);
+	cl_assert(memcmp(git_blob_rawcontent(blob), AUTOMERGEABLE_MERGED_FILE, (size_t)entry->file_size) == 0);
 
 	git_index_free(index);
 	git_blob_free(blob);