proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-11 20:13:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

treentry: no need for manual size book-keeping

Browse Source 
We can simply ask the hasmap.
This commit is contained in:
Carlos Martín Nieto 2014-06-09 22:59:32 +02:00
parent 978fbb4c34
commit fcc6006607
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/tree.c
View File

@ -367,7 +367,8 @@ size_t git_tree_entrycount(const git_tree *tree)
unsigned int git_treebuilder_entrycount(git_treebuilder *bld) unsigned int git_treebuilder_entrycount(git_treebuilder *bld)
{ {
assert(bld); assert(bld);
return (unsigned int)bld->entrycount;
return git_strmap_num_entries(bld->map);
} }
static int tree_error(const char *str, const char *path) static int tree_error(const char *str, const char *path)
@ -469,7 +470,6 @@ static int append_entry(
return -1; return -1;
} }
bld->entrycount++;
return 0; return 0;
} }
@ -680,7 +680,6 @@ int git_treebuilder_insert(
} }
} }
bld->entrycount++;
git_oid_cpy(&entry->oid, id); git_oid_cpy(&entry->oid, id);
entry->attr = filemode; entry->attr = filemode;
@ -719,14 +718,13 @@ int git_treebuilder_remove(git_treebuilder *bld, const char *filename)
git_strmap_delete(bld->map, filename); git_strmap_delete(bld->map, filename);
git_tree_entry_free(entry); git_tree_entry_free(entry);
bld->entrycount--;
return 0; return 0;
} }
int git_treebuilder_write(git_oid *oid, git_repository *repo, git_treebuilder *bld) int git_treebuilder_write(git_oid *oid, git_repository *repo, git_treebuilder *bld)
{ {
int error = 0; int error = 0;
size_t i; size_t i, entrycount;
git_buf tree = GIT_BUF_INIT; git_buf tree = GIT_BUF_INIT;
git_odb *odb; git_odb *odb;
git_tree_entry *entry; git_tree_entry *entry;
@ -734,7 +732,8 @@ int git_treebuilder_write(git_oid *oid, git_repository *repo, git_treebuilder *b
assert(bld); assert(bld);
if (git_vector_init(&entries, bld->entrycount, entry_sort_cmp) < 0) entrycount = git_strmap_num_entries(bld->map);
if (git_vector_init(&entries, entrycount, entry_sort_cmp) < 0)
return -1; return -1;
git_strmap_foreach_value(bld->map, entry, { git_strmap_foreach_value(bld->map, entry, {
@ -745,7 +744,7 @@ int git_treebuilder_write(git_oid *oid, git_repository *repo, git_treebuilder *b
git_vector_sort(&entries); git_vector_sort(&entries);
/* Grow the buffer beforehand to an estimated size */ /* Grow the buffer beforehand to an estimated size */
error = git_buf_grow(&tree, bld->entrycount * 72); error = git_buf_grow(&tree, entrycount * 72);
for (i = 0; i < entries.length && !error; ++i) { for (i = 0; i < entries.length && !error; ++i) {
git_tree_entry *entry = git_vector_get(&entries, i); git_tree_entry *entry = git_vector_get(&entries, i);
@ -781,7 +780,6 @@ void git_treebuilder_filter(
git_strmap_foreach(bld->map, filename, entry, { git_strmap_foreach(bld->map, filename, entry, {
if (filter(entry, payload)) { if (filter(entry, payload)) {
git_strmap_delete(bld->map, filename); git_strmap_delete(bld->map, filename);
bld->entrycount--;
git_tree_entry_free(entry); git_tree_entry_free(entry);
} }
}); });
@ -795,7 +793,6 @@ void git_treebuilder_clear(git_treebuilder *bld)
git_strmap_foreach_value(bld->map, e, git_tree_entry_free(e)); git_strmap_foreach_value(bld->map, e, git_tree_entry_free(e));
git_strmap_clear(bld->map); git_strmap_clear(bld->map);
bld->entrycount = 0;
} }
void git_treebuilder_free(git_treebuilder *bld) void git_treebuilder_free(git_treebuilder *bld)

1
src/tree.h
View File

@ -26,7 +26,6 @@ struct git_tree {
}; };
struct git_treebuilder { struct git_treebuilder {
size_t entrycount; /* vector may contain "removed" entries */
git_strmap *map; git_strmap *map;
}; };