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

properties: don't add NULL values

Browse source
This commit is contained in:
Wim Taymans 2018-12-04 11:34:30 +01:00
parent 26958eabaa
commit e6c023cd34
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/pipewire/properties.c
View file

@ -103,7 +103,8 @@ struct pw_properties *pw_properties_new(const char *key, ...)
va_start(varargs, key); va_start(varargs, key);
while (key != NULL) { while (key != NULL) {
value = va_arg(varargs, char *); value = va_arg(varargs, char *);
add_func(&impl->this, strdup(key), value ? strdup(value) : NULL); if (value)
add_func(&impl->this, strdup(key), strdup(value));
key = va_arg(varargs, char *); key = va_arg(varargs, char *);
} }
va_end(varargs); va_end(varargs);
@ -128,9 +129,9 @@ struct pw_properties *pw_properties_new_dict(const struct spa_dict *dict)
return NULL; return NULL;
for (i = 0; i < dict->n_items; i++) { for (i = 0; i < dict->n_items; i++) {
if (dict->items[i].key != NULL) if (dict->items[i].key != NULL && dict->items[i].value != NULL)
add_func(&impl->this, strdup(dict->items[i].key), add_func(&impl->this, strdup(dict->items[i].key),
dict->items[i].value ? strdup(dict->items[i].value) : NULL); strdup(dict->items[i].value));
} }
return &impl->this; return &impl->this;
@ -202,7 +203,8 @@ struct pw_properties *pw_properties_copy(const struct pw_properties *properties)
* \param dict new properties * \param dict new properties
* \return the number of changed properties * \return the number of changed properties
* *
* The properties in \a props are updated with \a dict. * The properties in \a props are updated with \a dict. Keys in \a dict
* with NULL values are removed from \a props.
* *
* \memberof pw_properties * \memberof pw_properties
*/ */