From: Laurent Fasnacht <fasnacht@protonmail.ch>
To: netfilter-devel@vger.kernel.org
Cc: Laurent Fasnacht <fasnacht@protonmail.ch>
Subject: [PATCH nft include v2 4/7] scanner: remove parser_state->indescs static array
Date: Mon, 10 Feb 2020 10:17:24 +0000 [thread overview]
Message-ID: <20200210101709.9182-5-fasnacht@protonmail.ch> (raw)
In-Reply-To: <20200210101709.9182-1-fasnacht@protonmail.ch>
This static array is redundant wth the indesc_list structure, but
is less flexible.
Signed-off-by: Laurent Fasnacht <fasnacht@protonmail.ch>
---
include/parser.h | 1 -
src/scanner.l | 12 ++++++------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/include/parser.h b/include/parser.h
index 949284d9..66db92d8 100644
--- a/include/parser.h
+++ b/include/parser.h
@@ -15,7 +15,6 @@
struct parser_state {
struct input_descriptor *indesc;
- struct input_descriptor *indescs[MAX_INCLUDE_DEPTH];
unsigned int indesc_idx;
struct list_head indesc_list;
diff --git a/src/scanner.l b/src/scanner.l
index 37b01639..8397846b 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -668,19 +668,19 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr})
static void scanner_push_indesc(struct parser_state *state,
struct input_descriptor *indesc)
{
- state->indescs[state->indesc_idx] = indesc;
- state->indesc = state->indescs[state->indesc_idx++];
list_add_tail(&indesc->list, &state->indesc_list);
+ state->indesc = indesc;
+ state->indesc_idx++;
}
static void scanner_pop_indesc(struct parser_state *state)
{
state->indesc_idx--;
-
- if (state->indesc_idx > 0)
- state->indesc = state->indescs[state->indesc_idx - 1];
- else
+ if (!list_empty(&state->indesc_list)) {
+ state->indesc = list_entry(state->indesc->list.prev, struct input_descriptor, list);
+ } else {
state->indesc = NULL;
+ }
}
static void scanner_pop_buffer(yyscan_t scanner)
--
2.20.1
next prev parent reply other threads:[~2020-02-10 10:17 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-10 10:17 [PATCH nft include v2 0/7] Improve include behaviour Laurent Fasnacht
2020-02-10 10:17 ` [PATCH nft include v2 1/7] tests: shell: add test for glob includes Laurent Fasnacht
2020-02-12 20:45 ` Pablo Neira Ayuso
2020-02-10 10:17 ` [PATCH nft include v2 2/7] scanner: move the file descriptor to be in the input_descriptor structure Laurent Fasnacht
2020-02-10 22:46 ` Pablo Neira Ayuso
2020-02-10 10:17 ` [PATCH nft include v2 3/7] scanner: move indesc list append in scanner_push_indesc Laurent Fasnacht
2020-02-10 22:46 ` Pablo Neira Ayuso
2020-02-10 10:17 ` Laurent Fasnacht [this message]
2020-02-10 23:32 ` [PATCH nft include v2 4/7] scanner: remove parser_state->indescs static array Pablo Neira Ayuso
2020-02-11 4:36 ` Laurent Fasnacht
2020-02-12 20:45 ` Pablo Neira Ayuso
2020-02-10 10:17 ` [PATCH nft include v2 5/7] scanner: correctly compute include depth Laurent Fasnacht
2020-02-10 10:17 ` [PATCH nft include v2 6/7] scanner: fix indesc_list stack to be in the correct order Laurent Fasnacht
2020-02-10 22:33 ` Pablo Neira Ayuso
2020-02-11 4:42 ` Laurent Fasnacht
2020-02-10 10:17 ` [PATCH nft include v2 7/7] scanner: remove parser_state->indesc_idx Laurent Fasnacht
2020-02-10 22:31 ` Pablo Neira Ayuso
2020-02-11 5:04 ` Laurent Fasnacht
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=20200210101709.9182-5-fasnacht@protonmail.ch \
--to=fasnacht@protonmail.ch \
--cc=netfilter-devel@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).