From d2ddb56f1fef223872cde14fed7f525f98753806 Mon Sep 17 00:00:00 2001 From: Matthias Kruk Date: Wed, 19 May 2021 08:15:16 +0900 Subject: [PATCH] main: Keep a pointer to the mwm instance in a global variable There are cases when we cannot pass a pointer to the mwm context directly. In these cases, we will need to refer to the mwm instance through a global variable. This commit adds the global reference. --- main.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/main.c b/main.c index 3d83b58..4a2a643 100644 --- a/main.c +++ b/main.c @@ -10,6 +10,8 @@ static struct option cmd_opts[] = { { NULL } }; +struct mwm *__mwm; + static void print_usage(const char *argv0) { printf("Usage: %s [-h]\n" @@ -22,7 +24,6 @@ static void print_usage(const char *argv0) int main(int argc, char *argv[]) { - struct mwm *mwm; int opt; int err; @@ -41,19 +42,19 @@ int main(int argc, char *argv[]) } } while(opt >= 0); - err = mwm_new(&mwm); + err = mwm_new(&__mwm); if(err < 0) { fprintf(stderr, "mwm_new: %s\n", strerror(-err)); return(1); } - err = mwm_init(mwm); + err = mwm_init(__mwm); if(err < 0) { fprintf(stderr, "mwm_init: %s\n", strerror(-err)); } else { - err = mwm_run(mwm); + err = mwm_run(__mwm); if(err < 0) { fprintf(stderr, "mwm_run: %s\n", @@ -61,7 +62,7 @@ int main(int argc, char *argv[]) } } - mwm_free(&mwm); + mwm_free(&__mwm); return(err); } -- 2.47.3