X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=gfio.c;h=28053968515f99340f51667aaffa337bdf733ebb;hp=9ccf78c423b22df655f874682918c0a2819a2f61;hb=f572c8f673190d22ba2f9c04344e80d6aa2288a5;hpb=5921cea2cf9607101ed28d57c939a7dc0898b3d3 diff --git a/gfio.c b/gfio.c index 9ccf78c4..28053968 100644 --- a/gfio.c +++ b/gfio.c @@ -18,12 +18,13 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ #include -#include +#include #include +#include #include #include @@ -37,7 +38,7 @@ #include "gclient.h" #include "graph.h" -static int gfio_server_running; +static bool gfio_server_running; static unsigned int gfio_graph_limit = 100; GdkColor gfio_color_white; @@ -460,10 +461,10 @@ static int send_job_file(struct gui_entry *ge) static void *server_thread(void *arg) { fio_server_create_sk_key(); - is_backend = 1; - gfio_server_running = 1; + is_backend = true; + gfio_server_running = true; fio_start_server(NULL); - gfio_server_running = 0; + gfio_server_running = false; fio_server_destroy_sk_key(); return NULL; } @@ -471,7 +472,7 @@ static void *server_thread(void *arg) static void gfio_start_server(struct gui *ui) { if (!gfio_server_running) { - gfio_server_running = 1; + gfio_server_running = true; pthread_create(&ui->server_t, NULL, server_thread, NULL); pthread_detach(ui->server_t); } @@ -1240,10 +1241,10 @@ static void about_dialog(GtkWidget *w, gpointer data) "program-name", "gfio", "comments", "Gtk2 UI for fio", "license", license_trans, - "website", "http://git.kernel.dk/?p=fio.git;a=summary", + "website", "http://git.kernel.dk/cgit/fio/", "authors", authors, "version", fio_version_string, - "copyright", "© 2012 Jens Axboe ", + "copyright", "© 2012-2017 Jens Axboe ", "logo-icon-name", "fio", /* Must be last: */ "wrap-license", TRUE, @@ -1271,7 +1272,7 @@ static GtkActionEntry menu_items[] = { { "Quit", GTK_STOCK_QUIT, NULL, "Q", NULL, G_CALLBACK(quit_clicked) }, { "About", GTK_STOCK_ABOUT, NULL, NULL, NULL, G_CALLBACK(about_dialog) }, }; -static gint nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]); +static gint nmenu_items = ARRAY_SIZE(menu_items); static const gchar *ui_string = " \ \