Merge branch 'master' of https://github.com/celestinechen/fio

[fio.git] / gfio.c

diff --git a/gfio.c b/gfio.c
index 28053968515f99340f51667aaffa337bdf733ebb..10c9b0947bbde51623f0f58b5a0ef5d43b30e4d6 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;
@@ -728,8 +730,7 @@ static struct gui_entry *alloc_new_gui_entry(struct gui *ui)
 {
        struct gui_entry *ge;
 
-       ge = malloc(sizeof(*ge));
-       memset(ge, 0, sizeof(*ge));
+       ge = calloc(1, sizeof(*ge));
        ge->state = GE_STATE_NEW;
        ge->ui = ui;
        return ge;
@@ -1272,7 +1273,7 @@ static GtkActionEntry menu_items[] = {
        { "Quit", GTK_STOCK_QUIT, NULL,   "<Control>Q", NULL, G_CALLBACK(quit_clicked) },
        { "About", GTK_STOCK_ABOUT, NULL,  NULL, NULL, G_CALLBACK(about_dialog) },
 };
-static gint nmenu_items = ARRAY_SIZE(menu_items);
+static gint nmenu_items = FIO_ARRAY_SIZE(menu_items);
 
 static const gchar *ui_string = " \
        <ui> \
@@ -1445,7 +1446,7 @@ static GtkWidget *new_client_page(struct gui_entry *ge)
        gtk_container_add(GTK_CONTAINER(bottom_align), ge->buttonbox);
        gtk_box_pack_start(GTK_BOX(main_vbox), bottom_align, FALSE, FALSE, 0);
 
-       add_buttons(ge, buttonspeclist, ARRAY_SIZE(buttonspeclist));
+       add_buttons(ge, buttonspeclist, FIO_ARRAY_SIZE(buttonspeclist));
 
        /*
         * Set up thread status progress bar