Collapse usage message into a single string

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 19 insertions, 23 deletions

diff --git a/xev.c b/xev.c
index bc46901..22f4e38 100644
--- a/xev.c
+++ b/xev.c
@@ -877,35 +877,31 @@ set_sizehints (XSizeHints *hintp, int min_width, int min_height,
 static void
 usage (const char *errmsg)
 {
-    static const char *msg[] = {
-"    -display displayname                X server to contact",
-"    -geometry geom                      size and location of window",
-"    -bw pixels                          border width in pixels",
-"    -bs {NotUseful,WhenMapped,Always}   backingstore attribute",
-"    -id windowid                        use existing window",
-"    -root                               use root window",
-"    -s                                  set save-unders attribute",
-"    -name string                        window name",
-"    -rv                                 reverse video",
-"    -event event_mask                   select 'event_mask' events",
-"           Supported event masks: keyboard mouse expose visibility structure",
-"                                  substructure focus property colormap",
-"                                  owner_grab_button randr button",
-"           This option can be specified multiple times to select multiple",
-"           event masks.",
-"    -version                            print version and exit",
-"",
-NULL};
-    const char **cpp;
+    const char *msg =
+"    -display displayname                X server to contact\n"
+"    -geometry geom                      size and location of window\n"
+"    -bw pixels                          border width in pixels\n"
+"    -bs {NotUseful,WhenMapped,Always}   backingstore attribute\n"
+"    -id windowid                        use existing window\n"
+"    -root                               use root window\n"
+"    -s                                  set save-unders attribute\n"
+"    -name string                        window name\n"
+"    -rv                                 reverse video\n"
+"    -event event_mask                   select 'event_mask' events\n"
+"           Supported event masks: keyboard mouse expose visibility structure\n"
+"                                  substructure focus property colormap\n"
+"                                  owner_grab_button randr button\n"
+"           This option can be specified multiple times to select multiple\n"
+"           event masks.\n"
+"    -version                            print version and exit\n"
+"\n";
 
     if (errmsg != NULL)
         fprintf (stderr, "%s: %s\n", ProgramName, errmsg);
 
     fprintf (stderr, "usage:  %s [-options ...]\n", ProgramName);
     fprintf (stderr, "where options include:\n");
-
-    for (cpp = msg; *cpp; cpp++)
-	fprintf (stderr, "%s\n", *cpp);
+    fputs (msg, stderr);
 
     exit (1);
 }