|
diff --git a/shared.c b/shared.c index 6e8f0ce..7cf1e59 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -259,13 +259,14 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
259 | } |
259 | } |
260 | return 0; |
260 | return 0; |
261 | } |
261 | } |
262 | |
262 | |
263 | int cgit_diff_files(const unsigned char *old_sha1, |
263 | int cgit_diff_files(const unsigned char *old_sha1, |
264 | const unsigned char *new_sha1, unsigned long *old_size, |
264 | const unsigned char *new_sha1, unsigned long *old_size, |
265 | unsigned long *new_size, int *binary, linediff_fn fn) |
265 | unsigned long *new_size, int *binary, int context, |
| |
266 | linediff_fn fn) |
266 | { |
267 | { |
267 | mmfile_t file1, file2; |
268 | mmfile_t file1, file2; |
268 | xpparam_t diff_params; |
269 | xpparam_t diff_params; |
269 | xdemitconf_t emit_params; |
270 | xdemitconf_t emit_params; |
270 | xdemitcb_t emit_cb; |
271 | xdemitcb_t emit_cb; |
271 | |
272 | |
@@ -282,13 +283,13 @@ int cgit_diff_files(const unsigned char *old_sha1, |
282 | } |
283 | } |
283 | |
284 | |
284 | memset(&diff_params, 0, sizeof(diff_params)); |
285 | memset(&diff_params, 0, sizeof(diff_params)); |
285 | memset(&emit_params, 0, sizeof(emit_params)); |
286 | memset(&emit_params, 0, sizeof(emit_params)); |
286 | memset(&emit_cb, 0, sizeof(emit_cb)); |
287 | memset(&emit_cb, 0, sizeof(emit_cb)); |
287 | diff_params.flags = XDF_NEED_MINIMAL; |
288 | diff_params.flags = XDF_NEED_MINIMAL; |
288 | emit_params.ctxlen = 3; |
289 | emit_params.ctxlen = context > 0 ? context : 3; |
289 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
290 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
290 | emit_cb.outf = filediff_cb; |
291 | emit_cb.outf = filediff_cb; |
291 | emit_cb.priv = fn; |
292 | emit_cb.priv = fn; |
292 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
293 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
293 | return 0; |
294 | return 0; |
294 | } |
295 | } |
|