about summary refs log tree commit diff
path: root/ui-log.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2009-02-01 19:29:47 +0100
committerLars Hjemli <hjemli@gmail.com>2009-02-01 19:29:47 +0100
commit5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6 (patch)
tree823678b1c4a907cf0df50067c27fb5b752114df5 /ui-log.c
parentMerge branch 'lh/header' (diff)
parentshared.c: avoid SEGFAULT when checking for binary buffers (diff)
downloadcgit-pink-5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6.tar.gz
cgit-pink-5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6.zip
Merge branch 'lh/binary'
Diffstat (limited to '')
-rw-r--r--ui-log.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/ui-log.c b/ui-log.c
index 3202848..ba2ab03 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -26,9 +26,14 @@ void count_lines(char *line, int size)
 
 void inspect_files(struct diff_filepair *pair)
 {
+	unsigned long old_size = 0;
+	unsigned long new_size = 0;
+	int binary = 0;
+
 	files++;
 	if (ctx.repo->enable_log_linecount)
-		cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
+		cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
+				&new_size, &binary, count_lines);
 }
 
 void show_commit_decorations(struct commit *commit)