Commit 0ecf0e3397502d61787b4e45c3d27fb55b6f9d04
2018-06-16T09:35:10
Merge pull request #4683 from pks-t/pks/tree-unused-functions tree: remove unused functions
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88
diff --git a/src/tree.c b/src/tree.c
index 2d7c91c..be0f528 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -74,14 +74,6 @@ int git_tree_entry_cmp(const git_tree_entry *e1, const git_tree_entry *e2)
return entry_sort_cmp(e1, e2);
}
-int git_tree_entry_icmp(const git_tree_entry *e1, const git_tree_entry *e2)
-{
- return git_path_cmp(
- e1->filename, e1->filename_len, git_tree_entry__is_tree(e1),
- e2->filename, e2->filename_len, git_tree_entry__is_tree(e2),
- git__strncasecmp);
-}
-
/**
* Allocate a new self-contained entry, with enough space after it to
* store the filename and the id.
@@ -342,41 +334,6 @@ const git_tree_entry *git_tree_entry_byid(
return NULL;
}
-int git_tree__prefix_position(const git_tree *tree, const char *path)
-{
- struct tree_key_search ksearch;
- size_t at_pos, path_len;
-
- if (!path)
- return 0;
-
- path_len = strlen(path);
- TREE_ENTRY_CHECK_NAMELEN(path_len);
-
- ksearch.filename = path;
- ksearch.filename_len = (uint16_t)path_len;
-
- /* Find tree entry with appropriate prefix */
- git_array_search(
- &at_pos, tree->entries, &homing_search_cmp, &ksearch);
-
- for (; at_pos < tree->entries.size; ++at_pos) {
- const git_tree_entry *entry = git_array_get(tree->entries, at_pos);
- if (homing_search_cmp(&ksearch, entry) < 0)
- break;
- }
-
- for (; at_pos > 0; --at_pos) {
- const git_tree_entry *entry =
- git_array_get(tree->entries, at_pos - 1);
-
- if (homing_search_cmp(&ksearch, entry) > 0)
- break;
- }
-
- return (int)at_pos;
-}
-
size_t git_tree_entrycount(const git_tree *tree)
{
assert(tree);
diff --git a/src/tree.h b/src/tree.h
index 00f4b06..fbee5ef 100644
--- a/src/tree.h
+++ b/src/tree.h
@@ -39,22 +39,10 @@ GIT_INLINE(bool) git_tree_entry__is_tree(const struct git_tree_entry *e)
return (S_ISDIR(e->attr) && !S_ISGITLINK(e->attr));
}
-extern int git_tree_entry_icmp(const git_tree_entry *e1, const git_tree_entry *e2);
-
void git_tree__free(void *tree);
int git_tree__parse(void *tree, git_odb_object *obj);
/**
- * Lookup the first position in the tree with a given prefix.
- *
- * @param tree a previously loaded tree.
- * @param prefix the beginning of a path to find in the tree.
- * @return index of the first item at or after the given prefix.
- */
-int git_tree__prefix_position(const git_tree *tree, const char *prefix);
-
-
-/**
* Write a tree to the given repository
*/
int git_tree__write_index(