Combine usage message strings/calls

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

2 files changed, 26 insertions, 28 deletions

diff --git a/xkbbell.c b/xkbbell.c
index ec841dc..e013544 100644
--- a/xkbbell.c
+++ b/xkbbell.c
@@ -157,24 +157,22 @@ main(int argc, char *argv[])
 
     if (!parseArgs(argc, argv)) {
         fprintf(stderr, "Usage: %s [ <options> ] <name>\n", argv[0]);
-        fprintf(stderr, "Where legal options are:\n");
-        fprintf(stderr, "-help              print this message\n");
-        fprintf(stderr, "-usage             print this message\n");
-        fprintf(stderr, "-display <dpy>     specifies display to use\n");
-        fprintf(stderr, "-synch             turn on synchronization\n");
-        fprintf(stderr, "-dev <id>          specifies device to use\n");
-        fprintf(stderr, "-force             force audible bell\n");
+        fprintf(stderr, "Where legal options are:\n"
+                "-help              print this message\n"
+                "-usage             print this message\n"
+                "-display <dpy>     specifies display to use\n"
+                "-synch             turn on synchronization\n"
+                "-dev <id>          specifies device to use\n"
+                "-force             force audible bell\n"
+                "-nobeep            suppress server bell, event only\n"
+                "-bf <id>           specifies bell feedback to use\n"
+                "-kf <id>           specifies keyboard feedback to use\n"
+                "-v <volume>        specifies volume to use\n"
+                "-w <id>            specifies window to use\n");
         fprintf(stderr,
-                "-nobeep            suppress server bell, event only\n");
-        fprintf(stderr, "-bf <id>           specifies bell feedback to use\n");
-        fprintf(stderr,
-                "-kf <id>           specifies keyboard feedback to use\n");
-        fprintf(stderr, "-v <volume>        specifies volume to use\n");
-        fprintf(stderr, "-w <id>            specifies window to use\n");
-        fprintf(stderr,
-                "If neither device nor feedback are specified, %s uses the\n",
+                "If neither device nor feedback are specified, %s uses the\n"
+                "default values for the core keyboard device.\n",
                 argv[0]);
-        fprintf(stderr, "default values for the core keyboard device.\n");
         return 1;
     }
     dpy = XOpenDisplay(dpyName);
diff --git a/xkbvleds.c b/xkbvleds.c
index fb8b20e..c68f3a2 100644
--- a/xkbvleds.c
+++ b/xkbvleds.c
@@ -62,18 +62,18 @@ static void
 usage(char *program)
 {
     uInformation("Usage: %s <options>\n", program);
-    uInformation("Legal options include the usual X toolkit options plus:\n");
-    uInformation("  -help           Print this message\n");
-    uInformation("  -indpy <name>   Name of display to watch\n");
-    uInformation("  -watch <leds>   Mask of LEDs to watch\n");
-    uInformation("  [-+]automatic   (Don't) watch automatic LEDs\n");
-    uInformation("  [-+]explicit    (Don't) watch explicit LEDs\n");
-    uInformation("  [-+]name        (Don't) watch named LEDs\n");
-    uInformation("  [-+]real        (Don't) watch real LEDs\n");
-    uInformation("  [-+]virtual     (Don't) watch virtual LEDs\n");
-    uInformation("  -intersection   Watch only LEDs in all desired sets\n");
-    uInformation("  -union          Watch LEDs in any desired sets\n");
-    uInformation("The default set of LEDs is -union +name +automatic +real\n");
+    uInformation("Legal options include the usual X toolkit options plus:\n"
+                 "  -help           Print this message\n"
+                 "  -indpy <name>   Name of display to watch\n"
+                 "  -watch <leds>   Mask of LEDs to watch\n"
+                 "  [-+]automatic   (Don't) watch automatic LEDs\n"
+                 "  [-+]explicit    (Don't) watch explicit LEDs\n"
+                 "  [-+]name        (Don't) watch named LEDs\n"
+                 "  [-+]real        (Don't) watch real LEDs\n"
+                 "  [-+]virtual     (Don't) watch virtual LEDs\n"
+                 "  -intersection   Watch only LEDs in all desired sets\n"
+                 "  -union          Watch LEDs in any desired sets\n"
+                 "The default set of LEDs is -union +name +automatic +real\n");
     return;
 }