The error handling in the parsing of the format attribute is a bit too
verbose and to strict:
*) the message "only printf format attribute supported" is just noise
for any file using 'format(scanf, ...)' when -Wformat is set
and is not needed if -Wformat is disabled, so remove it.
*) the message "incorrect format attribute" is not needed because
any parsing error will already be reported.
OTOH, it is useful to check that the first argument is an identifier,
so check this.
Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@xxxxxxxxx>
---
parse.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/parse.c b/parse.c
index c2d29318149f..55cca01ec381 100644
--- a/parse.c
+++ b/parse.c
@@ -1215,17 +1215,18 @@ static int invalid_format_args(long long start, long long at)
static struct token *attribute_format(struct token *token, struct symbol *attr, struct decl_state *ctx)
{
struct expression *args[3];
- struct symbol *fmt_sym = NULL;
+ int type = FMT_UNKNOWN;
/* expecting format ( type, start, va_args at) */
token = expect(token, '(', "after format attribute");
- if (token_type(token) == TOKEN_IDENT)
- fmt_sym = lookup_keyword(token->ident, NS_KEYWORD);
- if (fmt_sym)
- if (!fmt_sym->op || fmt_sym->op->type != KW_FORMAT)
- fmt_sym = NULL;
-
+ if (token_type(token) != TOKEN_IDENT) {
+ sparse_error(token->pos, "identifier expected for format type");
+ } else {
+ struct symbol *sym = lookup_keyword(token->ident, NS_KEYWORD);
+ if (sym && sym->op && sym->op->type == KW_FORMAT)
+ type = sym->op->class;
+ }
token = conditional_expression(token, &args[0]);
token = expect(token, ',', "format attribute type");
token = conditional_expression(token, &args[1]);
@@ -1233,11 +1234,10 @@ static struct token *attribute_format(struct token *token, struct symbol *attr,
token = conditional_expression(token, &args[2]);
token = expect(token, ')', "format attribute arg position");
- if (!fmt_sym || !args[0] || !args[1] || !args[2]) {
- warning(token->pos, "incorrect format attribute");
- } else if (fmt_sym->op->class != FMT_PRINTF) {
- /* skip anything that isn't printf for the moment */
- warning(token->pos, "only printf format attribute supported");
+ if (!args[0] || !args[1] || !args[2]) {
+ // incorrect format attribute
+ } else if (type != FMT_PRINTF) {
+ // only printf-style is supported, skip anything else
} else {
long long start, at;
--
2.28.0
