#include <locale.h>
-#include <malloc.h>
+#include <stdlib.h>
#include <string.h>
#include <glib.h>
#include "ghelpers.h"
#include "gerror.h"
#include "parse.h"
+#include "optgroup.h"
struct gopt {
GtkWidget *box;
GtkWidget *box, uint64_t groupmask)
{
uint64_t mask, group;
- struct opt_group *og;
+ const struct opt_group *og;
GtkWidget *frame, *hbox;
struct gopt_frame_widget *gfw;
if (!og)
return NULL;
- group = ffz(~groupmask);
+ group = ffz64(~groupmask);
gfw = &gjv->g_widgets[group];
if (!gfw->vbox[0]) {
frame = gtk_frame_new(og->name);
unsigned long long *p, unsigned int idx)
{
struct gopt_str_val *g;
- const gchar *postfix[] = { "B", "KB", "MB", "GB", "PB", "TB", "" };
+ const gchar *postfix[] = { "B", "KiB", "MiB", "GiB", "PiB", "PiB", "" };
GtkWidget *label;
int i;
for (i = 0; fio_options[i].name; i++) {
struct fio_option *o = &fio_options[i];
uint64_t mask = o->category;
- struct opt_group *og;
+ const struct opt_group *og;
while ((og = opt_group_from_mask(&mask)) != NULL) {
- GtkWidget *vbox = gjv->vboxes[ffz(~og->mask)];
+ GtkWidget *vbox = gjv->vboxes[ffz64(~og->mask)];
hbox = gtk_hbox_new(FALSE, 3);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
return vbox;
}
-static GtkWidget *gopt_add_group_tab(GtkWidget *notebook, struct opt_group *og)
+static GtkWidget *gopt_add_group_tab(GtkWidget *notebook,
+ const struct opt_group *og)
{
return gopt_add_tab(notebook, og->name);
}
static void gopt_add_group_tabs(GtkWidget *notebook, struct gopt_job_view *gjv)
{
- struct opt_group *og;
+ const struct opt_group *og;
unsigned int i;
i = 0;