Do not over-quote the -f envelopesender value.

[git.git] / tree-walk.h

diff --git a/tree-walk.h b/tree-walk.h
index e57befa4dac0854906d5b792ce546dab0e6dcdc3..db0fbdc701f1ef63cdc1a8b7d5c5e72322f91426 100644 (file)
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -1,20 +1,32 @@
 #ifndef TREE_WALK_H
 #define TREE_WALK_H
 
-struct tree_desc {
-       const 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 (const char *)sha1 - 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 *);