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

spa: bluez: use spa_auto for DBusError

Browse source
This commit is contained in:
Barnabás Pőcze 2023-07-11 20:44:23 +02:00
parent b52d590936
commit ca85872e83
8 changed files with 44 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

37
spa/plugins/bluez5/backend-hsphfpd.c
View file

@ -200,7 +200,7 @@ static int set_dbus_property(struct impl *backend,
{
spa_autoptr(DBusMessage) m = NULL, r = NULL;
DBusMessageIter iter;
DBusError err;
spa_auto(DBusError) err = DBUS_ERROR_INIT;
m = dbus_message_new_method_call(HSPHFPD_SERVICE, path, DBUS_INTERFACE_PROPERTIES, "Set");
if (m == NULL)
@ -209,12 +209,9 @@ static int set_dbus_property(struct impl *backend,
dbus_message_iter_init_append(m, &iter);
dbus_message_iter_append_basic(&iter, type, value);
dbus_error_init(&err);
r = dbus_connection_send_with_reply_and_block(backend->conn, m, -1, &err);
if (r == NULL) {
spa_log_error(backend->log, "Transport Set() failed for transport %s (%s)", path, err.message);
dbus_error_free(&err);
return -EIO;
}
@ -828,11 +825,9 @@ static void hsphfpd_audio_acquire_reply(DBusPendingCall *pending, void *user_dat
const char *transport_path;
const char *service_id;
const char *agent_path;
DBusError error;
spa_auto(DBusError) error = DBUS_ERROR_INIT;
int ret = 0;
dbus_error_init(&error);
backend->acquire_in_progress = false;
spa_autoptr(DBusMessage) r = steal_reply_and_unref(&pending);
@ -1198,8 +1193,7 @@ static int hsphfpd_register(struct impl *backend)
{
spa_autoptr(DBusMessage) m = NULL, r = NULL;
const char *path = APPLICATION_OBJECT_MANAGER_PATH;
DBusError err;
int res;
spa_auto(DBusError) err = DBUS_ERROR_INIT;
spa_log_debug(backend->log, "Registering to hsphfpd");
@ -1210,21 +1204,17 @@ static int hsphfpd_register(struct impl *backend)
dbus_message_append_args(m, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID);
dbus_error_init(&err);
r = dbus_connection_send_with_reply_and_block(backend->conn, m, -1, &err);
if (r == NULL) {
if (dbus_error_has_name(&err, "org.freedesktop.DBus.Error.ServiceUnknown")) {
spa_log_info(backend->log, "hsphfpd not available: %s",
err.message);
res = -ENOTSUP;
return -ENOTSUP;
} else {
spa_log_warn(backend->log, "Registering application %s failed: %s (%s)",
path, err.message, err.name);
res = -EIO;
return -EIO;
}
dbus_error_free(&err);
return res;
}
if (dbus_message_get_type(r) == DBUS_MESSAGE_TYPE_ERROR) {
@ -1389,18 +1379,17 @@ finish:
static int add_filters(void *data)
{
struct impl *backend = data;
DBusError err;
if (backend->filters_added)
return 0;
dbus_error_init(&err);
if (!dbus_connection_add_filter(backend->conn, hsphfpd_filter_cb, backend, NULL)) {
spa_log_error(backend->log, "failed to add filter function");
goto fail;
return -EIO;
}
spa_auto(DBusError) err = DBUS_ERROR_INIT;
dbus_bus_add_match(backend->conn,
"type='signal',sender='" HSPHFPD_SERVICE "',"
"interface='" DBUS_INTERFACE_OBJECTMANAGER "',member='InterfacesAdded'", &err);
@ -1419,10 +1408,6 @@ static int add_filters(void *data)
backend->filters_added = true;
return 0;
fail:
dbus_error_free(&err);
return -EIO;
}
static int backend_hsphfpd_free(void *data)
@ -1458,21 +1443,17 @@ static const struct spa_bt_backend_implementation backend_impl = {
static bool is_available(struct impl *backend)
{
spa_autoptr(DBusMessage) m = NULL, r = NULL;
DBusError err;
spa_auto(DBusError) err = DBUS_ERROR_INIT;
m = dbus_message_new_method_call(HSPHFPD_SERVICE, "/",
DBUS_INTERFACE_INTROSPECTABLE, "Introspect");
if (m == NULL)
return false;
dbus_error_init(&err);
r = dbus_connection_send_with_reply_and_block(backend->conn, m, -1, &err);
if (r && dbus_message_get_type(r) == DBUS_MESSAGE_TYPE_METHOD_RETURN)
return true;
if (!r)
dbus_error_free(&err);
return false;
}