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

Use int instead of bool as result

Browse source 
Prefer to use an int return from a function instead of bool because
it can contain more info about failures.
This commit is contained in:
Wim Taymans 2017-12-18 11:38:30 +01:00
parent e5e360d5df
commit 4d6ac37398
38 changed files with 308 additions and 297 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/modules/module-autolink.c
View file

@ -359,12 +359,15 @@ static const struct pw_core_events core_events = {
*
* Returns: a new #struct impl
*/
static bool module_init(struct pw_module *module, struct pw_properties *properties)
static int module_init(struct pw_module *module, struct pw_properties *properties)
{
struct pw_core *core = pw_module_get_core(module);
struct impl *impl;
impl = calloc(1, sizeof(struct impl));
if (impl == NULL)
return -ENOMEM;
pw_log_debug("module %p: new", impl);
impl->core = core;
@ -377,10 +380,10 @@ static bool module_init(struct pw_module *module, struct pw_properties *properti
pw_core_add_listener(core, &impl->core_listener, &core_events, impl);
pw_module_add_listener(module, &impl->module_listener, &module_events, impl);
return impl;
return 0;
}
bool pipewire__module_init(struct pw_module *module, const char *args)
int pipewire__module_init(struct pw_module *module, const char *args)
{
return module_init(module, NULL);
}

8
src/modules/module-client-node.c
View file

@ -101,7 +101,7 @@ static const struct pw_module_events module_events = {
.destroy = module_destroy,
};
static bool module_init(struct pw_module *module, struct pw_properties *properties)
static int module_init(struct pw_module *module, struct pw_properties *properties)
{
struct pw_core *core = pw_module_get_core(module);
struct pw_type *t = pw_core_get_type(core);
@ -118,7 +118,7 @@ static bool module_init(struct pw_module *module, struct pw_properties *properti
NULL,
sizeof(*data));
if (factory == NULL)
return false;
return -ENOMEM;
data = pw_factory_get_user_data(factory);
data->this = factory;
@ -137,10 +137,10 @@ static bool module_init(struct pw_module *module, struct pw_properties *properti
pw_module_add_listener(module, &data->module_listener, &module_events, data);
return true;
return 0;
}
bool pipewire__module_init(struct pw_module *module, const char *args)
int pipewire__module_init(struct pw_module *module, const char *args)
{
return module_init(module, NULL);
}

122
src/modules/module-client-node/protocol-native.c
View file

@ -149,7 +149,7 @@ static void client_node_marshal_destroy(void *object)
pw_protocol_native_end_proxy(proxy, b);
}
static bool client_node_demarshal_add_mem(void *object, void *data, size_t size)
static int client_node_demarshal_add_mem(void *object, void *data, size_t size)
{
struct pw_proxy *proxy = object;
struct spa_pod_parser prs;
@ -163,7 +163,7 @@ static bool client_node_demarshal_add_mem(void *object, void *data, size_t size)
"I", &type,
"i", &memfd_idx,
"i", &flags, NULL) < 0)
return false;
return -EINVAL;
memfd = pw_protocol_native_get_proxy_fd(proxy, memfd_idx);
@ -171,10 +171,10 @@ static bool client_node_demarshal_add_mem(void *object, void *data, size_t size)
mem_id,
type,
memfd, flags);
return true;
return 0;
}
static bool client_node_demarshal_transport(void *object, void *data, size_t size)
static int client_node_demarshal_transport(void *object, void *data, size_t size)
{
struct pw_proxy *proxy = object;
struct spa_pod_parser prs;
@ -192,23 +192,23 @@ static bool client_node_demarshal_transport(void *object, void *data, size_t siz
"i", &memfd_idx,
"i", &info.offset,
"i", &info.size, NULL) < 0)
return false;
return -EINVAL;
readfd = pw_protocol_native_get_proxy_fd(proxy, ridx);
writefd = pw_protocol_native_get_proxy_fd(proxy, widx);
info.memfd = pw_protocol_native_get_proxy_fd(proxy, memfd_idx);
if (readfd == -1 || writefd == -1 || info.memfd == -1)
return false;
return -EINVAL;
transport = pw_client_node_transport_new_from_info(&info);
pw_proxy_notify(proxy, struct pw_client_node_proxy_events, transport, node_id,
readfd, writefd, transport);
return true;
return 0;
}
static bool client_node_demarshal_set_param(void *object, void *data, size_t size)
static int client_node_demarshal_set_param(void *object, void *data, size_t size)
{
struct pw_proxy *proxy = object;
struct spa_pod_parser prs;
@ -222,13 +222,13 @@ static bool client_node_demarshal_set_param(void *object, void *data, size_t siz
"I", &id,
"i", &flags,
"O", &param, NULL) < 0)
return false;
return -EINVAL;
pw_proxy_notify(proxy, struct pw_client_node_proxy_events, set_param, seq, id, flags, param);
return true;
return 0;
}
static bool client_node_demarshal_event_event(void *object, void *data, size_t size)
static int client_node_demarshal_event_event(void *object, void *data, size_t size)
{
struct pw_proxy *proxy = object;
struct spa_pod_parser prs;
@ -236,13 +236,13 @@ static bool client_node_demarshal_event_event(void *object, void *data, size_t s
spa_pod_parser_init(&prs, data, size, 0);
if (spa_pod_parser_get(&prs, "[ O", &event, NULL) < 0)
return false;
return -EINVAL;
pw_proxy_notify(proxy, struct pw_client_node_proxy_events, event, event);
return true;
return 0;
}
static bool client_node_demarshal_command(void *object, void *data, size_t size)
static int client_node_demarshal_command(void *object, void *data, size_t size)
{
struct pw_proxy *proxy = object;
struct spa_pod_parser prs;
@ -254,13 +254,13 @@ static bool client_node_demarshal_command(void *object, void *data, size_t size)
"["
"i", &seq,
"O", &command, NULL) < 0)
return false;
return -EINVAL;
pw_proxy_notify(proxy, struct pw_client_node_proxy_events, command, seq, command);
return true;
return 0;
}
static bool client_node_demarshal_add_port(void *object, void *data, size_t size)
static int client_node_demarshal_add_port(void *object, void *data, size_t size)
{
struct pw_proxy *proxy = object;
struct spa_pod_parser prs;
@ -272,13 +272,13 @@ static bool client_node_demarshal_add_port(void *object, void *data, size_t size
"i", &seq,
"i", &direction,
"i", &port_id, NULL) < 0)
return false;
return -EINVAL;
pw_proxy_notify(proxy, struct pw_client_node_proxy_events, add_port, seq, direction, port_id);
return true;
return 0;
}
static bool client_node_demarshal_remove_port(void *object, void *data, size_t size)
static int client_node_demarshal_remove_port(void *object, void *data, size_t size)
{
struct pw_proxy *proxy = object;
struct spa_pod_parser prs;
@ -290,13 +290,13 @@ static bool client_node_demarshal_remove_port(void *object, void *data, size_t s
"i", &seq,
"i", &direction,
"i", &port_id, NULL) < 0)
return false;
return -EINVAL;
pw_proxy_notify(proxy, struct pw_client_node_proxy_events, remove_port, seq, direction, port_id);
return true;
return 0;
}
static bool client_node_demarshal_port_set_param(void *object, void *data, size_t size)
static int client_node_demarshal_port_set_param(void *object, void *data, size_t size)
{
struct pw_proxy *proxy = object;
struct spa_pod_parser prs;
@ -312,14 +312,14 @@ static bool client_node_demarshal_port_set_param(void *object, void *data, size_
"I", &id,
"i", &flags,
"O", &param, NULL) < 0)
return false;
return -EINVAL;
pw_proxy_notify(proxy, struct pw_client_node_proxy_events, port_set_param,
seq, direction, port_id, id, flags, param);
return true;
return 0;
}
static bool client_node_demarshal_port_use_buffers(void *object, void *data, size_t size)
static int client_node_demarshal_port_use_buffers(void *object, void *data, size_t size)
{
struct pw_proxy *proxy = object;
struct spa_pod_parser prs;
@ -334,7 +334,7 @@ static bool client_node_demarshal_port_use_buffers(void *object, void *data, siz
"i", &direction,
"i", &port_id,
"i", &n_buffers, NULL) < 0)
return false;
return -EINVAL;
buffers = alloca(sizeof(struct pw_client_node_buffer) * n_buffers);
for (i = 0; i < n_buffers; i++) {
@ -346,7 +346,7 @@ static bool client_node_demarshal_port_use_buffers(void *object, void *data, siz
"i", &buffers[i].size,
"i", &buf->id,
"i", &buf->n_metas, NULL) < 0)
return false;
return -EINVAL;
buf->metas = alloca(sizeof(struct spa_meta) * buf->n_metas);
for (j = 0; j < buf->n_metas; j++) {
@ -355,10 +355,10 @@ static bool client_node_demarshal_port_use_buffers(void *object, void *data, siz
if (spa_pod_parser_get(&prs,
"I", &m->type,
"i", &m->size, NULL) < 0)
return false;
return -EINVAL;
}
if (spa_pod_parser_get(&prs, "i", &buf->n_datas, NULL) < 0)
return false;
return -EINVAL;
buf->datas = alloca(sizeof(struct spa_data) * buf->n_datas);
for (j = 0; j < buf->n_datas; j++) {
@ -370,7 +370,7 @@ static bool client_node_demarshal_port_use_buffers(void *object, void *data, siz
"i", &d->flags,
"i", &d->mapoffset,
"i", &d->maxsize, NULL) < 0)
return false;
return -EINVAL;
d->data = SPA_UINT32_TO_PTR(data_id);
}
@ -379,10 +379,10 @@ static bool client_node_demarshal_port_use_buffers(void *object, void *data, siz
direction,
port_id,
n_buffers, buffers);
return true;
return 0;
}
static bool client_node_demarshal_port_command(void *object, void *data, size_t size)
static int client_node_demarshal_port_command(void *object, void *data, size_t size)
{
struct pw_proxy *proxy = object;
struct spa_pod_parser prs;
@ -395,15 +395,15 @@ static bool client_node_demarshal_port_command(void *object, void *data, size_t
"i", &direction,
"i", &port_id,
"O", &command, NULL) < 0)
return false;
return -EINVAL;
pw_proxy_notify(proxy, struct pw_client_node_proxy_events, port_command, direction,
port_id,
command);
return true;
return 0;
}
static bool client_node_demarshal_port_set_io(void *object, void *data, size_t size)
static int client_node_demarshal_port_set_io(void *object, void *data, size_t size)
{
struct pw_proxy *proxy = object;
struct spa_pod_parser prs;
@ -419,14 +419,14 @@ static bool client_node_demarshal_port_set_io(void *object, void *data, size_t s
"i", &memid,
"i", &off,
"i", &sz, NULL) < 0)
return false;
return -EINVAL;
pw_proxy_notify(proxy, struct pw_client_node_proxy_events, port_set_io,
seq,
direction, port_id,
id, memid,
off, sz);
return true;
return 0;
}
static void
@ -672,7 +672,7 @@ client_node_marshal_port_set_io(void *object,
}
static bool client_node_demarshal_done(void *object, void *data, size_t size)
static int client_node_demarshal_done(void *object, void *data, size_t size)
{
struct pw_resource *resource = object;
struct spa_pod_parser prs;
@ -683,13 +683,13 @@ static bool client_node_demarshal_done(void *object, void *data, size_t size)
"["
"i", &seq,
"i", &res, NULL) < 0)
return false;
return -EINVAL;
pw_resource_do(resource, struct pw_client_node_proxy_methods, done, seq, res);
return true;
return 0;
}
static bool client_node_demarshal_update(void *object, void *data, size_t size)
static int client_node_demarshal_update(void *object, void *data, size_t size)
{
struct pw_resource *resource = object;
struct spa_pod_parser prs;
@ -704,22 +704,22 @@ static bool client_node_demarshal_update(void *object, void *data, size_t size)
"i", &max_input_ports,
"i", &max_output_ports,
"i", &n_params, NULL) < 0)
return false;
return -EINVAL;
params = alloca(n_params * sizeof(struct spa_pod *));
for (i = 0; i < n_params; i++)
if (spa_pod_parser_get(&prs, "O", &params[i], NULL) < 0)
return false;
return -EINVAL;
pw_resource_do(resource, struct pw_client_node_proxy_methods, update, change_mask,
max_input_ports,
max_output_ports,
n_params,
params);
return true;
return 0;
}
static bool client_node_demarshal_port_update(void *object, void *data, size_t size)
static int client_node_demarshal_port_update(void *object, void *data, size_t size)
{
struct pw_resource *resource = object;
struct spa_pod_parser prs;
@ -735,15 +735,15 @@ static bool client_node_demarshal_port_update(void *object, void *data, size_t s
"i", &port_id,
"i", &change_mask,
"i", &n_params, NULL) < 0)
return false;
return -EINVAL;
params = alloca(n_params * sizeof(struct spa_pod *));
for (i = 0; i < n_params; i++)
if (spa_pod_parser_get(&prs, "O", &params[i], NULL) < 0)
return false;
return -EINVAL;
if (spa_pod_parser_get(&prs, "T", &ipod, NULL) < 0)
return false;
return -EINVAL;
if (ipod) {
struct spa_pod_parser p2;
@ -754,7 +754,7 @@ static bool client_node_demarshal_port_update(void *object, void *data, size_t s
"["
"i", &info.flags,
"i", &info.rate, NULL) < 0)
return false;
return -EINVAL;
}
pw_resource_do(resource, struct pw_client_node_proxy_methods, port_update, direction,
@ -762,26 +762,26 @@ static bool client_node_demarshal_port_update(void *object, void *data, size_t s
change_mask,
n_params,
params, infop);
return true;
return 0;
}
static bool client_node_demarshal_set_active(void *object, void *data, size_t size)
static int client_node_demarshal_set_active(void *object, void *data, size_t size)
{
struct pw_resource *resource = object;
struct spa_pod_parser prs;
bool active;
int active;
spa_pod_parser_init(&prs, data, size, 0);
if (spa_pod_parser_get(&prs,
"["
"b", &active, NULL) < 0)
return false;
return -EINVAL;
pw_resource_do(resource, struct pw_client_node_proxy_methods, set_active, active);
return true;
return 0;
}
static bool client_node_demarshal_event_method(void *object, void *data, size_t size)
static int client_node_demarshal_event_method(void *object, void *data, size_t size)
{
struct pw_resource *resource = object;
struct spa_pod_parser prs;
@ -791,23 +791,23 @@ static bool client_node_demarshal_event_method(void *object, void *data, size_t
if (spa_pod_parser_get(&prs,
"["
"O", &event, NULL) < 0)
return false;
return -EINVAL;
pw_resource_do(resource, struct pw_client_node_proxy_methods, event, event);
return true;
return 0;
}
static bool client_node_demarshal_destroy(void *object, void *data, size_t size)
static int client_node_demarshal_destroy(void *object, void *data, size_t size)
{
struct pw_resource *resource = object;
struct spa_pod_parser prs;
spa_pod_parser_init(&prs, data, size, 0);
if (spa_pod_parser_get(&prs, "[", NULL) < 0)
return false;
return -EINVAL;
pw_resource_do(resource, struct pw_client_node_proxy_methods, destroy);
return true;
return 0;
}
static const struct pw_client_node_proxy_methods pw_protocol_native_client_node_method_marshal = {

3
src/modules/module-client-node/transport.c
View file

@ -150,6 +150,9 @@ static int next_message(struct pw_client_node_transport *trans, struct pw_client
impl->current_index & (INPUT_BUFFER_SIZE - 1),
&impl->current, sizeof(struct pw_client_node_message));
if (avail < SPA_POD_SIZE(&impl->current))
return 0;
*message = impl->current;
return 1;

22
src/modules/module-flatpak.c
View file

@ -752,7 +752,7 @@ static const struct pw_module_events module_events = {
.destroy = module_destroy,
};
static bool module_init(struct pw_module *module, struct pw_properties *properties)
static int module_init(struct pw_module *module, struct pw_properties *properties)
{
struct pw_core *core = pw_module_get_core(module);
struct impl *impl;
@ -761,6 +761,9 @@ static bool module_init(struct pw_module *module, struct pw_properties *properti
dbus_error_init(&error);
impl = calloc(1, sizeof(struct impl));
if (impl == NULL)
return -ENOMEM;
pw_log_debug("module %p: new", impl);
impl->core = core;
@ -788,27 +791,16 @@ static bool module_init(struct pw_module *module, struct pw_properties *properti
pw_core_set_permission_callback(core, do_permission, impl);
return true;
return 0;
error:
free(impl);
pw_log_error("Failed to connect to system bus: %s", error.message);
dbus_error_free(&error);
return false;
return -ENOMEM;
}
#if 0
static void module_destroy(struct impl *impl)
{
pw_log_debug("module %p: destroy", impl);
dbus_connection_close(impl->bus);
dbus_connection_unref(impl->bus);
free(impl);
}
#endif
bool pipewire__module_init(struct pw_module *module, const char *args)
int pipewire__module_init(struct pw_module *module, const char *args)
{
return module_init(module, NULL);
}

13
src/modules/module-jack.c
View file

@ -60,8 +60,6 @@
int segment_num = 0;
typedef bool(*demarshal_func_t) (void *object, void *data, size_t size);
struct socket {
int fd;
struct sockaddr_un addr;
@ -1504,7 +1502,7 @@ static const struct pw_module_events module_events = {
.destroy = module_destroy,
};
static bool module_init(struct pw_module *module, struct pw_properties *properties)
static int module_init(struct pw_module *module, struct pw_properties *properties)
{
struct pw_core *core = pw_module_get_core(module);
struct impl *impl;
@ -1512,6 +1510,9 @@ static bool module_init(struct pw_module *module, struct pw_properties *properti
bool promiscuous;
impl = calloc(1, sizeof(struct impl));
if (impl == NULL)
return -ENOMEM;
pw_log_debug("protocol-jack %p: new", impl);
impl->core = core;
@ -1547,14 +1548,14 @@ static bool module_init(struct pw_module *module, struct pw_properties *properti
pw_module_add_listener(module, &impl->module_listener, &module_events, impl);
return true;
return 0;
error:
free(impl);
return false;
return -ENOMEM;
}
bool pipewire__module_init(struct pw_module *module, const char *args)
int pipewire__module_init(struct pw_module *module, const char *args)
{
return module_init(module, NULL);
}

9
src/modules/module-mixer.c
View file

@ -200,12 +200,15 @@ static const struct pw_module_events module_events = {
.destroy = module_destroy,
};
static bool module_init(struct pw_module *module, struct pw_properties *properties)
static int module_init(struct pw_module *module, struct pw_properties *properties)
{
struct pw_core *core = pw_module_get_core(module);
struct impl *impl;
impl = calloc(1, sizeof(struct impl));
if (impl == NULL)
return -ENOMEM;
pw_log_debug("module %p: new", impl);
impl->core = core;
@ -221,10 +224,10 @@ static bool module_init(struct pw_module *module, struct pw_properties *properti
pw_module_add_listener(module, &impl->module_listener, &module_events, impl);
return true;
return 0;
}
bool pipewire__module_init(struct pw_module *module, const char *args)
int pipewire__module_init(struct pw_module *module, const char *args)
{
return module_init(module, NULL);
}

4
src/modules/module-protocol-dbus.c
View file

@ -625,8 +625,8 @@ static void pw_protocol_dbus_destroy(struct impl *impl)
}
#endif
bool pipewire__module_init(struct pw_module *module, const char *args)
int pipewire__module_init(struct pw_module *module, const char *args)
{
pw_protocol_dbus_new(module->core, NULL);
return TRUE;
return 0;
}

16
src/modules/module-protocol-native.c
View file

@ -219,7 +219,7 @@ process_messages(struct client_data *data)
if (!pod_remap_data(SPA_POD_TYPE_STRUCT, message, size, &client->types))
goto invalid_message;
if (!demarshal[opcode].func(resource, message, size))
if (demarshal[opcode].func(resource, message, size) < 0)
goto invalid_message;
}
return;
@ -587,7 +587,7 @@ on_remote_data(void *data, int fd, enum spa_io mask)
continue;
}
}
if (!demarshal[opcode].func(proxy, message, size)) {
if (demarshal[opcode].func(proxy, message, size) < 0) {
pw_log_error ("protocol-native %p: invalid message received %u for %u", this,
opcode, id);
continue;
@ -891,7 +891,7 @@ static const struct pw_module_events module_events = {
.destroy = module_destroy,
};
static bool module_init(struct pw_module *module, struct pw_properties *properties)
static int module_init(struct pw_module *module, struct pw_properties *properties)
{
struct pw_core *core = pw_module_get_core(module);
struct pw_protocol *this;
@ -899,11 +899,11 @@ static bool module_init(struct pw_module *module, struct pw_properties *properti
struct protocol_data *d;
if (pw_core_find_protocol(core, PW_TYPE_PROTOCOL__Native) != NULL)
return true;
return 0;
this = pw_protocol_new(core, PW_TYPE_PROTOCOL__Native, sizeof(struct protocol_data));
if (this == NULL)
return false;
return -ENOMEM;
this->implementation = &protocol_impl;
this->extension = &protocol_ext_impl;
@ -922,15 +922,15 @@ static bool module_init(struct pw_module *module, struct pw_properties *properti
val = pw_properties_get(pw_core_get_properties(core), PW_CORE_PROP_DAEMON);
if (val && pw_properties_parse_bool(val)) {
if (impl_add_server(this, core, properties) == NULL)
return false;
return -ENOMEM;
}
pw_module_add_listener(module, &d->module_listener, &module_events, d);
return true;
return 0;
}
bool pipewire__module_init(struct pw_module *module, const char *args)
int pipewire__module_init(struct pw_module *module, const char *args)
{
return module_init(module, NULL);
}

156
src/modules/module-protocol-native/protocol-native.c
View file

@ -194,7 +194,7 @@ core_marshal_update_types_client(void *object, uint32_t first_id, const char **t
pw_protocol_native_end_proxy(proxy, b);
}
static bool core_demarshal_info(void *object, void *data, size_t size)
static int core_demarshal_info(void *object, void *data, size_t size)
{
struct pw_proxy *proxy = object;
struct spa_dict props;
@ -213,7 +213,7 @@ static bool core_demarshal_info(void *object, void *data, size_t size)
"s", &info.name,
"i", &info.cookie,
"i", &props.n_items, NULL) < 0)
return false;
return -EINVAL;
info.props = &props;
props.items = alloca(props.n_items * sizeof(struct spa_dict_item));
@ -222,13 +222,13 @@ static bool core_demarshal_info(void *object, void *data, size_t size)
"s", &props.items[i].key,
"s", &props.items[i].value,
NULL) < 0)
return false;
return -EINVAL;
}
pw_proxy_notify(proxy, struct pw_core_proxy_events, info, &info);
return true;
return 0;
}
static bool core_demarshal_done(void *object, void *data, size_t size)
static int core_demarshal_done(void *object, void *data, size_t size)
{
struct pw_proxy *proxy = object;
struct spa_pod_parser prs;
@ -236,13 +236,13 @@ static bool core_demarshal_done(void *object, void *data, size_t size)
spa_pod_parser_init(&prs, data, size, 0);
if (spa_pod_parser_get(&prs, "[ i", &seq, NULL) < 0)
return false;
return -EINVAL;
pw_proxy_notify(proxy, struct pw_core_proxy_events, done, seq);
return true;
return 0;
}
static bool core_demarshal_error(void *object, void *data, size_t size)
static int core_demarshal_error(void *object, void *data, size_t size)
{
struct pw_proxy *proxy = object;
struct spa_pod_parser prs;
@ -254,13 +254,13 @@ static bool core_demarshal_error(void *object, void *data, size_t size)
"[ i", &id,
"i", &res,
"s", &error, NULL) < 0)
return false;
return -EINVAL;
pw_proxy_notify(proxy, struct pw_core_proxy_events, error, id, res, error);
return true;
return 0;
}
static bool core_demarshal_remove_id(void *object, void *data, size_t size)
static int core_demarshal_remove_id(void *object, void *data, size_t size)
{
struct pw_proxy *proxy = object;
struct spa_pod_parser prs;
@ -268,13 +268,13 @@ static bool core_demarshal_remove_id(void *object, void *data, size_t size)
spa_pod_parser_init(&prs, data, size, 0);
if (spa_pod_parser_get(&prs, "[ i", &id, NULL) < 0)
return false;
return -EINVAL;
pw_proxy_notify(proxy, struct pw_core_proxy_events, remove_id, id);
return true;
return 0;
}
static bool core_demarshal_update_types_client(void *object, void *data, size_t size)
static int core_demarshal_update_types_client(void *object, void *data, size_t size)
{
struct pw_proxy *proxy = object;
struct spa_pod_parser prs;
@ -287,15 +287,15 @@ static bool core_demarshal_update_types_client(void *object, void *data, size_t
"["
" i", &first_id,
" i", &n_types, NULL) < 0)
return false;
return -EINVAL;
types = alloca(n_types * sizeof(char *));
for (i = 0; i < n_types; i++) {
if (spa_pod_parser_get(&prs, "s", &types[i], NULL) < 0)
return false;
return -EINVAL;
}
pw_proxy_notify(proxy, struct pw_core_proxy_events, update_types, first_id, types, n_types);
return true;
return 0;
}
static void core_marshal_info(void *object, struct pw_core_info *info)
@ -396,7 +396,7 @@ core_marshal_update_types_server(void *object, uint32_t first_id, const char **t
pw_protocol_native_end_resource(resource, b);
}
static bool core_demarshal_client_update(void *object, void *data, size_t size)
static int core_demarshal_client_update(void *object, void *data, size_t size)
{
struct pw_resource *resource = object;
struct spa_dict props;
@ -405,7 +405,7 @@ static bool core_demarshal_client_update(void *object, void *data, size_t size)
spa_pod_parser_init(&prs, data, size, 0);
if (spa_pod_parser_get(&prs, "[ i", &props.n_items, NULL) < 0)
return false;
return -EINVAL;
props.items = alloca(props.n_items * sizeof(struct spa_dict_item));
for (i = 0; i < props.n_items; i++) {
@ -413,13 +413,13 @@ static bool core_demarshal_client_update(void *object, void *data, size_t size)
"s", &props.items[i].key,
"s", &props.items[i].value,
NULL) < 0)
return false;
return -EINVAL;
}
pw_resource_do(resource, struct pw_core_proxy_methods, client_update, &props);
return true;
return 0;
}
static bool core_demarshal_permissions(void *object, void *data, size_t size)
static int core_demarshal_permissions(void *object, void *data, size_t size)
{
struct pw_resource *resource = object;
struct spa_dict props;
@ -428,7 +428,7 @@ static bool core_demarshal_permissions(void *object, void *data, size_t size)
spa_pod_parser_init(&prs, data, size, 0);
if (spa_pod_parser_get(&prs, "[ i", &props.n_items, NULL) < 0)
return false;
return -EINVAL;
props.items = alloca(props.n_items * sizeof(struct spa_dict_item));
for (i = 0; i < props.n_items; i++) {
@ -436,13 +436,13 @@ static bool core_demarshal_permissions(void *object, void *data, size_t size)
"s", &props.items[i].key,
"s", &props.items[i].value,
NULL) < 0)
return false;
return -EINVAL;
}
pw_resource_do(resource, struct pw_core_proxy_methods, permissions, &props);
return true;
return 0;
}
static bool core_demarshal_sync(void *object, void *data, size_t size)
static int core_demarshal_sync(void *object, void *data, size_t size)
{
struct pw_resource *resource = object;
struct spa_pod_parser prs;
@ -450,13 +450,13 @@ static bool core_demarshal_sync(void *object, void *data, size_t size)
spa_pod_parser_init(&prs, data, size, 0);
if (spa_pod_parser_get(&prs, "[i]", &seq, NULL) < 0)
return false;
return -EINVAL;
pw_resource_do(resource, struct pw_core_proxy_methods, sync, seq);
return true;
return 0;
}
static bool core_demarshal_get_registry(void *object, void *data, size_t size)
static int core_demarshal_get_registry(void *object, void *data, size_t size)
{
struct pw_resource *resource = object;
struct spa_pod_parser prs;
@ -464,13 +464,13 @@ static bool core_demarshal_get_registry(void *object, void *data, size_t size)
spa_pod_parser_init(&prs, data, size, 0);
if (spa_pod_parser_get(&prs, "[ii]", &version, &new_id, NULL) < 0)
return false;
return -EINVAL;
pw_resource_do(resource, struct pw_core_proxy_methods, get_registry, version, new_id);
return true;
return 0;
}
static bool core_demarshal_create_object(void *object, void *data, size_t size)
static int core_demarshal_create_object(void *object, void *data, size_t size)
{
struct pw_resource *resource = object;
struct spa_pod_parser prs;
@ -485,24 +485,24 @@ static bool core_demarshal_create_object(void *object, void *data, size_t size)
"I", &type,
"i", &version,
"i", &props.n_items, NULL) < 0)
return false;
return -EINVAL;
props.items = alloca(props.n_items * sizeof(struct spa_dict_item));
for (i = 0; i < props.n_items; i++) {
if (spa_pod_parser_get(&prs, "ss",
&props.items[i].key, &props.items[i].value, NULL) < 0)
return false;
return -EINVAL;
}
if (spa_pod_parser_get(&prs, "i", &new_id, NULL) < 0)
return false;
return -EINVAL;
pw_resource_do(resource, struct pw_core_proxy_methods, create_object, factory_name,
type, version,
&props, new_id);
return true;
return 0;
}
static bool core_demarshal_create_link(void *object, void *data, size_t size)
static int core_demarshal_create_link(void *object, void *data, size_t size)
{
struct pw_resource *resource = object;
struct spa_pod_parser prs;
@ -520,16 +520,16 @@ static bool core_demarshal_create_link(void *object, void *data, size_t size)
"i", &input_port_id,
"P", &filter,
"i", &props.n_items, NULL) < 0)
return false;
return -EINVAL;
props.items = alloca(props.n_items * sizeof(struct spa_dict_item));
for (i = 0; i < props.n_items; i++) {
if (spa_pod_parser_get(&prs, "ss",
&props.items[i].key, &props.items[i].value, NULL) < 0)
return false;
return -EINVAL;
}
if (spa_pod_parser_get(&prs, "i", &new_id, NULL) < 0)
return false;
return -EINVAL;
pw_resource_do(resource, struct pw_core_proxy_methods, create_link, output_node_id,
output_port_id,
@ -538,10 +538,10 @@ static bool core_demarshal_create_link(void *object, void *data, size_t size)
filter,
&props,
new_id);
return true;
return 0;
}
static bool core_demarshal_update_types_server(void *object, void *data, size_t size)
static int core_demarshal_update_types_server(void *object, void *data, size_t size)
{
struct pw_resource *resource = object;
struct spa_pod_parser prs;
@ -554,15 +554,15 @@ static bool core_demarshal_update_types_server(void *object, void *data, size_t
"["
"i", &first_id,
"i", &n_types, NULL) < 0)
return false;
return -EINVAL;
types = alloca(n_types * sizeof(char *));
for (i = 0; i < n_types; i++) {
if (spa_pod_parser_get(&prs, "s", &types[i], NULL) < 0)
return false;
return -EINVAL;
}
pw_resource_do(resource, struct pw_core_proxy_methods, update_types, first_id, types, n_types);
return true;
return 0;
}
static void registry_marshal_global(void *object, uint32_t id, uint32_t parent_id, uint32_t permissions,
@ -595,7 +595,7 @@ static void registry_marshal_global_remove(void *object, uint32_t id)
pw_protocol_native_end_resource(resource, b);
}
static bool registry_demarshal_bind(void *object, void *data, size_t size)
static int registry_demarshal_bind(void *object, void *data, size_t size)
{
struct pw_resource *resource = object;
struct spa_pod_parser prs;
@ -608,10 +608,10 @@ static bool registry_demarshal_bind(void *object, void *data, size_t size)
"I", &type,
"i", &version,
"i", &new_id, NULL) < 0)
return false;
return -EINVAL;
pw_resource_do(resource, struct pw_registry_proxy_methods, bind, id, type, version, new_id);
return true;
return 0;
}
static void module_marshal_info(void *object, struct pw_module_info *info)
@ -643,7 +643,7 @@ static void module_marshal_info(void *object, struct pw_module_info *info)
pw_protocol_native_end_resource(resource, b);
}
static bool module_demarshal_info(void *object, void *data, size_t size)
static int module_demarshal_info(void *object, void *data, size_t size)
{
struct pw_proxy *proxy = object;
struct spa_pod_parser prs;
@ -660,17 +660,17 @@ static bool module_demarshal_info(void *object, void *data, size_t size)
"s", &info.filename,
"s", &info.args,
"i", &props.n_items, NULL) < 0)
return false;
return -EINVAL;
info.props = &props;
props.items = alloca(props.n_items * sizeof(struct spa_dict_item));
for (i = 0; i < props.n_items; i++) {
if (spa_pod_parser_get(&prs, "ss",
&props.items[i].key, &props.items[i].value, NULL) < 0)
return false;
return -EINVAL;
}
pw_proxy_notify(proxy, struct pw_module_proxy_events, info, &info);
return true;
return 0;
}
static void factory_marshal_info(void *object, struct pw_factory_info *info)
@ -702,7 +702,7 @@ static void factory_marshal_info(void *object, struct pw_factory_info *info)
pw_protocol_native_end_resource(resource, b);
}
static bool factory_demarshal_info(void *object, void *data, size_t size)
static int factory_demarshal_info(void *object, void *data, size_t size)
{
struct pw_proxy *proxy = object;
struct spa_pod_parser prs;
@ -719,7 +719,7 @@ static bool factory_demarshal_info(void *object, void *data, size_t size)
"I", &info.type,
"i", &info.version,
"i", &props.n_items, NULL) < 0)
return false;
return -EINVAL;
info.props = &props;
props.items = alloca(props.n_items * sizeof(struct spa_dict_item));
@ -727,10 +727,10 @@ static bool factory_demarshal_info(void *object, void *data, size_t size)
if (spa_pod_parser_get(&prs,
"s", &props.items[i].key,
"s", &props.items[i].value, NULL) < 0)
return false;
return -EINVAL;
}
pw_proxy_notify(proxy, struct pw_factory_proxy_events, info, &info);
return true;
return 0;
}
static void node_marshal_info(void *object, struct pw_node_info *info)
@ -777,7 +777,7 @@ static void node_marshal_info(void *object, struct pw_node_info *info)
pw_protocol_native_end_resource(resource, b);
}
static bool node_demarshal_info(void *object, void *data, size_t size)
static int node_demarshal_info(void *object, void *data, size_t size)
{
struct pw_proxy *proxy = object;
struct spa_pod_parser prs;
@ -794,29 +794,29 @@ static bool node_demarshal_info(void *object, void *data, size_t size)
"i", &info.max_input_ports,
"i", &info.n_input_ports,
"i", &info.n_input_params, NULL) < 0)
return false;
return -EINVAL;
info.input_params = alloca(info.n_input_params * sizeof(struct spa_pod *));
for (i = 0; i < info.n_input_params; i++)
if (spa_pod_parser_get(&prs, "P", &info.input_params[i], NULL) < 0)
return false;
return -EINVAL;
if (spa_pod_parser_get(&prs,
"i", &info.max_output_ports,
"i", &info.n_output_ports,
"i", &info.n_output_params, NULL) < 0)
return false;
return -EINVAL;
info.output_params = alloca(info.n_output_params * sizeof(struct spa_pod *));
for (i = 0; i < info.n_output_params; i++)
if (spa_pod_parser_get(&prs, "P", &info.output_params[i], NULL) < 0)
return false;
return -EINVAL;
if (spa_pod_parser_get(&prs,
"i", &info.state,
"s", &info.error,
"i", &props.n_items, NULL) < 0)
return false;
return -EINVAL;
info.props = &props;
props.items = alloca(props.n_items * sizeof(struct spa_dict_item));
@ -824,10 +824,10 @@ static bool node_demarshal_info(void *object, void *data, size_t size)
if (spa_pod_parser_get(&prs,
"s", &props.items[i].key,
"s", &props.items[i].value, NULL) < 0)
return false;
return -EINVAL;
}
pw_proxy_notify(proxy, struct pw_node_proxy_events, info, &info);
return true;
return 0;
}
static void client_marshal_info(void *object, struct pw_client_info *info)
@ -856,7 +856,7 @@ static void client_marshal_info(void *object, struct pw_client_info *info)
pw_protocol_native_end_resource(resource, b);
}
static bool client_demarshal_info(void *object, void *data, size_t size)
static int client_demarshal_info(void *object, void *data, size_t size)
{
struct pw_proxy *proxy = object;
struct spa_pod_parser prs;
@ -870,7 +870,7 @@ static bool client_demarshal_info(void *object, void *data, size_t size)
"i", &info.id,
"l", &info.change_mask,
"i", &props.n_items, NULL) < 0)
return false;
return -EINVAL;
info.props = &props;
props.items = alloca(props.n_items * sizeof(struct spa_dict_item));
@ -878,10 +878,10 @@ static bool client_demarshal_info(void *object, void *data, size_t size)
if (spa_pod_parser_get(&prs,
"s", &props.items[i].key,
"s", &props.items[i].value, NULL) < 0)
return false;
return -EINVAL;
}
pw_proxy_notify(proxy, struct pw_client_proxy_events, info, &info);
return true;
return 0;
}
static void link_marshal_info(void *object, struct pw_link_info *info)
@ -915,7 +915,7 @@ static void link_marshal_info(void *object, struct pw_link_info *info)
pw_protocol_native_end_resource(resource, b);
}
static bool link_demarshal_info(void *object, void *data, size_t size)
static int link_demarshal_info(void *object, void *data, size_t size)
{
struct pw_proxy *proxy = object;
struct spa_pod_parser prs;
@ -934,7 +934,7 @@ static bool link_demarshal_info(void *object, void *data, size_t size)
"i", &info.input_port_id,
"P", &info.format,
"i", &props.n_items, NULL) < 0)
return false;
return -EINVAL;
info.props = &props;
props.items = alloca(props.n_items * sizeof(struct spa_dict_item));
@ -942,13 +942,13 @@ static bool link_demarshal_info(void *object, void *data, size_t size)
if (spa_pod_parser_get(&prs,
"s", &props.items[i].key,
"s", &props.items[i].value, NULL) < 0)
return false;
return -EINVAL;
}
pw_proxy_notify(proxy, struct pw_link_proxy_events, info, &info);
return true;
return 0;
}
static bool registry_demarshal_global(void *object, void *data, size_t size)
static int registry_demarshal_global(void *object, void *data, size_t size)
{
struct pw_proxy *proxy = object;
struct spa_pod_parser prs;
@ -962,13 +962,13 @@ static bool registry_demarshal_global(void *object, void *data, size_t size)
"i", &permissions,
"I", &type,
"i", &version, NULL) < 0)
return false;
return -EINVAL;
pw_proxy_notify(proxy, struct pw_registry_proxy_events, global, id, parent_id, permissions, type, version);
return true;
return 0;
}
static bool registry_demarshal_global_remove(void *object, void *data, size_t size)
static int registry_demarshal_global_remove(void *object, void *data, size_t size)
{
struct pw_proxy *proxy = object;
struct spa_pod_parser prs;
@ -976,10 +976,10 @@ static bool registry_demarshal_global_remove(void *object, void *data, size_t si
spa_pod_parser_init(&prs, data, size, 0);
if (spa_pod_parser_get(&prs, "[ i", &id, NULL) < 0)
return false;
return -EINVAL;
pw_proxy_notify(proxy, struct pw_registry_proxy_events, global_remove, id);
return true;
return 0;
}
static void registry_marshal_bind(void *object, uint32_t id,

9
src/modules/module-suspend-on-idle.c
View file

@ -190,11 +190,14 @@ const struct pw_core_events core_events = {
*
* Returns: a new #struct impl
*/
static bool module_init(struct pw_module *module, struct pw_properties *properties)
static int module_init(struct pw_module *module, struct pw_properties *properties)
{
struct impl *impl;
impl = calloc(1, sizeof(struct impl));
if (impl == NULL)
return -ENOMEM;
pw_log_debug("module %p: new", impl);
impl->core = pw_module_get_core(module);
@ -206,10 +209,10 @@ static bool module_init(struct pw_module *module, struct pw_properties *properti
pw_module_add_listener(module, &impl->module_listener, &module_events, impl);
pw_core_add_listener(impl->core, &impl->core_listener, &core_events, impl);
return impl;
return 0;
}
bool pipewire__module_init(struct pw_module *module, const char *args)
int pipewire__module_init(struct pw_module *module, const char *args)
{
return module_init(module, NULL);
}

9
src/modules/spa/module-monitor.c
View file

@ -22,6 +22,7 @@
#include "config.h"
#endif
#include <errno.h>
#include <getopt.h>
#include <limits.h>
@ -51,7 +52,7 @@ const struct pw_module_events module_events = {
.destroy = module_destroy,
};
bool pipewire__module_init(struct pw_module *module, const char *args)
int pipewire__module_init(struct pw_module *module, const char *args)
{
const char *dir;
char **argv;
@ -73,6 +74,8 @@ bool pipewire__module_init(struct pw_module *module, const char *args)
pw_module_get_global(module),
dir, argv[0], argv[1], argv[2],
sizeof(struct data));
if (monitor == NULL)
return -ENOMEM;
data = monitor->user_data;
data->monitor = monitor;
@ -81,11 +84,11 @@ bool pipewire__module_init(struct pw_module *module, const char *args)
pw_module_add_listener(module, &data->module_listener, &module_events, data);
return true;
return 0;
not_enough_arguments:
pw_free_strv(argv);
wrong_arguments:
pw_log_error("usage: module-spa-monitor <plugin> <factory> <name>");
return false;
return -EINVAL;
}

17
src/modules/spa/module-node-factory.c
View file

@ -148,7 +148,7 @@ static const struct pw_module_events module_events = {
.destroy = module_destroy,
};
static bool module_init(struct pw_module *module, struct pw_properties *properties)
static int module_init(struct pw_module *module, struct pw_properties *properties)
{
struct pw_core *core = pw_module_get_core(module);
struct pw_type *t = pw_core_get_type(core);
@ -162,7 +162,7 @@ static bool module_init(struct pw_module *module, struct pw_properties *properti
NULL,
sizeof(*data));
if (factory == NULL)
return false;
return -ENOMEM;
data = pw_factory_get_user_data(factory);
data->this = factory;
@ -178,19 +178,10 @@ static bool module_init(struct pw_module *module, struct pw_properties *properti
pw_factory_register(factory, NULL, pw_module_get_global(module));
return true;
return 0;
}
#if 0
static void module_destroy(struct impl *impl)
{
pw_log_debug("module %p: destroy", impl);
free(impl);
}
#endif
bool pipewire__module_init(struct pw_module *module, const char *args)
int pipewire__module_init(struct pw_module *module, const char *args)
{
return module_init(module, NULL);
}

11
src/modules/spa/module-node.c
View file

@ -22,6 +22,7 @@
#include "config.h"
#endif
#include <errno.h>
#include <getopt.h>
#include <limits.h>
@ -52,7 +53,7 @@ static const struct pw_module_events module_events = {
.destroy = module_destroy,
};
bool pipewire__module_init(struct pw_module *module, const char *args)
int pipewire__module_init(struct pw_module *module, const char *args)
{
struct pw_properties *props = NULL;
char **argv;
@ -69,6 +70,8 @@ bool pipewire__module_init(struct pw_module *module, const char *args)
goto not_enough_arguments;
props = pw_properties_new(NULL, NULL);
if (props == NULL)
return -ENOMEM;
for (i = 3; i < n_tokens; i++) {
char **prop;
@ -92,7 +95,7 @@ bool pipewire__module_init(struct pw_module *module, const char *args)
pw_free_strv(argv);
if (node == NULL)
return false;
return -ENOMEM;
data = pw_spa_node_get_user_data(node);
data->this = node;
@ -102,11 +105,11 @@ bool pipewire__module_init(struct pw_module *module, const char *args)
pw_log_debug("module %p: new", module);
pw_module_add_listener(module, &data->module_listener, &module_events, data);
return true;
return 0;
not_enough_arguments:
pw_free_strv(argv);
wrong_arguments:
pw_log_error("usage: module-spa-node <plugin> <factory> <name> [key=value ...]");
return false;
return -EINVAL;
}