New upstream version 1.1.0+dfsg.1

[libgit2.git] / src / offmap.c

diff --git a/src/offmap.c b/src/offmap.c
index 3f51f6e0cfa160cb18040e98b63cbf1e9fdc5c00..be9eb66d8c01244f07c68306ecae9605372fd08c 100644 (file)
--- a/src/offmap.c
+++ b/src/offmap.c
@@ -7,14 +7,27 @@
 
 #include "offmap.h"
 
-GIT__USE_OFFMAP
+#define kmalloc git__malloc
+#define kcalloc git__calloc
+#define krealloc git__realloc
+#define kreallocarray git__reallocarray
+#define kfree git__free
+#include "khash.h"
 
-git_offmap *git_offmap_alloc(void)
+__KHASH_TYPE(off, off64_t, void *)
+
+__KHASH_IMPL(off, static kh_inline, off64_t, void *, 1, kh_int64_hash_func, kh_int64_hash_equal)
+
+
+int git_offmap_new(git_offmap **out)
 {
-       return kh_init(off);
+       *out = kh_init(off);
+       GIT_ERROR_CHECK_ALLOC(*out);
+
+       return 0;
 }
 
-void git_offmap__free(git_offmap *map)
+void git_offmap_free(git_offmap *map)
 {
        kh_destroy(off, map);
 }
@@ -24,60 +37,65 @@ void git_offmap_clear(git_offmap *map)
        kh_clear(off, map);
 }
 
-size_t git_offmap_num_entries(git_offmap *map)
+size_t git_offmap_size(git_offmap *map)
 {
        return kh_size(map);
 }
 
-size_t git_offmap_lookup_index(git_offmap *map, const git_off_t key)
+void *git_offmap_get(git_offmap *map, const off64_t key)
 {
-       return kh_get(off, map, key);
+       size_t idx = kh_get(off, map, key);
+       if (idx == kh_end(map) || !kh_exist(map, idx))
+               return NULL;
+       return kh_val(map, idx);
 }
 
-int git_offmap_valid_index(git_offmap *map, size_t idx)
+int git_offmap_set(git_offmap *map, const off64_t key, void *value)
 {
-       return idx != kh_end(map);
-}
+       size_t idx;
+       int rval;
 
-int git_offmap_exists(git_offmap *map, const git_off_t key)
-{
-       return kh_get(off, map, key) != kh_end(map);
-}
+       idx = kh_put(off, map, key, &rval);
+       if (rval < 0)
+               return -1;
 
-void *git_offmap_value_at(git_offmap *map, size_t idx)
-{
-       return kh_val(map, idx);
-}
+       if (rval == 0)
+               kh_key(map, idx) = key;
 
-void git_offmap_set_value_at(git_offmap *map, size_t idx, void *value)
-{
        kh_val(map, idx) = value;
+
+       return 0;
 }
 
-void git_offmap_delete_at(git_offmap *map, size_t idx)
+int git_offmap_delete(git_offmap *map, const off64_t key)
 {
+       khiter_t idx = kh_get(off, map, key);
+       if (idx == kh_end(map))
+               return GIT_ENOTFOUND;
        kh_del(off, map, idx);
+       return 0;
 }
 
-int git_offmap_put(git_offmap *map, const git_off_t key, int *err)
+int git_offmap_exists(git_offmap *map, const off64_t key)
 {
-       return kh_put(off, map, key, err);
+       return kh_get(off, map, key) != kh_end(map);
 }
 
-void git_offmap_insert(git_offmap *map, const git_off_t key, void *value, int *rval)
+int git_offmap_iterate(void **value, git_offmap *map, size_t *iter, off64_t *key)
 {
-       khiter_t idx = kh_put(off, map, key, rval);
+       size_t i = *iter;
 
-       if ((*rval) >= 0) {
-               if ((*rval) == 0)
-                       kh_key(map, idx) = key;
-               kh_val(map, idx) = value;
-       }
-}
+       while (i < map->n_buckets && !kh_exist(map, i))
+               i++;
 
-void 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))
-               git_offmap_delete_at(map, idx);
+       if (i >= map->n_buckets)
+               return GIT_ITEROVER;
+
+       if (key)
+               *key = kh_key(map, i);
+       if (value)
+               *value = kh_value(map, i);
+       *iter = ++i;
+
+       return 0;
 }