gfio: don't have multiple versions of main_ui

Also comment a fall-through case appropriately, so newer GCC
don't warn.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/gfio.c b/gfio.c
index 28053968515f99340f51667aaffa337bdf733ebb..734651b676c99bac87e4e6fd1c46a22eb03a1860 100644 (file)
--- a/gfio.c
+++ b/gfio.c
@@ -38,6 +38,8 @@
 #include "gclient.h"
 #include "graph.h"
 
+struct gui main_ui;
+
 static bool gfio_server_running;
 static unsigned int gfio_graph_limit = 100;
 
@@ -223,7 +225,7 @@ static void update_button_states(struct gui *ui, struct gui_entry *ge)
        switch (ge->state) {
        default:
                gfio_report_error(ge, "Bad client state: %u\n", ge->state);
-               /* fall through to new state */
+               /* fall-through */
        case GE_STATE_NEW:
                connect_state = 1;
                edit_state = 1;

diff --git a/gfio.h b/gfio.h
index aa14e3c7d961108c7759bbe9449c2fbea7b65d57..2bf0ea2424373ae6f3a589e36e08c983c3d75950 100644 (file)
--- a/gfio.h
+++ b/gfio.h
@@ -78,7 +78,9 @@ struct gui {
        int handler_running;
 
        GHashTable *ge_hash;
-} main_ui;
+};
+
+extern struct gui main_ui;
 
 enum {
        GE_STATE_NEW = 1,