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

resource: allow NULL resource in error

Browse source 
And then log en error instead.
We can remove some awkward patterns in modules.
This commit is contained in:
Wim Taymans 2022-02-02 21:33:33 +01:00
parent 8aea38e81a
commit 1a911a9ccd
7 changed files with 42 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/modules/module-adapter.c
View file

@ -243,21 +243,16 @@ static void *create_object(void *_data,
error_properties:
res = -EINVAL;
pw_log_error("factory %p: usage: " FACTORY_USAGE, d->this);
if (resource)
pw_resource_errorf_id(resource, new_id, res, "usage: " FACTORY_USAGE);
pw_resource_errorf_id(resource, new_id, res, "usage: " FACTORY_USAGE);
goto error_cleanup;
error_errno:
res = -errno;
pw_log_error("can't create node: %m");
if (resource)
pw_resource_errorf_id(resource, new_id, res, "can't create node: %s", spa_strerror(res));
pw_resource_errorf_id(resource, new_id, res, "can't create node: %s", spa_strerror(res));
goto error_cleanup;
error_usage:
res = -EINVAL;
pw_log_error("usage: "ADAPTER_USAGE);
if (resource)
pw_resource_errorf_id(resource, new_id, res, "usage: "ADAPTER_USAGE);
pw_resource_errorf_id(resource, new_id, res, "usage: "ADAPTER_USAGE);
goto error_cleanup;
error_cleanup:
pw_properties_free(properties);