diff options
Diffstat (limited to 'src/tree.c')
| -rw-r--r-- | src/tree.c | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/src/tree.c b/src/tree.c index 5cef676ee..e8cf17979 100644 --- a/src/tree.c +++ b/src/tree.c @@ -174,6 +174,14 @@ int git_tree_entry_2object(git_object **object_out, git_tree_entry *entry) return git_repository_lookup(object_out, entry->owner->object.repo, &entry->oid, GIT_OBJ_ANY); } +static void sort_entries(git_tree *tree) +{ + if (tree->sorted == 0) { + git_vector_sort(&tree->entries); + tree->sorted = 1; + } +} + git_tree_entry *git_tree_entry_byname(git_tree *tree, const char *filename) { int idx; @@ -181,7 +189,7 @@ git_tree_entry *git_tree_entry_byname(git_tree *tree, const char *filename) assert(tree && filename); if (!tree->sorted) - git_tree_sort_entries(tree); + sort_entries(tree); idx = git_vector_search(&tree->entries, filename); if (idx == GIT_ENOTFOUND) @@ -195,7 +203,7 @@ git_tree_entry *git_tree_entry_byindex(git_tree *tree, int idx) assert(tree); if (!tree->sorted) - git_tree_sort_entries(tree); + sort_entries(tree); return git_vector_get(&tree->entries, (unsigned int)idx); } @@ -206,7 +214,7 @@ size_t git_tree_entrycount(git_tree *tree) return tree->entries.length; } -int git_tree_add_entry_unsorted(git_tree_entry **entry_out, git_tree *tree, const git_oid *id, const char *filename, int attributes) +int git_tree_add_entry(git_tree_entry **entry_out, git_tree *tree, const git_oid *id, const char *filename, int attributes) { git_tree_entry *entry; @@ -233,22 +241,6 @@ int git_tree_add_entry_unsorted(git_tree_entry **entry_out, git_tree *tree, cons return GIT_SUCCESS; } -int git_tree_add_entry(git_tree_entry **entry_out, git_tree *tree, const git_oid *id, const char *filename, int attributes) -{ - int result = git_tree_add_entry_unsorted(entry_out, tree, id, filename, attributes); - if (result == GIT_SUCCESS) - git_tree_sort_entries(tree); - - return result; -} - -int git_tree_sort_entries(git_tree *tree) -{ - git_vector_sort(&tree->entries); - tree->sorted = 1; - return GIT_SUCCESS; -} - int git_tree_remove_entry_byindex(git_tree *tree, int idx) { git_tree_entry *remove_ptr; @@ -256,7 +248,7 @@ int git_tree_remove_entry_byindex(git_tree *tree, int idx) assert(tree); if (!tree->sorted) - git_tree_sort_entries(tree); + sort_entries(tree); remove_ptr = git_vector_get(&tree->entries, (unsigned int)idx); if (remove_ptr == NULL) @@ -277,7 +269,7 @@ int git_tree_remove_entry_byname(git_tree *tree, const char *filename) assert(tree && filename); if (!tree->sorted) - git_tree_sort_entries(tree); + sort_entries(tree); idx = git_vector_search(&tree->entries, filename); if (idx == GIT_ENOTFOUND) @@ -297,7 +289,7 @@ int git_tree__writeback(git_tree *tree, git_odb_source *src) return GIT_EMISSINGOBJDATA; if (!tree->sorted) - git_tree_sort_entries(tree); + sort_entries(tree); for (i = 0; i < tree->entries.length; ++i) { git_tree_entry *entry; |