summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-30 06:55:43 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-30 07:54:13 (GMT)
commit1b0c7174a17de801051402ed35ac085ebd91e88c (patch)
tree31a806fd8bf26fe1ecf42f62c82bb68f16fbc150 /diff.h
parente464f4c3119b04712ab87329f3dd4d4f21b0a8a7 (diff)
downloadgit-1b0c7174a17de801051402ed35ac085ebd91e88c.zip
git-1b0c7174a17de801051402ed35ac085ebd91e88c.tar.gz
git-1b0c7174a17de801051402ed35ac085ebd91e88c.tar.bz2
tree/diff header cleanup.
Introduce tree-walk.[ch] and move "struct tree_desc" and associated functions from various places. Rename DIFF_FILE_CANON_MODE(mode) macro to canon_mode(mode) and move it to cache.h. This macro returns the canonicalized st_mode value in the host byte order for files, symlinks and directories -- to be compared with a tree_desc entry. create_ce_mode(mode) in cache.h is similar but is intended to be used for index entries (so it does not work for directories) and returns the value in the network byte order. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h12
1 files changed, 1 insertions, 11 deletions
diff --git a/diff.h b/diff.h
index 8fac465..a268d16 100644
--- a/diff.h
+++ b/diff.h
@@ -4,17 +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;
-};
-
-extern void update_tree_entry(struct tree_desc *);
-extern const unsigned char *tree_entry_extract(struct tree_desc *, const char **, unsigned int *);
+#include "tree-walk.h"
struct diff_options;