From: Oleg Nesterov <oleg@redhat.com>
To: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Cc: Alexey Gladkov <gladkov.alexey@gmail.com>, linux-sparse@vger.kernel.org
Subject: [PATCH 4/4] dissect: disallow NULL pointers in struct reporter
Date: Tue, 4 Feb 2020 17:51:44 +0100 [thread overview]
Message-ID: <20200204165144.GA24349@redhat.com> (raw)
In-Reply-To: <20200204165119.GA24330@redhat.com>
This makes dissect.c a bit more readable.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
dissect.c | 24 +++++++-----------------
1 file changed, 7 insertions(+), 17 deletions(-)
diff --git a/dissect.c b/dissect.c
index 57dcdb2..88eaab1 100644
--- a/dissect.c
+++ b/dissect.c
@@ -135,7 +135,7 @@ static struct symbol *report_member(usage_t mode, struct position *pos,
{
struct symbol *ret = mem->ctype.base_type;
- if (mem->ident && reporter->r_member)
+ if (mem->ident)
reporter->r_member(fix_mode(ret, mode), pos, type, mem);
return ret;
@@ -146,9 +146,6 @@ static void report_implicit(usage_t mode, struct position *pos, struct symbol *t
if (type->type != SYM_STRUCT && type->type != SYM_UNION)
return;
- if (!reporter->r_member)
- return;
-
if (type->ident != NULL)
reporter->r_member(mode, pos, type, NULL);
@@ -184,8 +181,7 @@ static struct symbol *report_symbol(usage_t mode, struct expression *expr)
if (0 && ret->type == SYM_ENUM)
return report_member(mode, &expr->pos, ret, expr->symbol);
- if (reporter->r_symbol)
- reporter->r_symbol(fix_mode(ret, mode), &expr->pos, sym);
+ reporter->r_symbol(fix_mode(ret, mode), &expr->pos, sym);
return ret;
}
@@ -238,10 +234,8 @@ static void examine_sym_node(struct symbol *node, struct symbol *parent)
return;
base->evaluated = 1;
- if (base->ident || deanon(base, name, parent)) {
- if (reporter->r_symdef)
- reporter->r_symdef(base);
- }
+ if (base->ident || deanon(base, name, parent))
+ reporter->r_symdef(base);
DO_LIST(base->symbol_list, mem,
examine_sym_node(mem, base->ident ? base : parent));
default:
@@ -577,19 +571,15 @@ static struct symbol *do_initializer(struct symbol *type, struct expression *exp
static inline struct symbol *do_symbol(struct symbol *sym)
{
- struct symbol *type;
next prev parent reply other threads:[~2020-02-04 16:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-04 16:51 [PATCH 0/4] dissect: minor fixes/cleanups Oleg Nesterov
2020-02-04 16:51 ` [PATCH 1/4] dissect: don't report anonymous members in initializers Oleg Nesterov
2020-02-04 16:51 ` [PATCH 2/4] dissect: turn mk_name() into deanon() Oleg Nesterov
2020-02-04 16:51 ` [PATCH 3/4] dissect: change deanon() to handle the !node case Oleg Nesterov
2020-02-04 16:51 ` Oleg Nesterov [this message]
2020-02-06 3:08 ` [PATCH 0/4] dissect: minor fixes/cleanups 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=20200204165144.GA24349@redhat.com \
--to=oleg@redhat.com \
--cc=gladkov.alexey@gmail.com \
--cc=linux-sparse@vger.kernel.org \
--cc=luc.vanoostenryck@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.