Recent changes (master)

Jens Axboe
2020-06-03T12:00:22Z

The following changes since commit 2f6cbfdcf0ce3b53e83713e3a6b5a0bb6a76a1e9:

Merge branch 'pshared1' of https://github.com/kusumi/fio (2020-05-29 08:16:10 -0600)

are available in the Git repository at:

git://git.kernel.dk/fio.git master

for you to fetch changes up to 63a4b9cca4ba3aa4101051402cbbe946ced17a49:

gfio: don't have multiple versions of main_ui (2020-06-02 08:20:03 -0600)

----------------------------------------------------------------
Jens Axboe (1):
gfio: don't have multiple versions of main_ui

gfio.c | 4 +++-
gfio.h | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)

---

Diff of recent changes:

diff --git a/gfio.c b/gfio.c
index 28053968..734651b6 100644
--- 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 aa14e3c7..2bf0ea24 100644
--- 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,