From: Zhao, Gang <gang.zhao.42@gmail.com>
Date: Fri, 26 Feb 2016 09:18:38 +0000 (+0800)
Subject: cli: static keyword tweak
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6cd8912f102e721ea10ac13a1885fb9127cb4951;p=project%2Fubus.git

cli: static keyword tweak

Function ubus_cli_listen() is called only once, and function uloop_run()
and uloop_done() which need struct ubus_event_handler listener are
called within this function, so it's not needed to mark struct
ubus_event_handler listener as static. The same as pointer struct
ubus_context *ctx in main function.

Global struct commands is only used in this file, so it should be marked
static.

Signed-off-by: Zhao, Gang <gang.zhao.42@gmail.com>
---

diff --git a/cli.c b/cli.c
index 98fc4fe..eea43e3 100644
--- a/cli.c
+++ b/cli.c
@@ -142,7 +142,7 @@ static int ubus_cli_call(struct ubus_context *ctx, int argc, char **argv)
 
 static int ubus_cli_listen(struct ubus_context *ctx, int argc, char **argv)
 {
-	static struct ubus_event_handler listener;
+	struct ubus_event_handler listener;
 	const char *event;
 	int ret = 0;
 
@@ -479,7 +479,7 @@ static int usage(const char *prog)
 }
 
 
-struct {
+static struct {
 	const char *name;
 	int (*cb)(struct ubus_context *ctx, int argc, char **argv);
 } commands[] = {
@@ -494,7 +494,7 @@ struct {
 int main(int argc, char **argv)
 {
 	const char *progname, *ubus_socket = NULL;
-	static struct ubus_context *ctx;
+	struct ubus_context *ctx;
 	char *cmd;
 	int ret = 0;
 	int i, ch;