Mercurial > hg > octave-lojdl > gnulib-hg

changeset 16160:26326fda1844

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
argmatch: don't hard-code `' when listing valid option arguments * lib/argmatch.c (argmatch_valid): Don't hard-code `%s'. Instead, use the quote function to add quotes. Use fputs rather than fprintf for the format string with no format directive.
author Jim Meyering <meyering@redhat.com>
date Mon, 12 Dec 2011 10:57:17 +0100
parents 85b7f04cd4fe
children c05271feab75
files ChangeLog lib/argmatch.c
diffstat 2 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-12-12  Jim Meyering  <meyering@redhat.com>
+
+	argmatch: don't hard-code `' when listing valid option arguments
+	* lib/argmatch.c (argmatch_valid): Don't hard-code `%s'.  Instead,
+	use the quote function to add quotes.  Use fputs rather than
+	fprintf for the format string with no format directive.
+
 2011-12-07  Eric Blake  <eblake@redhat.com>
 
 	bootstrap: detect tools required by gnulib-tool
--- a/lib/argmatch.c
+++ b/lib/argmatch.c
@@ -150,17 +150,17 @@
 
   /* We try to put synonyms on the same line.  The assumption is that
      synonyms follow each other */
-  fprintf (stderr, _("Valid arguments are:"));
+  fputs (_("Valid arguments are:"), stderr);
   for (i = 0; arglist[i]; i++)
     if ((i == 0)
         || memcmp (last_val, vallist + valsize * i, valsize))
       {
-        fprintf (stderr, "\n  - `%s'", arglist[i]);
+        fprintf (stderr, "\n  - %s", quote (arglist[i]));
         last_val = vallist + valsize * i;
       }
     else
       {
-        fprintf (stderr, ", `%s'", arglist[i]);
+        fprintf (stderr, ", %s", quote (arglist[i]));
       }
   putc ('\n', stderr);
 }