]> git.proxmox.com Git - libgit2.git/commitdiff
Fix up more Win64 compile warnings
authorRussell Belfer <rb@github.com>
Mon, 1 Oct 2012 19:32:55 +0000 (12:32 -0700)
committerRussell Belfer <rb@github.com>
Mon, 1 Oct 2012 19:32:55 +0000 (12:32 -0700)
src/refs.c

index 693870a0be11f51bcc6d260b506cf21a85675fed..f250cd8b41814d74005ef84032744d24b8dfa8b1 100644 (file)
@@ -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;