Use new packed option format from gen-options.awk.

[rrace.git] / src / motif.c

diff --git a/src/motif.c b/src/motif.c
index e3ff6c22c587337792b36afc621a49c8511404cf..8b0fa4113d9139e6019abc8ced27fac3485b8859 100644 (file)
--- a/src/motif.c
+++ b/src/motif.c
@@ -25,6 +25,7 @@
 #include <Xm/XmAll.h>
 
 #include "help.h"
+#include "xtra.h"
 #include "motif.h"
 #include "ewmhicon.h"
 #include "motifopt.h"
@@ -40,7 +41,6 @@
 
 #define PROGNAME "rrace"
 static const char *progname = PROGNAME;
-static const struct option lopts[] = { LOPTS_INITIALIZER, {0} };
 
 static char * const default_resources[] = {
        "*title: RRace",
@@ -76,7 +76,7 @@ static void print_usage(FILE *f)
                fprintf(f, "Try %s --help for more information.\n", progname);
 }
 
-static void print_help(void)
+static void print_help(const struct option *lopts)
 {
        struct lopt_help help = {0};
        const struct option *opt;
@@ -100,6 +100,8 @@ static Widget early_setup(XtAppContext *app, int argc, char **argv)
        Widget shell;
        int opt;
 
+       XTRA_PACKED_LOPTS(lopts);
+
        /* Check for --help/--version early (before X connection) */
        opterr = 0;
        while ((opt = getopt_long_only(argc, argv, "", lopts, NULL)) != -1) {
@@ -108,7 +110,7 @@ static Widget early_setup(XtAppContext *app, int argc, char **argv)
                        print_version();
                        exit(EXIT_SUCCESS);
                case LOPT_HELP:
-                       print_help();
+                       print_help(lopts);
                        exit(EXIT_SUCCESS);
                }
        }