X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/f07524546af1e340996d35f20fd1803e68756c02..108b2ebc0200fbc6218ca5165c25eea4e7890ac6:/src/cdecl99.c

diff --git a/src/cdecl99.c b/src/cdecl99.c
index 5f60037..574d36e 100644
--- a/src/cdecl99.c
+++ b/src/cdecl99.c
@@ -63,9 +63,8 @@ void print_error(const char *fmt, ...)
 {
 	va_list(ap);
 
-	if (batch_mode)
-		fprintf(stderr, "%s: ", progname);
-	fprintf(stderr, "%s", _("error: "));
+	fprintf(stderr, batch_mode ? "%s: %s" : "%.0s%s",
+	                progname, _("error: "));
 
 	va_start(ap, fmt);
 	vfprintf(stderr, fmt, ap);
@@ -105,10 +104,9 @@ static void print_help(const struct option *lopts)
 
 		help_print_option(opt, help.arg, help.desc, 20);
 	}
-	putchar('\n');
 
-	puts(_("For more information, see the cdecl99(1) man page."));
-	putchar('\n');
+	printf("\n%s\n\n",
+	       _("For more information, see the cdecl99(1) man page."));
 
 	/*
 	 * TRANSLATORS: Please add *another line* indicating where users should
@@ -246,8 +244,8 @@ static int initialize(int argc, char **argv)
 	}
 
 	if (optind < argc) {
-		fprintf(stderr, "%s: ", progname);
-		fprintf(stderr, _("excess command-line arguments:"));
+		fprintf(stderr, "%s: %s", progname,
+		                _("excess command-line arguments:"));
 		for (i = optind; i < argc; i++) {
 			fprintf(stderr, " %s", argv[i]);
 		}