diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-06-14 11:55:08 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-06-14 11:56:48 +0200 |
| commit | ef5c498bd166b5284fdf80d95b03daaa7e05556a (patch) | |
| tree | b5735ccda285ef3481dc1d532c7858ce6175bf5f | |
| parent | 0867f363a43f9772aa706925db962731dcab976d (diff) | |
evaluate: double datatype_free() with dynamic integer datatypes
datatype_set() already deals with this case, remove this.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | include/datatype.h | 1 | ||||
| -rw-r--r-- | src/datatype.c | 5 | ||||
| -rw-r--r-- | src/evaluate.c | 2 |
3 files changed, 0 insertions, 8 deletions
diff --git a/include/datatype.h b/include/datatype.h index 23f45ab7..63617ebd 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 8ae3aa1c..519f79d7 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 337b66c5..70c7e597 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, |