diff options
| author | Kirill Smelkov <kirr@mns.spb.ru> | 2014-02-24 16:21:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-20 22:04:32 (GMT) |
| commit | 1a27a1545230a5a19a3c05ed41efb8530d2fd2cd (patch) | |
| tree | fbd3772d57a5f3346d5b382371f3b385cc8d42d2 /tree-diff.c | |
| parent | 5acabd84a6656a4f568f0e934cc9e1b344ed39d4 (diff) | |
| download | git-1a27a1545230a5a19a3c05ed41efb8530d2fd2cd.zip git-1a27a1545230a5a19a3c05ed41efb8530d2fd2cd.tar.gz git-1a27a1545230a5a19a3c05ed41efb8530d2fd2cd.tar.bz2 | |
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>
Diffstat (limited to 'tree-diff.c')
| -rw-r--r-- | tree-diff.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/tree-diff.c b/tree-diff.c index 73fa9bea..f8b2607 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; } |