about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2008-12-26 11:02:02 +0100
committerLars Hjemli2008-12-26 11:02:02 +0100
commit0edf76078e6a36ba502e6ffb97021166ea459a7f (patch)
tree7c3392f15eaa75855be9777da59f7f655c93af92
parentMerge branch 'stable' (diff)
downloadcgit-0edf76078e6a36ba502e6ffb97021166ea459a7f.tar.gz
cgit-0edf76078e6a36ba502e6ffb97021166ea459a7f.zip
shared.c: future-proof usage of git diff-structures
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r--shared.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/shared.c b/shared.c index 89d1bab..a764c4d 100644 --- a/shared.c +++ b/shared.c
@@ -267,10 +267,12 @@ int cgit_diff_files(const unsigned char *old_sha1,
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);