load_subtree(): reduce the scope of some local variables

Declare the variables inside the loop, to make it more obvious that
their values are not carried across loop iterations.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/notes.c b/notes.c
index a8b937173639c6defea70d41a1e09257504b1b87..c33aead864a691c251f1050046f05a4cbfe214e6 100644 (file)
--- a/notes.c
+++ b/notes.c
@@ -421,9 +421,6 @@ static void load_subtree(struct notes_tree *t, struct leaf_node *subtree,
        void *buf;
        struct tree_desc desc;
        struct name_entry entry;
        void *buf;
        struct tree_desc desc;
        struct name_entry entry;

-       int len, path_len;
-       unsigned char type;
-       struct leaf_node *l;

 
        buf = fill_tree_descriptor(&desc, subtree->val_oid.hash);
        if (!buf)
 
        buf = fill_tree_descriptor(&desc, subtree->val_oid.hash);
        if (!buf)


@@ -434,7 +431,10 @@ static void load_subtree(struct notes_tree *t, struct leaf_node *subtree,
        assert(prefix_len * 2 >= n);
        memcpy(object_oid.hash, subtree->key_oid.hash, prefix_len);
        while (tree_entry(&desc, &entry)) {
        assert(prefix_len * 2 >= n);
        memcpy(object_oid.hash, subtree->key_oid.hash, prefix_len);
        while (tree_entry(&desc, &entry)) {

-               path_len = strlen(entry.path);
+               unsigned char type;
+               struct leaf_node *l;
+               int len, path_len = strlen(entry.path);
+

                len = get_oid_hex_segment(entry.path, path_len,
                                object_oid.hash + prefix_len, GIT_SHA1_RAWSZ - prefix_len);
                if (len < 0)
                len = get_oid_hex_segment(entry.path, path_len,
                                object_oid.hash + prefix_len, GIT_SHA1_RAWSZ - prefix_len);
                if (len < 0)