From: Hans Dedecker <dedeckeh@gmail.com>
Date: Sat, 18 Feb 2017 12:41:53 +0000 (+0100)
Subject: cli: fix listen_timeout compile issue
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=34c6e818e431cc53478a0f7c7c1eca07d194d692;p=oweals%2Fubus.git

cli: fix listen_timeout compile issue

Variable listen_timeout is redefined as a function resulting into
a compile issue. Define the function as ubus_cli_listen_timeout
to fix the compile issue.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
---

diff --git a/cli.c b/cli.c
index 1949a17..19ccbb5 100644
--- a/cli.c
+++ b/cli.c
@@ -159,7 +159,7 @@ struct cli_listen_data {
 	bool timed_out;
 };
 
-static void listen_timeout(struct uloop_timeout *timeout)
+static void ubus_cli_listen_timeout(struct uloop_timeout *timeout)
 {
 	struct cli_listen_data *data = container_of(timeout, struct cli_listen_data, timeout);
 	data->timed_out = true;
@@ -169,7 +169,7 @@ static void listen_timeout(struct uloop_timeout *timeout)
 static void do_listen(struct ubus_context *ctx, struct cli_listen_data *data)
 {
 	memset(data, 0, sizeof(*data));
-	data->timeout.cb = listen_timeout;
+	data->timeout.cb = ubus_cli_listen_timeout;
 	uloop_init();
 	ubus_add_uloop(ctx);
 	if (listen_timeout)