aboutsummaryrefslogtreecommitdiffstats
path: root/ui-diff.c
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2007-05-09 05:40:59 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2007-05-09 06:38:49 (JST)
commit61c3ca978c586c673aec618cb94210657278dda8 (patch)
tree7011987769e65ad0e7aa8b79f648357e9cd88c30 /ui-diff.c
parent66cacd053ba900c8eb3b7962027370c84a97f990 (diff)
downloadcgit-61c3ca978c586c673aec618cb94210657278dda8.zip
cgit-61c3ca978c586c673aec618cb94210657278dda8.tar.gz
Update to libgit 1.5.2-rc2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-diff.c')
-rw-r--r--ui-diff.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/ui-diff.c b/ui-diff.c
index b6486f1..0ad9faf 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -7,7 +7,6 @@
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "xdiff.h"
11 10
12char *diff_buffer; 11char *diff_buffer;
13int diff_buffer_size; 12int diff_buffer_size;
@@ -82,13 +81,13 @@ int diff_cb(void *priv_, mmbuffer_t *mb, int nbuf)
82 81
83static int load_mmfile(mmfile_t *file, const unsigned char *sha1) 82static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
84{ 83{
85 char type[20]; 84 enum object_type type;
86 85
87 if (is_null_sha1(sha1)) { 86 if (is_null_sha1(sha1)) {
88 file->ptr = (char *)""; 87 file->ptr = (char *)"";
89 file->size = 0; 88 file->size = 0;
90 } else { 89 } else {
91 file->ptr = read_sha1_file(sha1, type, &file->size); 90 file->ptr = read_sha1_file(sha1, &type, &file->size);
92 } 91 }
93 return 1; 92 return 1;
94} 93}