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

bluetooth: Refactor property parsing code

Browse source 
Use a separate method to perform the common checks when a property needs
to be parsed.
This commit is contained in:
Mikel Astiz 2012-07-25 16:29:52 +02:00 • committed by Tanu Kaskinen
parent 518d1dee45
commit 8a402a7d08
1 changed files with 22 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/modules/bluetooth/bluetooth-util.c
View file

@ -184,31 +184,42 @@ static pa_bool_t device_is_audio(pa_bluetooth_device *d) {
d->headset_state != PA_BT_AUDIO_STATE_INVALID))); d->headset_state != PA_BT_AUDIO_STATE_INVALID)));
} }
static int parse_device_property(pa_bluetooth_discovery *y, pa_bluetooth_device *d, DBusMessageIter *i) { static const char *check_variant_property(DBusMessageIter *i) {
const char *key; const char *key;
DBusMessageIter variant_i;
pa_assert(y);
pa_assert(d);
pa_assert(i); pa_assert(i);
if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_STRING) { if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_STRING) {
pa_log("Property name not a string."); pa_log("Property name not a string.");
return -1; return NULL;
} }
dbus_message_iter_get_basic(i, &key); dbus_message_iter_get_basic(i, &key);
if (!dbus_message_iter_next(i)) { if (!dbus_message_iter_next(i)) {
pa_log("Property value missing"); pa_log("Property value missing");
return -1; return NULL;
} }
if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_VARIANT) { if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_VARIANT) {
pa_log("Property value not a variant."); pa_log("Property value not a variant.");
return -1; return NULL;
} }
return key;
}
static int parse_device_property(pa_bluetooth_discovery *y, pa_bluetooth_device *d, DBusMessageIter *i) {
const char *key;
DBusMessageIter variant_i;
pa_assert(y);
pa_assert(d);
key = check_variant_property(i);
if (key == NULL)
return -1;
dbus_message_iter_recurse(i, &variant_i); dbus_message_iter_recurse(i, &variant_i);
/* pa_log_debug("Parsing property org.bluez.Device.%s", key); */ /* pa_log_debug("Parsing property org.bluez.Device.%s", key); */
@ -327,24 +338,10 @@ static int parse_audio_property(pa_bluetooth_discovery *u, int *state, DBusMessa
pa_assert(u); pa_assert(u);
pa_assert(state); pa_assert(state);
pa_assert(i);
if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_STRING) { key = check_variant_property(i);
pa_log("Property name not a string."); if (key == NULL)
return -1; return -1;
}
dbus_message_iter_get_basic(i, &key);
if (!dbus_message_iter_next(i)) {
pa_log("Property value missing");
return -1;
}
if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_VARIANT) {
pa_log("Property value not a variant.");
return -1;
}
dbus_message_iter_recurse(i, &variant_i); dbus_message_iter_recurse(i, &variant_i);
@ -735,22 +732,9 @@ int pa_bluetooth_transport_parse_property(pa_bluetooth_transport *t, DBusMessage
const char *key; const char *key;
DBusMessageIter variant_i; DBusMessageIter variant_i;
if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_STRING) { key = check_variant_property(i);
pa_log("Property name not a string."); if (key == NULL)
return -1; return -1;
}
dbus_message_iter_get_basic(i, &key);
if (!dbus_message_iter_next(i)) {
pa_log("Property value missing");
return -1;
}
if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_VARIANT) {
pa_log("Property value not a variant.");
return -1;
}
dbus_message_iter_recurse(i, &variant_i); dbus_message_iter_recurse(i, &variant_i);