Clean-up trivially redundant diff.

diff --git a/diff.h b/diff.h
index 9a0169c03ceb82b5cc2c246fa9f70e2f8399ec33..a268d16ff712e29fbccab779824551757f99837d 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -4,14 +4,7 @@
 #ifndef DIFF_H
 #define DIFF_H
 
-#define DIFF_FILE_CANON_MODE(mode) \
-       (S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \
-       S_ISLNK(mode) ? S_IFLNK : S_IFDIR)
-
-struct tree_desc {
-       void *buf;
-       unsigned long size;
-};
+#include "tree-walk.h"
 
 struct diff_options;
 
@@ -60,14 +53,23 @@ struct combine_diff_path {
        struct combine_diff_path *next;
        int len;
        char *path;
+       unsigned int mode;
        unsigned char sha1[20];
-       unsigned char parent_sha1[FLEX_ARRAY][20];
+       struct combine_diff_parent {
+               char status;
+               unsigned int mode;
+               unsigned char sha1[20];
+       } parent[FLEX_ARRAY];
 };
+#define combine_diff_path_size(n, l) \
+       (sizeof(struct combine_diff_path) + \
+        sizeof(struct combine_diff_parent) * (n) + (l) + 1)
 
-int show_combined_diff(struct combine_diff_path *elem, int num_parent,
-                      int dense, const char *header, int show_empty);
+extern int show_combined_diff(struct combine_diff_path *elem, int num_parent,
+                             int dense, const char *header,
+                             struct diff_options *);
 
-extern int diff_tree_combined_merge(const unsigned char *sha1, const char *, int, int);
+extern const char *diff_tree_combined_merge(const unsigned char *sha1, const char *, int, struct diff_options *opt);
 
 extern void diff_addremove(struct diff_options *,
                           int addremove,