From 1636536e4d158e994f045133267ae9b4b278c4f3 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun, 13 Jan 2013 10:33:36 -0800
Subject: Combine usage message strings

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---
 xsetroot.c | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/xsetroot.c b/xsetroot.c
index 5f21f91..40f0267 100644
--- a/xsetroot.c
+++ b/xsetroot.c
@@ -69,22 +69,23 @@ static Pixmap ReadBitmapFile(char *filename, unsigned int *width, unsigned int *
 static void
 usage(void)
 {
-    fprintf(stderr, "usage: %s [options]\n", program_name);
-    fprintf(stderr, "  where options are:\n");
-    fprintf(stderr, "  -display <display>   or   -d <display>\n");
-    fprintf(stderr, "  -fg <color>   or   -foreground <color>\n");
-    fprintf(stderr, "  -bg <color>   or   -background <color>\n");
-    fprintf(stderr, "  -rv   or   -reverse\n");
-    fprintf(stderr, "  -help\n");
-    fprintf(stderr, "  -def   or   -default\n");
-    fprintf(stderr, "  -name <string>\n");
-    fprintf(stderr, "  -cursor <cursor file> <mask file>\n");
-    fprintf(stderr, "  -cursor_name <cursor-font name>\n");
-    fprintf(stderr, "  -xcf <ARGB cursor file> <cursor size>\n");
-    fprintf(stderr, "  -solid <color>\n");
-    fprintf(stderr, "  -gray   or   -grey\n");
-    fprintf(stderr, "  -bitmap <filename>\n");
-    fprintf(stderr, "  -mod <x> <y>\n");
+    fprintf(stderr, "usage: %s [options]\n%s\n", program_name,
+            "  where options are:\n"
+            "  -display <display>   or   -d <display>\n"
+            "  -fg <color>   or   -foreground <color>\n"
+            "  -bg <color>   or   -background <color>\n"
+            "  -rv   or   -reverse\n"
+            "  -help\n"
+            "  -def   or   -default\n"
+            "  -name <string>\n"
+            "  -cursor <cursor file> <mask file>\n"
+            "  -cursor_name <cursor-font name>\n"
+            "  -xcf <ARGB cursor file> <cursor size>\n"
+            "  -solid <color>\n"
+            "  -gray   or   -grey\n"
+            "  -bitmap <filename>\n"
+            "  -mod <x> <y>\n"
+            );
     exit(1);
     /*NOTREACHED*/
 }
-- 
cgit v1.2.3