X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=tree-walk.h;h=ee747aba0bec914bd8f5c7a5285c8395ba5f489b;hb=4c7100a9f438c281c18c800b450ea12045d22d62;hp=47438fe1c08a8e119fd08aea0eac612c76c21a66;hpb=3155ef8a4a88dca15fb49855b28cac80666efe5c;p=git.git

diff --git a/tree-walk.h b/tree-walk.h
index 47438fe1c..ee747aba0 100644
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -1,20 +1,35 @@
 #ifndef TREE_WALK_H
 #define TREE_WALK_H
 
-struct tree_desc {
-	void *buf;
-	unsigned long size;
-};
-
 struct name_entry {
 	const unsigned char *sha1;
 	const char *path;
 	unsigned int mode;
-	int pathlen;
 };
 
+struct tree_desc {
+	const void *buffer;
+	struct name_entry entry;
+	unsigned int size;
+};
+
+static inline const unsigned char *tree_entry_extract(struct tree_desc *desc, const char **pathp, unsigned int *modep)
+{
+	*pathp = desc->entry.path;
+	*modep = canon_mode(desc->entry.mode);
+	return desc->entry.sha1;
+}
+
+static inline int tree_entry_len(const char *name, const unsigned char *sha1)
+{
+	return (char *)sha1 - (char *)name - 1;
+}
+
 void update_tree_entry(struct tree_desc *);
-const unsigned char *tree_entry_extract(struct tree_desc *, const char **, unsigned int *);
+void init_tree_desc(struct tree_desc *desc, const void *buf, unsigned long size);
+
+/* Helper function that does both of the above and returns true for success */
+int tree_entry(struct tree_desc *, struct name_entry *);
 
 void *fill_tree_descriptor(struct tree_desc *desc, const unsigned char *sha1);