ui/ncurses: Add discover client to struct cui
authorJeremy Kerr <jk@ozlabs.org>
Wed, 27 Feb 2013 08:23:56 +0000 (16:23 +0800)
committerJeremy Kerr <jk@ozlabs.org>
Mon, 15 Apr 2013 07:42:26 +0000 (15:42 +0800)
.. we'll need it later.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
ui/ncurses/nc-cui.c
ui/ncurses/nc-cui.h

index 6ef43ee89afa62150004c8ce96a64af1bfbad077..b3fe451dba4eaab99fc5e564c178217d09242d3d 100644 (file)
@@ -526,7 +526,6 @@ struct cui *cui_init(void* platform_info,
        int (*js_map)(const struct js_event *e), int start_deamon, int dry_run)
 {
        struct cui *cui;
-       struct discover_client *client;
        unsigned int i;
 
        cui = talloc_zero(NULL, struct cui);
@@ -548,15 +547,15 @@ struct cui *cui_init(void* platform_info,
 
 retry_start:
        for (i = start_deamon ? 2 : 10; i; i--) {
-               client = discover_client_init(cui->waitset,
+               cui->client = discover_client_init(cui->waitset,
                                &cui_client_ops, cui);
-               if (client || !i)
+               if (cui->client || !i)
                        break;
                pb_log("%s: waiting for server %d\n", __func__, i);
                sleep(1);
        }
 
-       if (!client && start_deamon) {
+       if (!cui->client && start_deamon) {
                int result;
 
                start_deamon = 0;
@@ -574,7 +573,7 @@ retry_start:
                goto fail_client_init;
        }
 
-       if (!client) {
+       if (!cui->client) {
                pb_log("%s: discover_client_init failed.\n", __func__);
                fprintf(stderr, "%s: error: discover_client_init failed.\n",
                        __func__);
index abe22a8ad3fc61569398ea51069836f69bb43b0e..14e4e0661ac42484c5ba759b5dc4ec226c63c6ff 100644 (file)
@@ -56,6 +56,7 @@ struct cui {
        struct pmenu *main;
        struct ui_timer timer;
        struct waitset *waitset;
+       struct discover_client *client;
        struct pjs *pjs;
        void *platform_info;
        unsigned int default_item;