user-manual: minor editing for conciseness

[git.git] / tree-walk.h

diff --git a/tree-walk.h b/tree-walk.h
index ca0c29fb1ac7d6e5c0d364fd27845515de151469..ee747aba0bec914bd8f5c7a5285c8395ba5f489b 100644 (file)
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -1,17 +1,25 @@
 #ifndef TREE_WALK_H
 #define TREE_WALK_H
 
-struct tree_desc {
-       const void *buffer;
-       unsigned int size;
-};
-
 struct name_entry {
        const unsigned char *sha1;
        const char *path;
        unsigned int mode;
 };
 
+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;
@@ -19,7 +27,6 @@ static inline int tree_entry_len(const char *name, const unsigned char *sha1)
 
 void update_tree_entry(struct tree_desc *);
 void init_tree_desc(struct tree_desc *desc, const void *buf, unsigned long size);
-const unsigned char *tree_entry_extract(struct tree_desc *, const char **, unsigned int *);
 
 /* Helper function that does both of the above and returns true for success */
 int tree_entry(struct tree_desc *, struct name_entry *);