From cfbe4be3fb639d96587974794fe437ace0c383c4 Mon Sep 17 00:00:00 2001 From: Vicent Marti Date: Sat, 17 Nov 2012 19:54:47 -0800 Subject: More external API cleanup Conflicts: src/branch.c tests-clar/refs/branches/create.c --- src/diff_output.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/diff_output.h') diff --git a/src/diff_output.h b/src/diff_output.h index f74dd3a71..8d7b5e472 100644 --- a/src/diff_output.h +++ b/src/diff_output.h @@ -27,9 +27,9 @@ typedef struct { git_repository *repo; git_diff_list *diff; const git_diff_options *opts; - git_diff_file_fn file_cb; - git_diff_hunk_fn hunk_cb; - git_diff_data_fn data_cb; + git_diff_file_cb file_cb; + git_diff_hunk_cb hunk_cb; + git_diff_data_cb data_cb; void *cb_data; int cb_error; git_diff_range cb_range; -- cgit v1.2.1 From 793c4385597d0786242e17c8ef37cdfa83f1865c Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Tue, 20 Nov 2012 16:36:06 -0800 Subject: Update diff callback param order This makes the diff functions that take callbacks both take the payload parameter after the callback function pointers and pass the payload as the last argument to the callback function instead of the first. This should make them consistent with other callbacks across the API. --- src/diff_output.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/diff_output.h') diff --git a/src/diff_output.h b/src/diff_output.h index 8d7b5e472..13f2a120d 100644 --- a/src/diff_output.h +++ b/src/diff_output.h @@ -30,9 +30,9 @@ typedef struct { git_diff_file_cb file_cb; git_diff_hunk_cb hunk_cb; git_diff_data_cb data_cb; - void *cb_data; - int cb_error; - git_diff_range cb_range; + void *payload; + int error; + git_diff_range range; xdemitconf_t xdiff_config; xpparam_t xdiff_params; } diff_context; @@ -86,7 +86,7 @@ typedef struct { extern int git_diff__paired_foreach( git_diff_list *idx2head, git_diff_list *wd2idx, - int (*cb)(void *cbref, git_diff_delta *i2h, git_diff_delta *w2i), - void *cbref); + int (*cb)(git_diff_delta *i2h, git_diff_delta *w2i, void *payload), + void *payload); #endif -- cgit v1.2.1