mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-09 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

proplist: Constify the pa_proplist_copy and _update input pointers.

Browse source
This commit is contained in:
Tanu Kaskinen 2012-03-09 08:46:34 +02:00
parent 6a9caff9dd
commit 6f9e651e4e
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/pulse/proplist.c
View file

@ -321,7 +321,7 @@ int pa_proplist_get(pa_proplist *p, const char *key, const void **data, size_t *
return 0; 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; struct property *prop;
void *state = NULL; 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) if (mode == PA_UPDATE_SET)
pa_proplist_clear(p); 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))) { while ((prop = pa_hashmap_iterate(MAKE_HASHMAP(other), &state, NULL))) {
if (mode == PA_UPDATE_MERGE && pa_proplist_contains(p, prop->key)) 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); property_free(prop);
} }
pa_proplist* pa_proplist_copy(pa_proplist *template) { pa_proplist* pa_proplist_copy(const pa_proplist *template) {
pa_proplist *p; pa_proplist *p;
pa_assert_se(p = pa_proplist_new()); pa_assert_se(p = pa_proplist_new());

4
src/pulse/proplist.h
View file

@ -343,7 +343,7 @@ typedef enum pa_update_mode {
/** Merge property list "other" into "p", adhering the merge mode as /** Merge property list "other" into "p", adhering the merge mode as
* specified in "mode". \since 0.9.11 */ * 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 /** Removes a single entry from the property list, identified be the
* specified key name. \since 0.9.11 */ * 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 /** Allocate a new property list and copy over every single entry from
* the specific list. \since 0.9.11 */ * 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 */ /** Return the number of entries in the property list. \since 0.9.15 */
unsigned pa_proplist_size(pa_proplist *p); unsigned pa_proplist_size(pa_proplist *p);