X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin-blame.c;h=6b7b9f4466989ca02d3a5e53caac9ff5c7e8a922;hb=c9c6cc8d7db312b9e8502f8d55422b8309cde2f3;hp=9bc901c2922403dcf73c8275da73d6d37d220729;hpb=7ceacdffc5c05f9a763b4cb6ea7cb528004643c3;p=git.git

diff --git a/builtin-blame.c b/builtin-blame.c
index 9bc901c29..6b7b9f446 100644
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -464,7 +464,6 @@ struct patch {
 };
 
 struct blame_diff_state {
-	struct xdiff_emit_state xm;
 	struct patch *ret;
 	unsigned hunk_post_context;
 	unsigned hunk_in_pre_context : 1;
@@ -527,15 +526,12 @@ static struct patch *compare_buffer(mmfile_t *file_p, mmfile_t *file_o,
 	xpp.flags = xdl_opts;
 	memset(&xecfg, 0, sizeof(xecfg));
 	xecfg.ctxlen = context;
-	ecb.outf = xdiff_outf;
-	ecb.priv = &state;
 	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;
 
-	xdi_diff(file_p, file_o, &xpp, &xecfg, &ecb);
+	xdi_diff_outf(file_p, file_o, process_u_diff, &state, &xpp, &xecfg, &ecb);
 
 	if (state.ret->num) {
 		struct chunk *chunk;