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

module-portal: improve error message

Browse source 
Pass some error messages and errno around to give a better error
message (instead of ENOMEM) when the connection with dbus fails.
This commit is contained in:
Wim Taymans 2021-03-11 15:18:28 +01:00
parent d63f4234ae
commit bdea557fb1
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/modules/module-portal.c
View file

@ -234,6 +234,8 @@ static int init_dbus_connection(struct impl *impl)
DBusError error; DBusError error;
impl->bus = spa_dbus_connection_get(impl->conn); impl->bus = spa_dbus_connection_get(impl->conn);
if (impl->bus == NULL)
return -EIO;
dbus_error_init(&error); dbus_error_init(&error);
@ -247,7 +249,7 @@ static int init_dbus_connection(struct impl *impl)
pw_log_error("Failed to add name owner changed listener: %s", pw_log_error("Failed to add name owner changed listener: %s",
error.message); error.message);
dbus_error_free(&error); dbus_error_free(&error);
return -1; return -EIO;
} }
dbus_connection_add_filter(impl->bus, name_owner_changed_handler, dbus_connection_add_filter(impl->bus, name_owner_changed_handler,
@ -266,6 +268,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
struct spa_dbus *dbus; struct spa_dbus *dbus;
const struct spa_support *support; const struct spa_support *support;
uint32_t n_support; uint32_t n_support;
int res;
support = pw_context_get_support(context, &n_support); support = pw_context_get_support(context, &n_support);
@ -283,10 +286,12 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
impl->properties = args ? pw_properties_new_string(args) : NULL; impl->properties = args ? pw_properties_new_string(args) : NULL;
impl->conn = spa_dbus_get_connection(dbus, SPA_DBUS_TYPE_SESSION); impl->conn = spa_dbus_get_connection(dbus, SPA_DBUS_TYPE_SESSION);
if (impl->conn == NULL) if (impl->conn == NULL) {
res = -errno;
goto error; goto error;
}
if (init_dbus_connection(impl) != 0) if ((res = init_dbus_connection(impl)) < 0)
goto error; goto error;
pw_context_add_listener(context, &impl->context_listener, &context_events, impl); pw_context_add_listener(context, &impl->context_listener, &context_events, impl);
@ -296,6 +301,6 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
error: error:
free(impl); free(impl);
pw_log_error("Failed to connect to system bus"); pw_log_error("Failed to connect to system bus: %s", spa_strerror(res));
return -ENOMEM; return res;
} }