xdiff-interface: hide the whole "xdiff_emit_state" business from the caller

[git/git.git] / builtin-blame.c

diff --git a/builtin-blame.c b/builtin-blame.c
index 8cca3b1..e4d12de 100644 (file)
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -465,7 +465,6 @@ struct patch {
 };
 
 struct blame_diff_state {
 };
 
 struct blame_diff_state {

-       struct xdiff_emit_state xm;

        struct patch *ret;
        unsigned hunk_post_context;
        unsigned hunk_in_pre_context : 1;
        struct patch *ret;
        unsigned hunk_post_context;
        unsigned hunk_in_pre_context : 1;


@@ -529,12 +528,11 @@ static struct patch *compare_buffer(mmfile_t *file_p, mmfile_t *file_o,
        memset(&xecfg, 0, sizeof(xecfg));
        xecfg.ctxlen = context;
        memset(&state, 0, sizeof(state));
        memset(&xecfg, 0, sizeof(xecfg));
        xecfg.ctxlen = context;
        memset(&state, 0, sizeof(state));

-       state.xm.consume = process_u_diff;

        state.ret = xmalloc(sizeof(struct patch));
        state.ret->chunks = NULL;
        state.ret->num = 0;
 
        state.ret = xmalloc(sizeof(struct patch));
        state.ret->chunks = NULL;
        state.ret->num = 0;
 

-       xdi_diff_outf(file_p, file_o, &state.xm, &xpp, &xecfg, &ecb);
+       xdi_diff_outf(file_p, file_o, process_u_diff, &state, &xpp, &xecfg, &ecb);

 
        if (state.ret->num) {
                struct chunk *chunk;
 
        if (state.ret->num) {
                struct chunk *chunk;