On Mon, Feb 10, 2020 at 10:17:28AM +0000, Laurent Fasnacht wrote:
> Now that we have a proper stack implementation, we don't need an
> additional counter for the number of buffer state pushed.
>
> Signed-off-by: Laurent Fasnacht <fasnacht@xxxxxxxxxxxxx>
> ---
> include/parser.h | 1 -
> src/scanner.l | 6 ------
> 2 files changed, 7 deletions(-)
>
> diff --git a/include/parser.h b/include/parser.h
> index 66db92d8..636d1c88 100644
> --- a/include/parser.h
> +++ b/include/parser.h
> @@ -15,7 +15,6 @@
>
> struct parser_state {
> struct input_descriptor *indesc;
> - unsigned int indesc_idx;
> struct list_head indesc_list;
>
> struct list_head *msgs;
> diff --git a/src/scanner.l b/src/scanner.l
> index 8407a2a1..39e7ae0f 100644
> --- a/src/scanner.l
> +++ b/src/scanner.l
> @@ -674,12 +674,10 @@ static void scanner_push_indesc(struct parser_state *state,
> list_add(&indesc->list, &state->indesc->list);
> }
> state->indesc = indesc;
> - state->indesc_idx++;
> }
>
> static void scanner_pop_indesc(struct parser_state *state)
> {
> - state->indesc_idx--;
> if (!list_empty(&state->indesc_list)) {
> state->indesc = list_entry(state->indesc->list.prev, struct input_descriptor, list);
> } else {
> @@ -968,10 +966,6 @@ void scanner_destroy(struct nft_ctx *nft)
> {
> struct parser_state *state = yyget_extra(nft->scanner);
>
> - do {
> - yypop_buffer_state(nft->scanner);
nft_pop_buffer_state calls free().
Are you sure this can be removed without incurring in memleaks?
Thanks.
> - } while (state->indesc_idx--);
> -
> input_descriptor_list_destroy(state);
> yylex_destroy(nft->scanner);
> }
> --
> 2.20.1
>
>
