diff options
| author |  Michael Haggerty <mhagger@alum.mit.edu> | 2017-08-26 10:28:03 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-08-26 09:21:01 -0700 |
| commit | a281639262238a315843a629a7686cff453d6fac (patch) | |
| tree | 5652b33811c86f727ee6b20e44a24494448868e3 | |
| parent | load_subtree(): remove unnecessary conditional (diff) | |
| download | tgif-a281639262238a315843a629a7686cff453d6fac.tar.xz | |
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>
| -rw-r--r-- | notes.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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.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)) { - 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) |