diff options
| author | Ben Straub <bs@github.com> | 2012-11-27 18:59:22 -0800 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2012-11-27 18:59:22 -0800 |
| commit | 64c5112188647fcbfbe2bbfb897abfbc21912ba8 (patch) | |
| tree | 5113408a049178d14664f72cc1666655783d95d5 /tests-clar/diff/patch.c | |
| parent | 469827812f95e979e3c6468567b2c9ed138a9849 (diff) | |
| parent | ca94e031fa21787ae6336f0aada1b01b2dd22077 (diff) | |
| download | libgit2-64c5112188647fcbfbe2bbfb897abfbc21912ba8.tar.gz | |
Merge pull request #1087 from libgit2/great-renaming
The Great Renaming of 2012
Diffstat (limited to 'tests-clar/diff/patch.c')
| -rw-r--r-- | tests-clar/diff/patch.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests-clar/diff/patch.c b/tests-clar/diff/patch.c index 6aaf7651f..6a3c5bc39 100644 --- a/tests-clar/diff/patch.c +++ b/tests-clar/diff/patch.c @@ -22,14 +22,14 @@ void test_diff_patch__cleanup(void) #define EXPECTED_HUNK "@@ -1,2 +0,0 @@\n" static int check_removal_cb( - void *cb_data, const git_diff_delta *delta, const git_diff_range *range, char line_origin, const char *formatted_output, - size_t output_len) + size_t output_len, + void *payload) { - GIT_UNUSED(cb_data); + GIT_UNUSED(payload); GIT_UNUSED(output_len); switch (line_origin) { @@ -90,7 +90,7 @@ void test_diff_patch__can_properly_display_the_removal_of_a_file(void) cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, one, another, NULL)); - cl_git_pass(git_diff_print_patch(diff, NULL, check_removal_cb)); + cl_git_pass(git_diff_print_patch(diff, check_removal_cb, NULL)); git_diff_list_free(diff); @@ -113,7 +113,7 @@ void test_diff_patch__to_string(void) cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, one, another, NULL)); - cl_assert_equal_i(1, git_diff_num_deltas(diff)); + cl_assert_equal_i(1, (int)git_diff_num_deltas(diff)); cl_git_pass(git_diff_get_patch(&patch, NULL, diff, 0)); |