From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Subject: [PATCH nft 2/2] evaluate: double datatype_free() with dynamic integer datatypes
Date: Fri, 14 Jun 2019 11:58:41 +0200 [thread overview]
Message-ID: <20190614095841.18119-2-pablo@netfilter.org> (raw)
In-Reply-To: <20190614095841.18119-1-pablo@netfilter.org>
datatype_set() already deals with this case, remove this.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
include/datatype.h | 1 -
src/datatype.c | 5 -----
src/evaluate.c | 2 --
3 files changed, 8 deletions(-)
diff --git a/include/datatype.h b/include/datatype.h
index 23f45ab7d6eb..63617ebd2753 100644
--- a/include/datatype.h
+++ b/include/datatype.h
@@ -260,7 +260,6 @@ extern const struct datatype boolean_type;
void inet_service_type_print(const struct expr *expr, struct output_ctx *octx);
extern const struct datatype *concat_type_alloc(uint32_t type);
-extern void concat_type_destroy(const struct datatype *dtype);
static inline uint32_t concat_subtype_add(uint32_t type, uint32_t subtype)
{
diff --git a/src/datatype.c b/src/datatype.c
index 8ae3aa1c3f90..519f79d70b9a 100644
--- a/src/datatype.c
+++ b/src/datatype.c
@@ -1162,11 +1162,6 @@ const struct datatype *concat_type_alloc(uint32_t type)
return dtype;
}
-void concat_type_destroy(const struct datatype *dtype)
-{
- datatype_free(dtype);
-}
-
const struct datatype *set_datatype_alloc(const struct datatype *orig_dtype,
unsigned int byteorder)
{
diff --git a/src/evaluate.c b/src/evaluate.c
index 337b66c5ad2d..70c7e597f3b0 100644
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -71,8 +71,6 @@ static void key_fix_dtype_byteorder(struct expr *key)
return;
datatype_set(key, set_datatype_alloc(dtype, key->byteorder));
- if (dtype->flags & DTYPE_F_ALLOC)
- concat_type_destroy(dtype);
}
static struct expr *implicit_set_declaration(struct eval_ctx *ctx,
--
2.11.0
prev parent reply other threads:[~2019-06-14 9:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-14 9:58 [PATCH nft 1/2] evaluate: update byteorder only for implicit maps Pablo Neira Ayuso
2019-06-14 9:58 ` Pablo Neira Ayuso [this message]
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=20190614095841.18119-2-pablo@netfilter.org \
--to=pablo@netfilter.org \
--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).