|
diff --git a/shared.c b/shared.c index 58837dc..06f70bb 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -260,13 +260,14 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
260 | } |
260 | } |
261 | return 0; |
261 | return 0; |
262 | } |
262 | } |
263 | |
263 | |
264 | int cgit_diff_files(const unsigned char *old_sha1, |
264 | int cgit_diff_files(const unsigned char *old_sha1, |
265 | const unsigned char *new_sha1, unsigned long *old_size, |
265 | const unsigned char *new_sha1, unsigned long *old_size, |
266 | unsigned long *new_size, int *binary, linediff_fn fn) |
266 | unsigned long *new_size, int *binary, int context, |
| |
267 | linediff_fn fn) |
267 | { |
268 | { |
268 | mmfile_t file1, file2; |
269 | mmfile_t file1, file2; |
269 | xpparam_t diff_params; |
270 | xpparam_t diff_params; |
270 | xdemitconf_t emit_params; |
271 | xdemitconf_t emit_params; |
271 | xdemitcb_t emit_cb; |
272 | xdemitcb_t emit_cb; |
272 | |
273 | |
@@ -287,13 +288,13 @@ int cgit_diff_files(const unsigned char *old_sha1, |
287 | } |
288 | } |
288 | |
289 | |
289 | memset(&diff_params, 0, sizeof(diff_params)); |
290 | memset(&diff_params, 0, sizeof(diff_params)); |
290 | memset(&emit_params, 0, sizeof(emit_params)); |
291 | memset(&emit_params, 0, sizeof(emit_params)); |
291 | memset(&emit_cb, 0, sizeof(emit_cb)); |
292 | memset(&emit_cb, 0, sizeof(emit_cb)); |
292 | diff_params.flags = XDF_NEED_MINIMAL; |
293 | diff_params.flags = XDF_NEED_MINIMAL; |
293 | emit_params.ctxlen = 3; |
294 | emit_params.ctxlen = context > 0 ? context : 3; |
294 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
295 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
295 | emit_cb.outf = filediff_cb; |
296 | emit_cb.outf = filediff_cb; |
296 | emit_cb.priv = fn; |
297 | emit_cb.priv = fn; |
297 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
298 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
298 | if (file1.size) |
299 | if (file1.size) |
299 | free(file1.ptr); |
300 | free(file1.ptr); |
|