|
diff --git a/shared.c b/shared.c index 89d1bab..a764c4d 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -258,28 +258,30 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
258 | int cgit_diff_files(const unsigned char *old_sha1, |
258 | int cgit_diff_files(const unsigned char *old_sha1, |
259 | const unsigned char *new_sha1, |
259 | const unsigned char *new_sha1, |
260 | linediff_fn fn) |
260 | linediff_fn fn) |
261 | { |
261 | { |
262 | mmfile_t file1, file2; |
262 | mmfile_t file1, file2; |
263 | xpparam_t diff_params; |
263 | xpparam_t diff_params; |
264 | xdemitconf_t emit_params; |
264 | xdemitconf_t emit_params; |
265 | xdemitcb_t emit_cb; |
265 | xdemitcb_t emit_cb; |
266 | |
266 | |
267 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
267 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
268 | return 1; |
268 | return 1; |
269 | |
269 | |
| |
270 | memset(&diff_params, 0, sizeof(diff_params)); |
| |
271 | memset(&emit_params, 0, sizeof(emit_params)); |
| |
272 | memset(&emit_cb, 0, sizeof(emit_cb)); |
270 | diff_params.flags = XDF_NEED_MINIMAL; |
273 | diff_params.flags = XDF_NEED_MINIMAL; |
271 | emit_params.ctxlen = 3; |
274 | emit_params.ctxlen = 3; |
272 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
275 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
273 | emit_params.find_func = NULL; |
| |
274 | emit_cb.outf = filediff_cb; |
276 | emit_cb.outf = filediff_cb; |
275 | emit_cb.priv = fn; |
277 | emit_cb.priv = fn; |
276 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
278 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
277 | return 0; |
279 | return 0; |
278 | } |
280 | } |
279 | |
281 | |
280 | void cgit_diff_tree(const unsigned char *old_sha1, |
282 | void cgit_diff_tree(const unsigned char *old_sha1, |
281 | const unsigned char *new_sha1, |
283 | const unsigned char *new_sha1, |
282 | filepair_fn fn, const char *prefix) |
284 | filepair_fn fn, const char *prefix) |
283 | { |
285 | { |
284 | struct diff_options opt; |
286 | struct diff_options opt; |
285 | int ret; |
287 | int ret; |
|