mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-10 13:30:05 -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/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;
}