diff options
| -rw-r--r-- | src/diff_output.c | 2 | ||||
| -rw-r--r-- | src/refs.c | 12 | ||||
| -rw-r--r-- | src/submodule.c | 2 | ||||
| -rw-r--r-- | tests-clar/diff/diffiter.c | 12 | ||||
| -rw-r--r-- | tests-clar/diff/tree.c | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/src/diff_output.c b/src/diff_output.c index 05bca4668..8a099a433 100644 --- a/src/diff_output.c +++ b/src/diff_output.c @@ -1366,7 +1366,7 @@ int git_diff_patch_num_lines_in_hunk( if (hunk_idx >= patch->hunks_size) return GIT_ENOTFOUND; else - return patch->hunks[hunk_idx].line_count; + return (int)patch->hunks[hunk_idx].line_count; } int git_diff_patch_get_line_in_hunk( diff --git a/src/refs.c b/src/refs.c index 903acccbb..bd6fbee0e 100644 --- a/src/refs.c +++ b/src/refs.c @@ -1610,12 +1610,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); @@ -1667,10 +1667,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)) @@ -1706,7 +1706,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; diff --git a/src/submodule.c b/src/submodule.c index e55e12863..a2162496a 100644 --- a/src/submodule.c +++ b/src/submodule.c @@ -1474,7 +1474,7 @@ static int submodule_wd_status(unsigned int *status, git_submodule *sm) error = git_diff_workdir_to_index(sm_repo, &opt, &diff); if (!error) { - int untracked = + size_t untracked = git_diff_num_deltas_of_type(diff, GIT_DELTA_UNTRACKED); if (untracked > 0) diff --git a/tests-clar/diff/diffiter.c b/tests-clar/diff/diffiter.c index 78f97fc86..f6d9bfc38 100644 --- a/tests-clar/diff/diffiter.c +++ b/tests-clar/diff/diffiter.c @@ -37,7 +37,7 @@ void test_diff_diffiter__iterate_files(void) cl_git_pass(git_diff_workdir_to_index(repo, NULL, &diff)); num_d = git_diff_num_deltas(diff); - cl_assert_equal_i(6, num_d); + cl_assert_equal_i(6, (int)num_d); for (d = 0; d < num_d; ++d) { const git_diff_delta *delta; @@ -60,7 +60,7 @@ void test_diff_diffiter__iterate_files_2(void) cl_git_pass(git_diff_workdir_to_index(repo, NULL, &diff)); num_d = git_diff_num_deltas(diff); - cl_assert_equal_i(8, num_d); + cl_assert_equal_i(8, (int)num_d); for (d = 0; d < num_d; ++d) { const git_diff_delta *delta; @@ -150,7 +150,7 @@ void test_diff_diffiter__max_size_threshold(void) cl_assert(patch); file_count++; - hunk_count += git_diff_patch_num_hunks(patch); + hunk_count += (int)git_diff_patch_num_hunks(patch); assert(delta->binary == 0 || delta->binary == 1); binary_count += delta->binary; @@ -183,7 +183,7 @@ void test_diff_diffiter__max_size_threshold(void) cl_git_pass(git_diff_get_patch(&patch, &delta, diff, d)); file_count++; - hunk_count += git_diff_patch_num_hunks(patch); + hunk_count += (int)git_diff_patch_num_hunks(patch); assert(delta->binary == 0 || delta->binary == 1); binary_count += delta->binary; @@ -266,13 +266,13 @@ static void iterate_over_patch(git_diff_patch *patch, diff_expects *exp) size_t h, num_h = git_diff_patch_num_hunks(patch), num_l; exp->files++; - exp->hunks += num_h; + exp->hunks += (int)num_h; /* let's iterate in reverse, just because we can! */ for (h = 1, num_l = 0; h <= num_h; ++h) num_l += git_diff_patch_num_lines_in_hunk(patch, num_h - h); - exp->lines += num_l; + exp->lines += (int)num_l; } #define PATCH_CACHE 5 diff --git a/tests-clar/diff/tree.c b/tests-clar/diff/tree.c index e62fa2690..d8af3acf3 100644 --- a/tests-clar/diff/tree.c +++ b/tests-clar/diff/tree.c @@ -309,7 +309,7 @@ void test_diff_tree__larger_hunks(void) cl_git_fail(git_diff_get_patch(&patch, &delta, diff, num_d)); - cl_assert_equal_i(2, num_d); + cl_assert_equal_i(2, (int)num_d); git_diff_list_free(diff); diff = NULL; |