MINOR: mworker: mworker_cli_proxy_new_listener() returns a bind_conf
mworker_cli_proxy_new_listener() now returns a bind_conf * or NULL upon
failure.
diff --git a/include/haproxy/cli.h b/include/haproxy/cli.h
index 444c09b..844df15 100644
--- a/include/haproxy/cli.h
+++ b/include/haproxy/cli.h
@@ -42,7 +42,7 @@
/* mworker proxy functions */
int mworker_cli_proxy_create(void);
-int mworker_cli_proxy_new_listener(char *line);
+struct bind_conf *mworker_cli_proxy_new_listener(char *line);
int mworker_cli_sockpair_new(struct mworker_proc *mworker_proc, int proc);
void mworker_cli_proxy_stop(void);
diff --git a/src/cli.c b/src/cli.c
index d238a23..c0d8efa 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -3076,7 +3076,7 @@
/*
* Create a new listener for the master CLI proxy
*/
-int mworker_cli_proxy_new_listener(char *line)
+struct bind_conf *mworker_cli_proxy_new_listener(char *line)
{
struct bind_conf *bind_conf;
struct listener *l;
@@ -3165,13 +3165,13 @@
}
global.maxsock += mworker_proxy->maxconn;
- return 0;
+ return bind_conf;
err:
ha_alert("%s\n", err);
free(err);
free(bind_conf);
- return -1;
+ return NULL;
}
diff --git a/src/haproxy.c b/src/haproxy.c
index 9b3b37f..9350216 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -2121,7 +2121,7 @@
list_for_each_entry_safe(c, it, &mworker_cli_conf, list) {
- if (mworker_cli_proxy_new_listener(c->s) < 0) {
+ if (mworker_cli_proxy_new_listener(c->s) == NULL) {
ha_alert("Can't create the master's CLI.\n");
exit(EXIT_FAILURE);
}
@@ -2131,8 +2131,7 @@
}
/* Create the mcli_reload listener from the proc_self struct */
memprintf(&path, "sockpair@%d", proc_self->ipc_fd[1]);
-
- if (mworker_cli_proxy_new_listener(path) < 0) {
+ if (mworker_cli_proxy_new_listener(path) == NULL) {
ha_alert("Cannot create the mcli_reload listener.\n");
exit(EXIT_FAILURE);
}