[PATCH 07/11] tree-diff: simplify tree_entry_pathcmp
- From
Kirill Smelkov <kirr@mns.spb.ru>
- Date
- Feb 7, 2014, 17:48 UTC
- Message-ID
- <9186fb9d2c223241923111d4fd9b5360e474957e.1391794688.git.kirr@mns.spb.ru>
- In-Reply-To
- <cover.1391794688.git.kirr@mns.spb.ru>
Since 74aa4a18 (Finally switch over tree descriptors to contain a pre-parsed entry) we can safely access all tree_desc->entry fields directly instead of first "extracting" them through tree_entry_extract.
Use it. The code generated stays the same - only it now visually looks cleaner.
Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru> --- tree-diff.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/tree-diff.c b/tree-diff.c index 604dc57..330ca07 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -15,18 +15,13 @@ */ static int tree_entry_pathcmp(struct tree_desc *t1, struct tree_desc *t2) { - unsigned mode1, mode2; - const char *path1, *path2; - const unsigned char *sha1, *sha2; - int cmp, pathlen1, pathlen2; + struct name_entry *e1, *e2; + int cmp; - sha1 = tree_entry_extract(t1, &path1, &mode1); - sha2 = tree_entry_extract(t2, &path2, &mode2); - - pathlen1 = tree_entry_len(&t1->entry); - pathlen2 = tree_entry_len(&t2->entry); - - cmp = base_name_compare(path1, pathlen1, mode1, path2, pathlen2, mode2); + e1 = &t1->entry; + e2 = &t2->entry; + cmp = base_name_compare(e1->path, tree_entry_len(e1), e1->mode, + e2->path, tree_entry_len(e2), e2->mode); return cmp; }
-- 1.9.rc1.181.g641f458