From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Laurent Fasnacht <fasnacht@protonmail.ch>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [PATCH nft include v2 6/7] scanner: fix indesc_list stack to be in the correct order
Date: Mon, 10 Feb 2020 23:33:45 +0100 [thread overview]
Message-ID: <20200210223345.vvxnrb26ds5rhgoo@salvia> (raw)
In-Reply-To: <20200210101709.9182-7-fasnacht@protonmail.ch>
On Mon, Feb 10, 2020 at 10:17:27AM +0000, Laurent Fasnacht wrote:
> This fixes the location displayed in error messages.
>
> Signed-off-by: Laurent Fasnacht <fasnacht@protonmail.ch>
> ---
> src/scanner.l | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/src/scanner.l b/src/scanner.l
> index 7f40c5c1..8407a2a1 100644
> --- a/src/scanner.l
> +++ b/src/scanner.l
> @@ -668,7 +668,11 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr})
> static void scanner_push_indesc(struct parser_state *state,
> struct input_descriptor *indesc)
> {
> - list_add_tail(&indesc->list, &state->indesc_list);
> + if (!state->indesc) {
> + list_add_tail(&indesc->list, &state->indesc_list);
> + } else {
> + list_add(&indesc->list, &state->indesc->list);
> + }
Probably belongs to patch 4/7 ?
next prev parent reply other threads:[~2020-02-10 22:33 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 ` [PATCH nft include v2 4/7] scanner: remove parser_state->indescs static array Laurent Fasnacht
2020-02-10 23:32 ` 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 [this message]
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=20200210223345.vvxnrb26ds5rhgoo@salvia \
--to=pablo@netfilter.org \
--cc=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).