diff options
Diffstat (limited to 'tests-clar/diff')
-rw-r--r-- | tests-clar/diff/diff_helpers.c | 14 | ||||
-rw-r--r-- | tests-clar/diff/diff_helpers.h | 10 | ||||
-rw-r--r-- | tests-clar/diff/diffiter.c | 18 | ||||
-rw-r--r-- | tests-clar/diff/index.c | 2 | ||||
-rw-r--r-- | tests-clar/diff/patch.c | 4 | ||||
-rw-r--r-- | tests-clar/diff/tree.c | 4 | ||||
-rw-r--r-- | tests-clar/diff/workdir.c | 2 |
7 files changed, 27 insertions, 27 deletions
diff --git a/tests-clar/diff/diff_helpers.c b/tests-clar/diff/diff_helpers.c index 0c4721897..b4c68769e 100644 --- a/tests-clar/diff/diff_helpers.c +++ b/tests-clar/diff/diff_helpers.c @@ -23,7 +23,7 @@ git_tree *resolve_commit_oid_to_tree( int diff_file_fn( void *cb_data, - git_diff_delta *delta, + const git_diff_delta *delta, float progress) { diff_expects *e = cb_data; @@ -48,8 +48,8 @@ int diff_file_fn( int diff_hunk_fn( void *cb_data, - git_diff_delta *delta, - git_diff_range *range, + const git_diff_delta *delta, + const git_diff_range *range, const char *header, size_t header_len) { @@ -67,8 +67,8 @@ int diff_hunk_fn( int diff_line_fn( void *cb_data, - git_diff_delta *delta, - git_diff_range *range, + const git_diff_delta *delta, + const git_diff_range *range, char line_origin, const char *content, size_t content_len) @@ -116,7 +116,7 @@ int diff_foreach_via_iterator( for (d = 0; d < num_d; ++d) { git_diff_patch *patch; - git_diff_delta *delta; + const git_diff_delta *delta; size_t h, num_h; cl_git_pass(git_diff_get_patch(&patch, &delta, diff, d)); @@ -142,7 +142,7 @@ int diff_foreach_via_iterator( num_h = git_diff_patch_num_hunks(patch); for (h = 0; h < num_h; h++) { - git_diff_range *range; + const git_diff_range *range; const char *hdr; size_t hdr_len, l, num_l; diff --git a/tests-clar/diff/diff_helpers.h b/tests-clar/diff/diff_helpers.h index 79e140921..7984294a2 100644 --- a/tests-clar/diff/diff_helpers.h +++ b/tests-clar/diff/diff_helpers.h @@ -27,20 +27,20 @@ typedef struct { extern int diff_file_fn( void *cb_data, - git_diff_delta *delta, + const git_diff_delta *delta, float progress); extern int diff_hunk_fn( void *cb_data, - git_diff_delta *delta, - git_diff_range *range, + const git_diff_delta *delta, + const git_diff_range *range, const char *header, size_t header_len); extern int diff_line_fn( void *cb_data, - git_diff_delta *delta, - git_diff_range *range, + const git_diff_delta *delta, + const git_diff_range *range, char line_origin, const char *content, size_t content_len); diff --git a/tests-clar/diff/diffiter.c b/tests-clar/diff/diffiter.c index 4273b16dd..78f97fc86 100644 --- a/tests-clar/diff/diffiter.c +++ b/tests-clar/diff/diffiter.c @@ -20,7 +20,7 @@ void test_diff_diffiter__create(void) num_d = git_diff_num_deltas(diff); for (d = 0; d < num_d; ++d) { - git_diff_delta *delta; + const git_diff_delta *delta; cl_git_pass(git_diff_get_patch(NULL, &delta, diff, d)); } @@ -40,7 +40,7 @@ void test_diff_diffiter__iterate_files(void) cl_assert_equal_i(6, num_d); for (d = 0; d < num_d; ++d) { - git_diff_delta *delta; + const git_diff_delta *delta; cl_git_pass(git_diff_get_patch(NULL, &delta, diff, d)); cl_assert(delta != NULL); count++; @@ -63,7 +63,7 @@ void test_diff_diffiter__iterate_files_2(void) cl_assert_equal_i(8, num_d); for (d = 0; d < num_d; ++d) { - git_diff_delta *delta; + const git_diff_delta *delta; cl_git_pass(git_diff_get_patch(NULL, &delta, diff, d)); cl_assert(delta != NULL); count++; @@ -91,7 +91,7 @@ void test_diff_diffiter__iterate_files_and_hunks(void) for (d = 0; d < num_d; ++d) { git_diff_patch *patch; - git_diff_delta *delta; + const git_diff_delta *delta; size_t h, num_h; cl_git_pass(git_diff_get_patch(&patch, &delta, diff, d)); @@ -104,7 +104,7 @@ void test_diff_diffiter__iterate_files_and_hunks(void) num_h = git_diff_patch_num_hunks(patch); for (h = 0; h < num_h; h++) { - git_diff_range *range; + const git_diff_range *range; const char *header; size_t header_len, num_l; @@ -143,7 +143,7 @@ void test_diff_diffiter__max_size_threshold(void) for (d = 0; d < num_d; ++d) { git_diff_patch *patch; - git_diff_delta *delta; + const git_diff_delta *delta; cl_git_pass(git_diff_get_patch(&patch, &delta, diff, d)); cl_assert(delta); @@ -178,7 +178,7 @@ void test_diff_diffiter__max_size_threshold(void) for (d = 0; d < num_d; ++d) { git_diff_patch *patch; - git_diff_delta *delta; + const git_diff_delta *delta; cl_git_pass(git_diff_get_patch(&patch, &delta, diff, d)); @@ -221,7 +221,7 @@ void test_diff_diffiter__iterate_all(void) num_d = git_diff_num_deltas(diff); for (d = 0; d < num_d; ++d) { git_diff_patch *patch; - git_diff_delta *delta; + const git_diff_delta *delta; size_t h, num_h; cl_git_pass(git_diff_get_patch(&patch, &delta, diff, d)); @@ -230,7 +230,7 @@ void test_diff_diffiter__iterate_all(void) num_h = git_diff_patch_num_hunks(patch); for (h = 0; h < num_h; h++) { - git_diff_range *range; + const git_diff_range *range; const char *header; size_t header_len, l, num_l; diff --git a/tests-clar/diff/index.c b/tests-clar/diff/index.c index 2c6e89c4a..7c4bddb90 100644 --- a/tests-clar/diff/index.c +++ b/tests-clar/diff/index.c @@ -93,7 +93,7 @@ void test_diff_index__0(void) static int diff_stop_after_2_files( void *cb_data, - git_diff_delta *delta, + const git_diff_delta *delta, float progress) { diff_expects *e = cb_data; diff --git a/tests-clar/diff/patch.c b/tests-clar/diff/patch.c index 05e748667..e8468386c 100644 --- a/tests-clar/diff/patch.c +++ b/tests-clar/diff/patch.c @@ -23,8 +23,8 @@ void test_diff_patch__cleanup(void) static int check_removal_cb( void *cb_data, - git_diff_delta *delta, - git_diff_range *range, + const git_diff_delta *delta, + const git_diff_range *range, char line_origin, const char *formatted_output, size_t output_len) diff --git a/tests-clar/diff/tree.c b/tests-clar/diff/tree.c index 78ab093ed..e62fa2690 100644 --- a/tests-clar/diff/tree.c +++ b/tests-clar/diff/tree.c @@ -265,9 +265,9 @@ void test_diff_tree__larger_hunks(void) git_diff_options opts = {0}; git_diff_list *diff = NULL; size_t d, num_d, h, num_h, l, num_l, header_len, line_len; - git_diff_delta *delta; + const git_diff_delta *delta; git_diff_patch *patch; - git_diff_range *range; + const git_diff_range *range; const char *header, *line; char origin; diff --git a/tests-clar/diff/workdir.c b/tests-clar/diff/workdir.c index 612e44303..916113178 100644 --- a/tests-clar/diff/workdir.c +++ b/tests-clar/diff/workdir.c @@ -691,7 +691,7 @@ void test_diff_workdir__larger_hunks(void) for (i = 0; i <= 2; ++i) { git_diff_list *diff = NULL; git_diff_patch *patch; - git_diff_range *range; + const git_diff_range *range; const char *header, *line; char origin; |