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

hashtable: add remove2 to retrieve the value that was removed

Browse Source
This commit is contained in:
Carlos Martín Nieto 2012-01-19 19:06:15 +01:00
parent d0ec3fb8f0
commit 3f2bf4d659
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hashtable.c
View File

@ -213,7 +213,7 @@ void *git_hashtable_lookup(git_hashtable *self, const void *key)
return NULL; return NULL;
} }
int git_hashtable_remove(git_hashtable *self, const void *key) int git_hashtable_remove2(git_hashtable *self, const void *key, void **old_value)
{ {
int hash_id; int hash_id;
git_hashtable_node *node; git_hashtable_node *node;
@ -223,6 +223,7 @@ int git_hashtable_remove(git_hashtable *self, const void *key)
for (hash_id = 0; hash_id < GIT_HASHTABLE_HASHES; ++hash_id) { for (hash_id = 0; hash_id < GIT_HASHTABLE_HASHES; ++hash_id) {
node = node_with_hash(self, key, hash_id); node = node_with_hash(self, key, hash_id);
if (node->key && self->key_equal(key, node->key) == 0) { if (node->key && self->key_equal(key, node->key) == 0) {
*old_value = node->value;
node->key = NULL; node->key = NULL;
node->value = NULL; node->value = NULL;
self->key_count--; self->key_count--;

10
src/hashtable.h
View File

@ -42,7 +42,15 @@ git_hashtable *git_hashtable_alloc(size_t min_size,
git_hash_ptr hash, git_hash_ptr hash,
git_hash_keyeq_ptr key_eq); git_hash_keyeq_ptr key_eq);
void *git_hashtable_lookup(git_hashtable *h, const void *key); void *git_hashtable_lookup(git_hashtable *h, const void *key);
int git_hashtable_remove(git_hashtable *table, const void *key); int git_hashtable_remove2(git_hashtable *table, const void *key, void **old_value);
GIT_INLINE(int) git_hashtable_remove(git_hashtable *table, const void *key)
{
void *_unused;
return git_hashtable_remove2(table, key, &_unused);
}
void git_hashtable_free(git_hashtable *h); void git_hashtable_free(git_hashtable *h);
void git_hashtable_clear(git_hashtable *h); void git_hashtable_clear(git_hashtable *h);
int git_hashtable_merge(git_hashtable *self, git_hashtable *other); int git_hashtable_merge(git_hashtable *self, git_hashtable *other);