From 8e6b9fd79ca87c131d33d74d40f68df9696c7f5c Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Wed, 9 Mar 2022 22:53:18 -0500 Subject: [PATCH] Avoid uninitialized value error in help output. Technically simply passing an unitialized (indeterminate) arg value to the help_print_option function has undefined behaviour even though it is only unset in cases where it will not actually be used by the function. But it is easy to just ensure it has a well-defined value. --- src/motif.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/motif.c b/src/motif.c index 2d4fe94..be5900d 100644 --- a/src/motif.c +++ b/src/motif.c @@ -68,6 +68,7 @@ static void print_usage(FILE *f) static void print_help(void) { + struct lopt_help help = {0}; const struct option *opt; print_usage(stdout); @@ -75,8 +76,6 @@ static void print_help(void) putchar('\n'); puts("Options:"); for (opt = lopts; opt->name; opt++) { - struct lopt_help help; - if (!lopt_get_help(opt, &help)) continue; help_print_option(opt, help.arg, help.desc, 20); @@ -104,7 +103,7 @@ static Widget early_setup(XtAppContext *app, int argc, char **argv) } } - shell = XtOpenApplication(app, PROGNAME, NULL, 0, + shell = XtOpenApplication(app, PACKAGE_TARNAME, NULL, 0, &argc, argv, (String *)default_resources, sessionShellWidgetClass, NULL, 0); -- 2.43.2