(validate_function_args) Fix two msg() bugs found by -Wformat.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5b4aac61992679e74a46d2033d4f7245ee8871fc..38129a867f28faf5f684da3e866a05155edcbf0f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,11 @@
+Sat Jul 30 23:13:17 2005  Ben Pfaff  <blp@gnu.org>
+
+       * expressions/parse.c: (validate_function_args) Fix two msg() bugs
+       found by -Wformat.
+

 Sat Jul 30 23:10:01 2005  Ben Pfaff  <blp@gnu.org>
 
 Sat Jul 30 23:10:01 2005  Ben Pfaff  <blp@gnu.org>
 

-       * epxressions/evaluate.c: (expr_debug_print_postfix) Don't pass
+       * expressions/evaluate.c: (expr_debug_print_postfix) Don't pass

        null pointer to printf for %.*s.
 
 Sat Jul 30 23:05:33 2005  Ben Pfaff  <blp@gnu.org>
        null pointer to printf for %.*s.
 
 Sat Jul 30 23:05:33 2005  Ben Pfaff  <blp@gnu.org>

diff --git a/src/expressions/parse.c b/src/expressions/parse.c
index a7064e034c8728b05e3b1264367e7a8075379fe0..bc639cd8882b3bf07502029c3f1bf195789b32b8 100644 (file)
--- a/src/expressions/parse.c
+++ b/src/expressions/parse.c
@@ -1033,7 +1033,7 @@ validate_function_args (const struct operation *f, int arg_cnt, int min_valid)
         {
           assert ((f->flags & OPF_MIN_VALID) == 0);
           msg (SE, _("%s function does not accept a minimum valid "
         {
           assert ((f->flags & OPF_MIN_VALID) == 0);
           msg (SE, _("%s function does not accept a minimum valid "

-                     "argument count."));
+                     "argument count."), f->prototype);

           return false;
         }
       else 
           return false;
         }
       else 


@@ -1042,7 +1042,7 @@ validate_function_args (const struct operation *f, int arg_cnt, int min_valid)
           if (array_arg_cnt < f->array_min_elems)
             {
               msg (SE, _("%s requires at least %d valid arguments in list."),
           if (array_arg_cnt < f->array_min_elems)
             {
               msg (SE, _("%s requires at least %d valid arguments in list."),

-                   f->prototype);
+                   f->prototype, f->array_min_elems);

               return false;
             }
           else if (min_valid > array_arg_cnt) 
               return false;
             }
           else if (min_valid > array_arg_cnt)