[PATCH 03/12] load_subtree(): reduce the scope of some local variables
- From
Michael Haggerty <mhagger@alum.mit.edu>
- Date
- Aug 26, 2017, 08:28 UTC
- Message-ID
- <c92a4da68db645185a7a3fa2a1584724882ad268.1503734566.git.mhagger@alum.mit.edu>
- In-Reply-To
- <cover.1503734566.git.mhagger@alum.mit.edu>
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> --- notes.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/notes.c b/notes.c index f7ce64ff48..fbed8c3013 100644 --- 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; - int len, path_len; - unsigned char type; - struct leaf_node *l; buf = fill_tree_descriptor(&desc, &subtree->val_oid); 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)) { - 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)
-- 2.11.0