diff options
author | Lyndon Brown <jnqnfe@gmail.com> | 2018-05-27 02:27:43 +0100 |
---|---|---|
committer | Tanu Kaskinen <tanuk@iki.fi> | 2018-06-04 13:19:07 +0300 |
commit | da02d409e07c1c108982148067df39bf8b0ad57b (patch) | |
tree | 85e2dbb0ce493caa872dba8c1a69e8c4521c0843 | |
parent | 7f73977ac47686796bc4293ee2fdaa6ca35ba743 (diff) | |
download | pulseaudio-da02d409e07c1c108982148067df39bf8b0ad57b.tar.gz |
hashmap: constify hashmap ptr for various functions
-rw-r--r-- | src/pulsecore/hashmap.c | 12 | ||||
-rw-r--r-- | src/pulsecore/hashmap.h | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/pulsecore/hashmap.c b/src/pulsecore/hashmap.c index 2385c55cd..6477783e2 100644 --- a/src/pulsecore/hashmap.c +++ b/src/pulsecore/hashmap.c @@ -231,7 +231,7 @@ void pa_hashmap_remove_all(pa_hashmap *h) { } } -void *pa_hashmap_iterate(pa_hashmap *h, void **state, const void **key) { +void *pa_hashmap_iterate(const pa_hashmap *h, void **state, const void **key) { struct hashmap_entry *e; pa_assert(h); @@ -264,7 +264,7 @@ at_end: return NULL; } -void *pa_hashmap_iterate_backwards(pa_hashmap *h, void **state, const void **key) { +void *pa_hashmap_iterate_backwards(const pa_hashmap *h, void **state, const void **key) { struct hashmap_entry *e; pa_assert(h); @@ -297,7 +297,7 @@ at_beginning: return NULL; } -void* pa_hashmap_first(pa_hashmap *h) { +void* pa_hashmap_first(const pa_hashmap *h) { pa_assert(h); if (!h->iterate_list_head) @@ -306,7 +306,7 @@ void* pa_hashmap_first(pa_hashmap *h) { return h->iterate_list_head->value; } -void* pa_hashmap_last(pa_hashmap *h) { +void* pa_hashmap_last(const pa_hashmap *h) { pa_assert(h); if (!h->iterate_list_tail) @@ -329,13 +329,13 @@ void* pa_hashmap_steal_first(pa_hashmap *h) { return data; } -unsigned pa_hashmap_size(pa_hashmap *h) { +unsigned pa_hashmap_size(const pa_hashmap *h) { pa_assert(h); return h->n_entries; } -bool pa_hashmap_isempty(pa_hashmap *h) { +bool pa_hashmap_isempty(const pa_hashmap *h) { pa_assert(h); return h->n_entries == 0; diff --git a/src/pulsecore/hashmap.h b/src/pulsecore/hashmap.h index b1027e752..ea883765b 100644 --- a/src/pulsecore/hashmap.h +++ b/src/pulsecore/hashmap.h @@ -61,10 +61,10 @@ int pa_hashmap_remove_and_free(pa_hashmap *h, const void *key); void pa_hashmap_remove_all(pa_hashmap *h); /* Return the current number of entries of the hashmap */ -unsigned pa_hashmap_size(pa_hashmap *h); +unsigned pa_hashmap_size(const pa_hashmap *h); /* Return true if the hashmap is empty */ -bool pa_hashmap_isempty(pa_hashmap *h); +bool pa_hashmap_isempty(const pa_hashmap *h); /* May be used to iterate through the hashmap. Initially the opaque pointer *state has to be set to NULL. The hashmap may not be @@ -72,19 +72,19 @@ bool pa_hashmap_isempty(pa_hashmap *h); via pa_hashmap_remove(). The key of the entry is returned in *key, if key is non-NULL. After the last entry in the hashmap NULL is returned. */ -void *pa_hashmap_iterate(pa_hashmap *h, void **state, const void**key); +void *pa_hashmap_iterate(const pa_hashmap *h, void **state, const void**key); /* Same as pa_hashmap_iterate() but goes backwards */ -void *pa_hashmap_iterate_backwards(pa_hashmap *h, void **state, const void**key); +void *pa_hashmap_iterate_backwards(const pa_hashmap *h, void **state, const void**key); /* Remove the oldest entry in the hashmap and return it */ void *pa_hashmap_steal_first(pa_hashmap *h); /* Return the oldest entry in the hashmap */ -void* pa_hashmap_first(pa_hashmap *h); +void* pa_hashmap_first(const pa_hashmap *h); /* Return the newest entry in the hashmap */ -void* pa_hashmap_last(pa_hashmap *h); +void* pa_hashmap_last(const pa_hashmap *h); /* A macro to ease iteration through all entries */ #define PA_HASHMAP_FOREACH(e, h, state) \ |