X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fhashmap.h;h=ed41817ddae8658cfa392e4b2526d518341c4074;hp=fcf2cb1c81441c92501c671c5feb5782f07d1a0b;hb=3c1668da6202f1ead3d4d3981b89e9da1a0e98e3;hpb=5430f7f2bc7330f3088b894166bf3524a067e3d8 diff --git a/src/shared/hashmap.h b/src/shared/hashmap.h index fcf2cb1c8..ed41817dd 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. @@ -54,6 +53,7 @@ int hashmap_ensure_allocated(Hashmap **h, hash_func_t hash_func, compare_func_t int hashmap_put(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); +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); @@ -71,12 +71,16 @@ void *hashmap_iterate_backwards(Hashmap *h, Iterator *i, const void **key); void *hashmap_iterate_skip(Hashmap *h, const void *key, Iterator *i); void hashmap_clear(Hashmap *h); +void hashmap_clear_free(Hashmap *h); + void *hashmap_steal_first(Hashmap *h); void *hashmap_steal_first_key(Hashmap *h); 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) \ @@ -87,5 +91,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