Fix up more Win64 compile warnings
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42
diff --git a/src/refs.c b/src/refs.c
index 693870a..f250cd8 100644
--- a/src/refs.c
+++ b/src/refs.c
@@ -1608,12 +1608,12 @@ static int ensure_segment_validity(const char *name)
prev = *current;
}
- return current - name;
+ return (int)(current - name);
}
-static bool is_all_caps_and_underscore(const char *name, int len)
+static bool is_all_caps_and_underscore(const char *name, size_t len)
{
- int i;
+ size_t i;
char c;
assert(name && len > 0);
@@ -1665,10 +1665,10 @@ int git_reference__normalize_name(
if (segment_len > 0) {
if (normalize) {
- int cur_len = git_buf_len(buf);
+ size_t cur_len = git_buf_len(buf);
git_buf_joinpath(buf, git_buf_cstr(buf), current);
- git_buf_truncate(buf,
+ git_buf_truncate(buf,
cur_len + segment_len + (segments_count ? 1 : 0));
if (git_buf_oom(buf))
@@ -1704,7 +1704,7 @@ int git_reference__normalize_name(
goto cleanup;
if ((segments_count == 1 ) &&
- !(is_all_caps_and_underscore(name, segment_len) ||
+ !(is_all_caps_and_underscore(name, (size_t)segment_len) ||
((flags & GIT_REF_FORMAT_REFSPEC_PATTERN) && !strcmp("*", name))))
goto cleanup;