tree-diff: simplify tree_entry_pathcmp
Since an earlier "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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Kirill Smelkov committed
Feb 24, 2014 at 20:21 UTC
1a27a1545230a5a19a3c05ed41efb8530d2fd2cd
1 file changed
+6
-11
tree-diff.c
+6
-11
@@ -15,18 +15,13 @@
15
*/
16
static int tree_entry_pathcmp(struct tree_desc *t1, struct tree_desc *t2)
17
{
18
- unsigned mode1, mode2;
19
- const char *path1, *path2;
20
- const unsigned char *sha1, *sha2;
21
- int cmp, pathlen1, pathlen2;
18
+ struct name_entry *e1, *e2;
19
+ int cmp;
20
23
- sha1 = tree_entry_extract(t1, &path1, &mode1);
24
- sha2 = tree_entry_extract(t2, &path2, &mode2);
25
-
26
- pathlen1 = tree_entry_len(&t1->entry);
27
- pathlen2 = tree_entry_len(&t2->entry);
28
-
29
- cmp = base_name_compare(path1, pathlen1, mode1, path2, pathlen2, mode2);
21
+ e1 = &t1->entry;
22
+ e2 = &t2->entry;
23
+ cmp = base_name_compare(e1->path, tree_entry_len(e1), e1->mode,
24
+ e2->path, tree_entry_len(e2), e2->mode);
25
return cmp;
26
}
27