From: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
To: linux-sparse@vger.kernel.org
Cc: Ben Dooks <ben.dooks@codethink.co.uk>,
Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Subject: [PATCH 05/13] format-check: remove unneeded member: target
Date: Wed, 14 Oct 2020 01:22:23 +0200 [thread overview]
Message-ID: <20201013232231.10349-6-luc.vanoostenryck@gmail.com> (raw)
In-Reply-To: <20201013232231.10349-1-luc.vanoostenryck@gmail.com>
The signature of the checking method allow to return the target
type. But this is never needed as it is always statically known.
So, remove this argument.
Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
---
verify-format.c | 33 +++++++++++++--------------------
1 file changed, 13 insertions(+), 20 deletions(-)
diff --git a/verify-format.c b/verify-format.c
index 99a36c8eef5f..0ef2cb863ae9 100644
--- a/verify-format.c
+++ b/verify-format.c
@@ -57,7 +57,6 @@ struct format_type {
int (*test)(struct format_type *fmt,
struct expression **expr,
struct symbol *ctype,
- struct symbol **target,
const char **typediff);
struct symbol *type;
};
@@ -102,41 +101,35 @@ static inline int type_class(struct symbol *type, struct symbol **base)
static int printf_fmt_numtype(struct format_type *fmt,
struct expression **expr,
struct symbol *ctype,
- struct symbol **target, const char **typediff)
+ const char **typediff)
{
- struct symbol *type = fmt->type;
- *target = type;
- return check_assignment_types(*target, expr, typediff);
+ return check_assignment_types(fmt->type, expr, typediff);
}
static int printf_fmt_string(struct format_type *fmt,
struct expression **expr,
struct symbol *ctype,
- struct symbol **target, const char **typediff)
+ const char **typediff)
{
- *target = fmt->type;
- return check_assignment_types(*target, expr, typediff);
+ return check_assignment_types(fmt->type, expr, typediff);
}
static int printf_fmt_pointer(struct format_type *fmt,
struct expression **expr,
struct symbol *ctype,
- struct symbol **target, const char **typediff)
+ const char **typediff)
{
- *target = &const_ptr_ctype;
- return check_assignment_types(*target, expr, typediff);
+ return check_assignment_types(fmt->type, expr, typediff);
}
static int printf_fmt_print_pointer(struct format_type *fmt,
struct expression **expr,
struct symbol *ctype,
- struct symbol **target,
const char **typediff)
{
// TODO TODO: fix this here!!!
int ret;
- *target = &const_ptr_ctype;
- ret = check_assignment_types(*target, expr, typediff);
+ ret = check_assignment_types(fmt->type, expr, typediff);
if (ret == 0) {
/* if just printing, ignore address-space mismatches */
if (strcmp(*typediff, "different address spaces") == 0)
@@ -148,6 +141,7 @@ static int printf_fmt_print_pointer(struct format_type *fmt,
static struct format_type printf_fmt_ptr_ref = {
.format = "p",
.test = printf_fmt_pointer,
+ .type = &const_ptr_ctype,
};
static struct format_type *parse_printf_get_fmt(struct format_type *type,
@@ -295,6 +289,7 @@ static struct format_type *parse_printf_get_fmt(struct format_type *type,
break;
case 'p':
type->test = printf_fmt_print_pointer;
+ type->type = &const_ptr_ctype;
/* check for pointer being printed as hex explicitly */
if (*ptr == 'x' || *ptr == 'X') {
ptr++;
@@ -309,6 +304,7 @@ static struct format_type *parse_printf_get_fmt(struct format_type *type,
// todo - we should construct pointer to int/etc //
// also should not have any flags or widths for this
type->test = printf_fmt_pointer;
+ type->type = &const_ptr_ctype;
break;
default:
// anything else here?
@@ -474,7 +470,7 @@ static int parse_format_printf(const char **fmtstring,
type = &printf_fmt_ptr_ref; /* probably some extension */
if (type) {
- struct symbol *ctype, *target = NULL;
+ struct symbol *ctype;
const char *typediff = "different types";
int ret;
@@ -490,13 +486,10 @@ static int parse_format_printf(const char **fmtstring,
if (!ctype)
return -3;
- ret = type->test(type, &expr, ctype, &target, &typediff);
- if (!target) /* shouldn't happen, but catch anyway */
- return -4;
-
+ ret = type->test(type, &expr, ctype, &typediff);
if (ret == 0) {
warning(expr->pos, "incorrect type in argument %d (%s)", pos, typediff);
- info(expr->pos, " expected %s", show_typename(target));
+ info(expr->pos, " expected %s", show_typename(type->type));
info(expr->pos, " got %s", show_typename(ctype));
}
} else {
--
2.28.0
next prev parent reply other threads:[~2020-10-14 9:23 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-13 23:22 [PATCH 00/13] format-check: add specific type checking Luc Van Oostenryck
2020-10-13 23:22 ` [PATCH 01/13] format-check: void * is not OK for strings, fix the test Luc Van Oostenryck
2020-10-13 23:22 ` [PATCH 02/13] format-check: more complete parsing of the length & type modifiers Luc Van Oostenryck
2020-10-13 23:22 ` [PATCH 03/13] format-check: add helper type_class() Luc Van Oostenryck
2020-10-13 23:22 ` [PATCH 04/13] format-check: merge 'fmt_string' & 'string' Luc Van Oostenryck
2020-10-13 23:22 ` Luc Van Oostenryck [this message]
2020-10-13 23:22 ` [PATCH 06/13] format-check: add a function to check to type of strings Luc Van Oostenryck
2020-10-13 23:22 ` [PATCH 07/13] format-check: add a function to check to type of 'n' arguments Luc Van Oostenryck
2020-10-13 23:22 ` [PATCH 08/13] format-check: add a function to check to type of pointers Luc Van Oostenryck
2020-10-13 23:22 ` [PATCH 09/13] format-check: remove printf_fmt_print_pointer() Luc Van Oostenryck
2020-10-13 23:22 ` [PATCH 10/13] format-check: add a function to check the type of floats Luc Van Oostenryck
2020-10-13 23:22 ` [PATCH 11/13] format-check: add a function to check the type of integers Luc Van Oostenryck
2020-10-13 23:22 ` [PATCH 12/13] format-check: remove wrappers around type checking methods Luc Van Oostenryck
2020-10-13 23:22 ` [PATCH 13/13] format-check: simplify calling of parse_printf_get_fmt() Luc Van Oostenryck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201013232231.10349-6-luc.vanoostenryck@gmail.com \
--to=luc.vanoostenryck@gmail.com \
--cc=ben.dooks@codethink.co.uk \
--cc=linux-sparse@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).