From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Subject: [nft PATCH 2/4] scanner: Fix for wrong parameter type of scanner_destroy()
Date: Thu, 24 Aug 2017 19:14:11 +0200 [thread overview]
Message-ID: <20170824171413.31737-3-phil@nwl.cc> (raw)
In-Reply-To: <20170824171413.31737-1-phil@nwl.cc>
The function takes the scanner as argument, not the state. This wasn't a
real issue since scanner is a void pointer, which means it's only casted
around without need. So this fix is a rather cosmetic one.
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
include/parser.h | 2 +-
src/scanner.l | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/parser.h b/include/parser.h
index 0e266d60b8a31..431edfb3d4e34 100644
--- a/include/parser.h
+++ b/include/parser.h
@@ -37,7 +37,7 @@ extern void parser_init(struct mnl_socket *nf_sock, struct nft_cache *cache,
extern int nft_parse(struct nft_ctx *ctx, void *, struct parser_state *state);
extern void *scanner_init(struct parser_state *state);
-extern void scanner_destroy(struct parser_state *state);
+extern void scanner_destroy(void *scanner);
extern int scanner_read_file(void *scanner, const char *filename,
const struct location *loc);
diff --git a/src/scanner.l b/src/scanner.l
index 25e4eb1c70ec1..7d57cc1465d3a 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -856,7 +856,7 @@ void *scanner_init(struct parser_state *state)
return scanner;
}
-void scanner_destroy(struct parser_state *scanner)
+void scanner_destroy(void *scanner)
{
struct parser_state *state = yyget_extra(scanner);
--
2.13.1
next prev parent reply other threads:[~2017-08-24 17:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-24 17:14 [nft PATCH 0/4] Memleak fixes and some minor cleanups Phil Sutter
2017-08-24 17:14 ` [nft PATCH 1/4] scanner: Fix for memleak due to unclosed file pointer Phil Sutter
2017-08-24 17:14 ` Phil Sutter [this message]
2017-08-24 17:14 ` [nft PATCH 3/4] scanner: Make use of yylex_init_extra() Phil Sutter
2017-08-24 17:14 ` [nft PATCH 4/4] parser: Fix for memleak when commands fail Phil Sutter
2017-08-24 17:19 ` [nft PATCH 0/4] Memleak fixes and some minor cleanups Pablo Neira Ayuso
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=20170824171413.31737-3-phil@nwl.cc \
--to=phil@nwl.cc \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.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).