X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=gfio.c;h=22c5314d3d1d5f93141dd7bedd8b7e902a848cba;hp=734651b676c99bac87e4e6fd1c46a22eb03a1860;hb=HEAD;hpb=c61d39d9ed1fbe7c8f6522353a847939537a5c4f

diff --git a/gfio.c b/gfio.c
index 734651b6..10c9b094 100644
--- a/gfio.c
+++ b/gfio.c
@@ -730,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;
@@ -1274,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> \
@@ -1447,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