From 6f9e651e4e993ee95c4826fbee36b4d49d592151 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Fri, 9 Mar 2012 08:46:34 +0200 Subject: [PATCH] proplist: Constify the pa_proplist_copy and _update input pointers. --- src/pulse/proplist.c | 6 ++++-- src/pulse/proplist.h | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/pulse/proplist.c b/src/pulse/proplist.c index 75445e0..efed17a 100644 --- a/src/pulse/proplist.c +++ b/src/pulse/proplist.c @@ -321,7 +321,7 @@ int pa_proplist_get(pa_proplist *p, const char *key, const void **data, size_t * return 0; } -void pa_proplist_update(pa_proplist *p, pa_update_mode_t mode, pa_proplist *other) { +void pa_proplist_update(pa_proplist *p, pa_update_mode_t mode, const pa_proplist *other) { struct property *prop; void *state = NULL; @@ -332,6 +332,8 @@ void pa_proplist_update(pa_proplist *p, pa_update_mode_t mode, pa_proplist *othe if (mode == PA_UPDATE_SET) pa_proplist_clear(p); + /* MAKE_HASHMAP turns the const pointer into a non-const pointer, but + * that's ok, because we don't modify the hashmap contents. */ while ((prop = pa_hashmap_iterate(MAKE_HASHMAP(other), &state, NULL))) { if (mode == PA_UPDATE_MERGE && pa_proplist_contains(p, prop->key)) @@ -658,7 +660,7 @@ void pa_proplist_clear(pa_proplist *p) { property_free(prop); } -pa_proplist* pa_proplist_copy(pa_proplist *template) { +pa_proplist* pa_proplist_copy(const pa_proplist *template) { pa_proplist *p; pa_assert_se(p = pa_proplist_new()); diff --git a/src/pulse/proplist.h b/src/pulse/proplist.h index 5802394..f37e5ea 100644 --- a/src/pulse/proplist.h +++ b/src/pulse/proplist.h @@ -343,7 +343,7 @@ typedef enum pa_update_mode { /** Merge property list "other" into "p", adhering the merge mode as * specified in "mode". \since 0.9.11 */ -void pa_proplist_update(pa_proplist *p, pa_update_mode_t mode, pa_proplist *other); +void pa_proplist_update(pa_proplist *p, pa_update_mode_t mode, const pa_proplist *other); /** Removes a single entry from the property list, identified be the * specified key name. \since 0.9.11 */ @@ -391,7 +391,7 @@ void pa_proplist_clear(pa_proplist *p); /** Allocate a new property list and copy over every single entry from * the specific list. \since 0.9.11 */ -pa_proplist* pa_proplist_copy(pa_proplist *p); +pa_proplist* pa_proplist_copy(const pa_proplist *p); /** Return the number of entries in the property list. \since 0.9.15 */ unsigned pa_proplist_size(pa_proplist *p); -- 2.7.4