diff options
author | Patrick Steinhardt <ps@pks.im> | 2018-12-01 09:58:30 +0100 |
---|---|---|
committer | Patrick Steinhardt <ps@pks.im> | 2019-02-15 13:16:49 +0100 |
commit | 4713e7c87ed32be43f77c916f442068dfba80d29 (patch) | |
tree | 1fc09f496306738424e7bf25db1aad5d7c066546 | |
parent | fdfabdc4e26b42848b07e0e8e70fc51faceab976 (diff) | |
download | libgit2-4713e7c87ed32be43f77c916f442068dfba80d29.tar.gz |
offmap: remove legacy low-level interface
Remove the low-level interface that was exposing implementation details of
`git_offmap` to callers. From now on, only the high-level functions shall be
used to retrieve or modify values of a map. Adjust remaining existing callers.
-rw-r--r-- | src/offmap.c | 81 | ||||
-rw-r--r-- | src/offmap.h | 16 |
2 files changed, 9 insertions, 88 deletions
diff --git a/src/offmap.c b/src/offmap.c index 162501d8f..ba86bc0d0 100644 --- a/src/offmap.c +++ b/src/offmap.c @@ -44,9 +44,8 @@ size_t git_offmap_size(git_offmap *map) void *git_offmap_get(git_offmap *map, const git_off_t key) { - size_t idx = git_offmap_lookup_index(map, key); - if (!git_offmap_valid_index(map, idx) || - !git_offmap_has_data(map, idx)) + size_t idx = kh_get(off, map, key); + if (idx == kh_end(map) || !kh_exist(map, idx)) return NULL; return kh_val(map, idx); } @@ -70,10 +69,10 @@ int git_offmap_set(git_offmap *map, const git_off_t key, void *value) int git_offmap_delete(git_offmap *map, const git_off_t key) { - khiter_t idx = git_offmap_lookup_index(map, key); - if (!git_offmap_valid_index(map, idx)) + khiter_t idx = kh_get(off, map, key); + if (idx == kh_end(map)) return GIT_ENOTFOUND; - git_offmap_delete_at(map, idx); + kh_del(off, map, idx); return 0; } @@ -86,79 +85,17 @@ int git_offmap_iterate(void **value, git_offmap *map, size_t *iter, git_off_t *k { size_t i = *iter; - while (i < git_offmap_end(map) && !git_offmap_has_data(map, i)) + while (i < map->n_buckets && !kh_exist(map, i)) i++; - if (i >= git_offmap_end(map)) + if (i >= map->n_buckets) return GIT_ITEROVER; if (key) - *key = git_offmap_key_at(map, i); + *key = kh_key(map, i); if (value) - *value = git_offmap_value_at(map, i); + *value = kh_value(map, i); *iter = ++i; return 0; } - -size_t git_offmap_lookup_index(git_offmap *map, const git_off_t key) -{ - return kh_get(off, map, key); -} - -int git_offmap_valid_index(git_offmap *map, size_t idx) -{ - return idx != kh_end(map); -} - -int git_offmap_has_data(git_offmap *map, size_t idx) -{ - return kh_exist(map, idx); -} - -git_off_t git_offmap_key_at(git_offmap *map, size_t idx) -{ - return kh_key(map, idx); -} - -void *git_offmap_value_at(git_offmap *map, size_t idx) -{ - return kh_val(map, idx); -} - -void git_offmap_set_value_at(git_offmap *map, size_t idx, void *value) -{ - kh_val(map, idx) = value; -} - -void git_offmap_delete_at(git_offmap *map, size_t idx) -{ - kh_del(off, map, idx); -} - -int git_offmap_put(git_offmap *map, const git_off_t key, int *err) -{ - return kh_put(off, map, key, err); -} - -void git_offmap_insert(git_offmap *map, const git_off_t key, void *value, int *rval) -{ - khiter_t idx = kh_put(off, map, key, rval); - - if ((*rval) >= 0) { - if ((*rval) == 0) - kh_key(map, idx) = key; - kh_val(map, idx) = value; - } -} - -size_t git_offmap_begin(git_offmap *map) -{ - GIT_UNUSED(map); - return 0; -} - -size_t git_offmap_end(git_offmap *map) -{ - return map->n_buckets; -} diff --git a/src/offmap.h b/src/offmap.h index 456e2aeea..6fa7d2f8f 100644 --- a/src/offmap.h +++ b/src/offmap.h @@ -120,22 +120,6 @@ int git_offmap_exists(git_offmap *map, const git_off_t key); */ int git_offmap_iterate(void **value, git_offmap *map, size_t *iter, git_off_t *key); -size_t git_offmap_lookup_index(git_offmap *map, const git_off_t key); -int git_offmap_valid_index(git_offmap *map, size_t idx); - -int git_offmap_has_data(git_offmap *map, size_t idx); - -git_off_t git_offmap_key_at(git_offmap *map, size_t idx); -void *git_offmap_value_at(git_offmap *map, size_t idx); -void git_offmap_set_value_at(git_offmap *map, size_t idx, void *value); -void git_offmap_delete_at(git_offmap *map, size_t idx); - -int git_offmap_put(git_offmap *map, const git_off_t key, int *err); -void git_offmap_insert(git_offmap *map, const git_off_t key, void *value, int *rval); - -size_t git_offmap_begin(git_offmap *map); -size_t git_offmap_end(git_offmap *map); - #define git_offmap_foreach(h, kvar, vvar, code) { size_t __i = 0; \ while (git_offmap_iterate((void **) &(vvar), h, &__i, &(kvar)) == 0) { \ code; \ |