(check_common_specifier) Fix msg() bug found by -Wformat.

(check_output_specifier) Ditto.

diff --git a/src/ChangeLog b/src/ChangeLog
index b50b37e50f6bf4b3d10cd2d50c593279036ca4c4..aa4c5304cad3b6b780703db9b1ceb5f1137e5f3b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jul 30 22:46:10 2005  Ben Pfaff  <blp@gnu.org>
+
+       * format.c: (check_common_specifier) Fix msg() bug found by
+       -Wformat.
+       (check_output_specifier) Ditto.
+
 Sat Jul 30 22:43:57 2005  Ben Pfaff  <blp@gnu.org>
 
        * file-handle.q: (cmd_file_handle) Fix msg() bug found by

diff --git a/src/format.c b/src/format.c
index 5e06ab2291e43ff4f40efcaeb2fbae4bcfe2a569..217aa523d24ee5f082d77f7355314a4911b13b30 100644 (file)
--- a/src/format.c
+++ b/src/format.c
@@ -129,8 +129,8 @@ check_common_specifier (const struct fmt_spec *spec, bool emit_error)
     {
       if (emit_error)
         msg (SE, _("Format %s specifies an odd width %d, but "
-                   "format %s requires an even width."),
-             str, spec->w, f->name, f->Imin_w, f->Imax_w);
+                   "an even width is required."),
+             str, spec->w);
       return false;
     }
   if (f->n_args > 1 && (spec->d < 0 || spec->d > 16))
@@ -213,7 +213,7 @@ check_output_specifier (const struct fmt_spec *spec, int emit_error)
                    "many decimal places as the field width, which "
                    "fails to allow space for a decimal point.  "
                    "Try %s%d.%d instead."),
-             str, f->name, f->name, spec->d + 1, spec->d);
+             str, f->name, spec->d + 1, spec->d);
       return 0;
     }
   return 1;