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

Merge commit 'elmarco/master'

Browse source
This commit is contained in:
Lennart Poettering 2009-01-14 00:22:27 +01:00
commit f3101133d7
9 changed files with 163 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/pulse/def.h
View file

@ -428,7 +428,7 @@ typedef enum pa_subscription_event_type {
PA_SUBSCRIPTION_EVENT_REMOVE = 0x0020U,
/**< An object was removed */
PA_SUBSCRIPTION_EVENT_TYPE_MASK = 0x0030U,
PA_SUBSCRIPTION_EVENT_TYPE_MASK = 0x0030U
/**< A mask to extract the event operation from an event value */
} pa_subscription_event_type_t;

2
src/pulse/proplist.c
View file

@ -359,7 +359,7 @@ pa_proplist *pa_proplist_from_string(const char *str) {
}
blob = pa_xmalloc((size_t)(e-v)/2);
if (pa_parsehex(v, blob, (e-v)/2) != ((e-v)/2)) {
if (pa_parsehex(v, blob, (e-v)/2) != (size_t)((e-v)/2)) {
pa_log("Invalid \"hex:\" value data");
pa_xfree(blob);
break;