From e8ce0504e90f4954ec56ecbbbde25554bfe90bd4 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 29 Dec 2012 21:24:40 -0800 Subject: [PATCH] audio: The function g_dbus_pending_property_error has no return value --- profiles/audio/player.c | 24 ++++++++++++++++-------- profiles/audio/transport.c | 12 ++++++++---- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/profiles/audio/player.c b/profiles/audio/player.c index 005d0d15a..32533b8a6 100644 --- a/profiles/audio/player.c +++ b/profiles/audio/player.c @@ -200,21 +200,27 @@ static void player_set_setting(struct media_player *mp, struct player_callback *cb = mp->cb; struct pending_req *p; - if (cb == NULL || cb->cbs->set_setting == NULL) - return g_dbus_pending_property_error(id, + if (cb == NULL || cb->cbs->set_setting == NULL) { + g_dbus_pending_property_error(id, ERROR_INTERFACE ".NotSupported", "Operation is not supported"); + return; + } p = find_pending(mp, key); - if (p != NULL) - return g_dbus_pending_property_error(id, + if (p != NULL) { + g_dbus_pending_property_error(id, ERROR_INTERFACE ".InProgress", "Operation already in progress"); + return; + } - if (!cb->cbs->set_setting(mp, key, value, cb->user_data)) - return g_dbus_pending_property_error(id, + if (!cb->cbs->set_setting(mp, key, value, cb->user_data)) { + g_dbus_pending_property_error(id, ERROR_INTERFACE ".InvalidArguments", "Invalid arguments in method call"); + return; + } p = pending_new(id, key, value); @@ -228,10 +234,12 @@ static void set_setting(const GDBusPropertyTable *property, struct media_player *mp = data; const char *value; - if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_STRING) - return g_dbus_pending_property_error(id, + if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_STRING) { + g_dbus_pending_property_error(id, ERROR_INTERFACE ".InvalidArguments", "Invalid arguments in method call"); + return; + } dbus_message_iter_get_basic(iter, &value); diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c index 3935adee4..54461d807 100644 --- a/profiles/audio/transport.c +++ b/profiles/audio/transport.c @@ -640,17 +640,21 @@ static void set_volume(const GDBusPropertyTable *property, struct a2dp_transport *a2dp = transport->data; uint16_t volume; - if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_UINT16) - return g_dbus_pending_property_error(id, + if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_UINT16) { + g_dbus_pending_property_error(id, ERROR_INTERFACE ".InvalidArguments", "Invalid arguments in method call"); + return; + } dbus_message_iter_get_basic(iter, &volume); - if (volume > 127) - return g_dbus_pending_property_error(id, + if (volume > 127) { + g_dbus_pending_property_error(id, ERROR_INTERFACE ".InvalidArguments", "Invalid arguments in method call"); + return; + } if (a2dp->volume != volume) avrcp_set_volume(transport->device, volume); -- 2.47.3