Merge pull request #312 from nulltoken/patch-2

vmg · vmg · commit d37ba6720de3 · 2011-07-09T06:45:30.000-07:00
Fix MSVC compilation warning
diff --git a/src/odb.c b/src/odb.c
@@ -149,7 +149,7 @@ int git_odb_hashfile(git_oid *out, const char *path, git_otype type)
 		return git__throw(GIT_EOSERR, "'%s' appears to be corrupted", path);
 	}
 
-	hdr_len = format_object_header(hdr, sizeof(hdr), size, type);
+	hdr_len = format_object_header(hdr, sizeof(hdr), (size_t)size, type);
 	if (hdr_len < 0)
 		return git__throw(GIT_ERROR, "Failed to format blob header. Length is out of bounds");
 

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ int git_odb_hashfile(git_oid out, const char path, git_otype type)`
`149`	`149`	`return git__throw(GIT_EOSERR, "'%s' appears to be corrupted", path);`
`150`	`150`	`}`
`151`	`151`
`152`		`- hdr_len = format_object_header(hdr, sizeof(hdr), size, type);`
	`152`	`+ hdr_len = format_object_header(hdr, sizeof(hdr), (size_t)size, type);`
`153`	`153`	`if (hdr_len < 0)`
`154`	`154`	`return git__throw(GIT_ERROR, "Failed to format blob header. Length is out of bounds");`
`155`	`155`