diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 16:16:12 +0200 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 16:16:12 +0200 |
| commit | 6f92f332e6a9ee3e16051bda9fe148607af67f65 (patch) | |
| tree | 49cb7d145fbf40793b220efdc92cd80ab2c6ca05 /shared.c | |
| parent | Merge branch 'jh/path-limit' (diff) | |
| parent | ui-diff: Add links to increase/decrease number of context lines in diffs (diff) | |
| download | cgit-pink-6f92f332e6a9ee3e16051bda9fe148607af67f65.tar.gz cgit-pink-6f92f332e6a9ee3e16051bda9fe148607af67f65.zip | |
Merge branch 'jh/context-lines'
Conflicts: cgit.c cgit.h
Diffstat (limited to '')
| -rw-r--r-- | shared.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/shared.c b/shared.c index 58837dc..06f70bb 100644 --- a/shared.c +++ b/shared.c @@ -263,7 +263,8 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) int cgit_diff_files(const unsigned char *old_sha1, const unsigned char *new_sha1, unsigned long *old_size, - unsigned long *new_size, int *binary, linediff_fn fn) + unsigned long *new_size, int *binary, int context, + linediff_fn fn) { mmfile_t file1, file2; xpparam_t diff_params; @@ -290,7 +291,7 @@ int cgit_diff_files(const unsigned char *old_sha1, memset(&emit_params, 0, sizeof(emit_params)); memset(&emit_cb, 0, sizeof(emit_cb)); diff_params.flags = XDF_NEED_MINIMAL; - emit_params.ctxlen = 3; + emit_params.ctxlen = context > 0 ? context : 3; emit_params.flags = XDL_EMIT_FUNCNAMES; emit_cb.outf = filediff_cb; emit_cb.priv = fn; |