diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-11-24 15:19:59 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2016-05-26 13:01:08 -0500 |
| commit | 8d44f8b78f7929c86b9e37acfe40fe707815bca6 (patch) | |
| tree | 3cc10ccde05acd66e67a9d196bcc105e1190cdfe /src/diff_xdiff.c | |
| parent | 53571f2f0c5cbb30e86aa0b8095f51c09c85761e (diff) | |
| download | libgit2-8d44f8b78f7929c86b9e37acfe40fe707815bca6.tar.gz | |
patch: `patch_diff` -> `patch_generated`
Diffstat (limited to 'src/diff_xdiff.c')
| -rw-r--r-- | src/diff_xdiff.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/diff_xdiff.c b/src/diff_xdiff.c index 8017c9541..5bd6381b5 100644 --- a/src/diff_xdiff.c +++ b/src/diff_xdiff.c @@ -9,7 +9,7 @@ #include "diff.h" #include "diff_driver.h" #include "diff_xdiff.h" -#include "patch_diff.h" +#include "patch_generate.h" static int git_xdiff_scan_int(const char **str, int *value) { @@ -56,7 +56,7 @@ fail: typedef struct { git_xdiff_output *xo; - git_patch_diff *patch; + git_patch_generated *patch; git_diff_hunk hunk; int old_lineno, new_lineno; mmfile_t xd_old_data, xd_new_data; @@ -110,9 +110,9 @@ static int diff_update_lines( static int git_xdiff_cb(void *priv, mmbuffer_t *bufs, int len) { git_xdiff_info *info = priv; - git_patch_diff *patch = info->patch; + git_patch_generated *patch = info->patch; const git_diff_delta *delta = patch->base.delta; - git_patch_diff_output *output = &info->xo->output; + git_patch_generated_output *output = &info->xo->output; git_diff_line line; if (len == 1) { @@ -181,7 +181,7 @@ static int git_xdiff_cb(void *priv, mmbuffer_t *bufs, int len) return output->error; } -static int git_xdiff(git_patch_diff_output *output, git_patch_diff *patch) +static int git_xdiff(git_patch_generated_output *output, git_patch_generated *patch) { git_xdiff_output *xo = (git_xdiff_output *)output; git_xdiff_info info; @@ -194,7 +194,7 @@ static int git_xdiff(git_patch_diff_output *output, git_patch_diff *patch) xo->callback.priv = &info; git_diff_find_context_init( - &xo->config.find_func, &findctxt, git_patch_diff_driver(patch)); + &xo->config.find_func, &findctxt, git_patch_generated_driver(patch)); xo->config.find_func_priv = &findctxt; if (xo->config.find_func != NULL) @@ -206,8 +206,8 @@ static int git_xdiff(git_patch_diff_output *output, git_patch_diff *patch) * updates are needed to xo->params.flags */ - git_patch_diff_old_data(&info.xd_old_data.ptr, &info.xd_old_data.size, patch); - git_patch_diff_new_data(&info.xd_new_data.ptr, &info.xd_new_data.size, patch); + git_patch_generated_old_data(&info.xd_old_data.ptr, &info.xd_old_data.size, patch); + git_patch_generated_new_data(&info.xd_new_data.ptr, &info.xd_new_data.size, patch); if (info.xd_old_data.size > GIT_XDIFF_MAX_SIZE || info.xd_new_data.size > GIT_XDIFF_MAX_SIZE) { |