Merge pull request libgit2#1647 from arrbee/fix-win32-warnings-part-112

arrbee · arrbee · commit 3b5001b4c911 · 2013-06-12T15:39:22.000-07:00
Fix Windows warnings and missing prototypes
diff --git a/src/config.c b/src/config.c
@@ -154,7 +154,7 @@ static int find_internal_file_by_level(
 	} else {
 		git_vector_foreach(&cfg->files, i, internal) {
 			if (internal->level == level)
-				pos = i;
+				pos = (int)i;
 		}
 	}
 
@@ -189,7 +189,7 @@ static void try_remove_existing_file_internal(
 
 	git_vector_foreach(&cfg->files, i, internal) {
 		if (internal->level == level)
-			pos = i;
+			pos = (int)i;
 	}
 
 	if (pos == -1)
diff --git a/src/diff_driver.c b/src/diff_driver.c
@@ -331,15 +331,15 @@ int git_diff_driver_content_is_binary(
 }
 
 static int diff_context_line__simple(
-	git_diff_driver *driver, const char *line, long line_len)
+	git_diff_driver *driver, const char *line, size_t line_len)
 {
 	GIT_UNUSED(driver);
 	GIT_UNUSED(line_len);
 	return (git__isalpha(*line) || *line == '_' || *line == '$');
 }
 
 static int diff_context_line__pattern_match(
-	git_diff_driver *driver, const char *line, long line_len)
+	git_diff_driver *driver, const char *line, size_t line_len)
 {
 	size_t i;
 
diff --git a/src/diff_driver.h b/src/diff_driver.h
@@ -31,7 +31,7 @@ typedef long (*git_diff_find_context_fn)(
 	const char *, long, char *, long, void *);
 
 typedef int (*git_diff_find_context_line)(
-	git_diff_driver *, const char *, long);
+	git_diff_driver *, const char *, size_t);
 
 typedef struct {
 	git_diff_driver *driver;
diff --git a/src/diff_tform.c b/src/diff_tform.c
@@ -711,7 +711,7 @@ int git_diff_find_similar(
 	git_vector_foreach(&diff->deltas, i, to) {
 		size_t tried_sources = 0;
 
-		match_targets[i].idx = i;
+		match_targets[i].idx = (uint32_t)i;
 		match_targets[i].similarity = 0;
 
 		/* skip things that are not rename targets */
@@ -744,8 +744,8 @@ int git_diff_find_similar(
 				match_sources[j].similarity < (uint32_t)similarity) {
 				match_targets[i].similarity = (uint32_t)similarity;
 				match_sources[j].similarity = (uint32_t)similarity;
-				match_targets[i].idx = j;
-				match_sources[j].idx = i;
+				match_targets[i].idx = (uint32_t)j;
+				match_sources[j].idx = (uint32_t)i;
 			}
 		}
 	}
diff --git a/src/revparse.c b/src/revparse.c
@@ -674,7 +674,7 @@ static int ensure_left_hand_identifier_is_not_known_yet(git_object *object, git_
 int revparse__ext(
 	git_object **object_out,
 	git_reference **reference_out,
-	int *identifier_len_out,
+	size_t *identifier_len_out,
 	git_repository *repo,
 	const char *spec)
 {
@@ -832,7 +832,8 @@ int git_revparse_ext(
 	git_repository *repo,
 	const char *spec)
 {
-	int error, identifier_len;
+	int error;
+	size_t identifier_len;
 	git_object *obj = NULL;
 	git_reference *ref = NULL;
 
@@ -841,6 +842,7 @@ int git_revparse_ext(
 
 	*object_out = obj;
 	*reference_out = ref;
+	GIT_UNUSED(identifier_len);
 
 	return 0;
 
diff --git a/src/transports/winhttp.c b/src/transports/winhttp.c
@@ -19,6 +19,8 @@
 #include <winhttp.h>
 #pragma comment(lib, "winhttp")
 
+#include <strsafe.h>
+
 /* For UuidCreate */
 #pragma comment(lib, "rpcrt4")
 
diff --git a/src/win32/posix_w32.c b/src/win32/posix_w32.c
@@ -5,6 +5,7 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 #include "../posix.h"
+#include "../fileops.h"
 #include "path.h"
 #include "utf-conv.h"
 #include "repository.h"
diff --git a/tests-clar/refs/iterator.c b/tests-clar/refs/iterator.c
@@ -66,7 +66,7 @@ void test_refs_iterator__list(void)
 	} while (!error);
 
 	git_reference_iterator_free(iter);
-	cl_assert_equal_i(output.length, ARRAY_SIZE(refnames));
+	cl_assert_equal_sz(output.length, ARRAY_SIZE(refnames));
 
 	git_vector_sort(&output);
 

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ static int find_internal_file_by_level(`
`154`	`154`	`} else {`
`155`	`155`	`git_vector_foreach(&cfg->files, i, internal) {`
`156`	`156`	`if (internal->level == level)`
`157`		`- pos = i;`
	`157`	`+ pos = (int)i;`
`158`	`158`	`}`
`159`	`159`	`}`
`160`	`160`
`@@ -189,7 +189,7 @@ static void try_remove_existing_file_internal(`
`189`	`189`
`190`	`190`	`git_vector_foreach(&cfg->files, i, internal) {`
`191`	`191`	`if (internal->level == level)`
`192`		`- pos = i;`
	`192`	`+ pos = (int)i;`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`if (pos == -1)`
Original file line number	Diff line number	Diff line change
`@@ -331,15 +331,15 @@ int git_diff_driver_content_is_binary(`
`331`	`331`	`}`
`332`	`332`
`333`	`333`	`static int diff_context_line__simple(`
`334`		`- git_diff_driver driver, const char line, long line_len)`
	`334`	`+ git_diff_driver driver, const char line, size_t line_len)`
`335`	`335`	`{`
`336`	`336`	`GIT_UNUSED(driver);`
`337`	`337`	`GIT_UNUSED(line_len);`
`338`	`338`	`return (git__isalpha(line) \|\| line == '_' \|\| *line == '$');`
`339`	`339`	`}`
`340`	`340`
`341`	`341`	`static int diff_context_line__pattern_match(`
`342`		`- git_diff_driver driver, const char line, long line_len)`
	`342`	`+ git_diff_driver driver, const char line, size_t line_len)`
`343`	`343`	`{`
`344`	`344`	`size_t i;`
`345`	`345`
Original file line number	Diff line number	Diff line change
`@@ -711,7 +711,7 @@ int git_diff_find_similar(`
`711`	`711`	`git_vector_foreach(&diff->deltas, i, to) {`
`712`	`712`	`size_t tried_sources = 0;`
`713`	`713`
`714`		`- match_targets[i].idx = i;`
	`714`	`+ match_targets[i].idx = (uint32_t)i;`
`715`	`715`	`match_targets[i].similarity = 0;`
`716`	`716`
`717`	`717`	`/* skip things that are not rename targets */`
`@@ -744,8 +744,8 @@ int git_diff_find_similar(`
`744`	`744`	`match_sources[j].similarity < (uint32_t)similarity) {`
`745`	`745`	`match_targets[i].similarity = (uint32_t)similarity;`
`746`	`746`	`match_sources[j].similarity = (uint32_t)similarity;`
`747`		`- match_targets[i].idx = j;`
`748`		`- match_sources[j].idx = i;`
	`747`	`+ match_targets[i].idx = (uint32_t)j;`
	`748`	`+ match_sources[j].idx = (uint32_t)i;`
`749`	`749`	`}`
`750`	`750`	`}`
`751`	`751`	`}`