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 <[email protected]> --- cli.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cli.c b/cli.c index f3a041a..c476f35 100644 --- a/cli.c +++ b/cli.c @@ -127,7 +127,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; @@ -306,7 +306,7 @@ static int usage(const char *prog) } -struct { +static struct { const char *name; int (*cb)(struct ubus_context *ctx, int argc, char **argv); } commands[] = { @@ -320,7 +320,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; -- 2.7.2 _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
