X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fhashmap.h;h=6fd71cf519fa2fcd4895a3eb43592ed71615bda4;hp=deefd9a804d1ea89164c73c81d103b7724236ef8;hb=943aad8ca57a6b5c49c4ea60f9e8c13bf9b20e6c;hpb=9946996cda11a18b44d82344676e5a0e96339408 diff --git a/src/shared/hashmap.h b/src/shared/hashmap.h index deefd9a80..6fd71cf51 100644 --- a/src/shared/hashmap.h +++ b/src/shared/hashmap.h @@ -1,7 +1,6 @@ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ -#ifndef foohashmaphfoo -#define foohashmaphfoo +#pragma once /*** This file is part of systemd. @@ -45,6 +44,9 @@ int string_compare_func(const void *a, const void *b); unsigned trivial_hash_func(const void *p); int trivial_compare_func(const void *a, const void *b); +unsigned uint64_hash_func(const void *p); +int uint64_compare_func(const void *a, const void *b); + Hashmap *hashmap_new(hash_func_t hash_func, compare_func_t compare_func); void hashmap_free(Hashmap *h); void hashmap_free_free(Hashmap *h); @@ -52,8 +54,11 @@ Hashmap *hashmap_copy(Hashmap *h); int hashmap_ensure_allocated(Hashmap **h, hash_func_t hash_func, compare_func_t compare_func); int hashmap_put(Hashmap *h, const void *key, void *value); +int hashmap_update(Hashmap *h, const void *key, void *value); int hashmap_replace(Hashmap *h, const void *key, void *value); void* hashmap_get(Hashmap *h, const void *key); +void* hashmap_get2(Hashmap *h, const void *key, void **rkey); +bool hashmap_contains(Hashmap *h, const void *key); void* hashmap_remove(Hashmap *h, const void *key); void* hashmap_remove_value(Hashmap *h, const void *key, void *value); int hashmap_remove_and_put(Hashmap *h, const void *old_key, const void *new_key, void *value); @@ -79,6 +84,8 @@ void* hashmap_first(Hashmap *h); void* hashmap_first_key(Hashmap *h); void* hashmap_last(Hashmap *h); +void *hashmap_next(Hashmap *h, const void *key); + char **hashmap_get_strv(Hashmap *h); #define HASHMAP_FOREACH(e, h, i) \ @@ -89,5 +96,3 @@ char **hashmap_get_strv(Hashmap *h); #define HASHMAP_FOREACH_BACKWARDS(e, h, i) \ for ((i) = ITERATOR_LAST, (e) = hashmap_iterate_backwards((h), &(i), NULL); (e); (e) = hashmap_iterate_backwards((h), &(i), NULL)) - -#endif