projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(validate_function_args) Fix two msg() bugs found by -Wformat.
[pspp]
/
src
/
expressions
/
parse.c
diff --git
a/src/expressions/parse.c
b/src/expressions/parse.c
index 15efe00bed59f56a8bddeeee0b3ef6fe374fb8cd..bc639cd8882b3bf07502029c3f1bf195789b32b8 100644
(file)
--- a/
src/expressions/parse.c
+++ b/
src/expressions/parse.c
@@
-881,14
+881,14
@@
word_matches (const char **test, const char **name)
size_t name_len = strcspn (*name, ".");
if (test_len == name_len)
{
size_t name_len = strcspn (*name, ".");
if (test_len == name_len)
{
- if (
mm_case_compar
e (*test, *name, test_len))
+ if (
buf_compare_cas
e (*test, *name, test_len))
return false;
}
else if (test_len < 3 || test_len > name_len)
return false;
else
{
return false;
}
else if (test_len < 3 || test_len > name_len)
return false;
else
{
- if (
mm_case_compar
e (*test, *name, test_len))
+ if (
buf_compare_cas
e (*test, *name, test_len))
return false;
}
return false;
}
@@
-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)