Add shared diff-handling functions

[ps-cgit] / ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index b6486f15444b4199096cc50df28beddd0978b116..0ad9faf7f13e40049e7d690a31724ad1eb94f807 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -7,7 +7,6 @@
  */
 
 #include "cgit.h"
  */
 
 #include "cgit.h"

-#include "xdiff.h"

 
 char *diff_buffer;
 int diff_buffer_size;
 
 char *diff_buffer;
 int diff_buffer_size;


@@ -82,13 +81,13 @@ int diff_cb(void *priv_, mmbuffer_t *mb, int nbuf)
 
 static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
 {
 
 static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
 {

-       char type[20];
+       enum object_type type;

 
        if (is_null_sha1(sha1)) {
                file->ptr = (char *)"";
                file->size = 0;
        } else {
 
        if (is_null_sha1(sha1)) {
                file->ptr = (char *)"";
                file->size = 0;
        } else {

-               file->ptr = read_sha1_file(sha1, type, &file->size);
+               file->ptr = read_sha1_file(sha1, &type, &file->size);

        }
        return 1;
 }
        }
        return 1;
 }