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>

diff --git a/include/datatype.h b/include/datatype.h
index 23f45ab7d6eb39bb7b928bb0a5f854b59aed26c6..63617ebd27536dc9a7435fa02916462f34959989 100644 (file)
--- 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 8ae3aa1c3f905ee352f5d880302089583fc3fce2..519f79d70b9a3ebcb5be074969ace7b28c0577d6 100644 (file)
--- 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 337b66c5ad2d1d65753cf930eea6fd2c3b28deb5..70c7e597f3b0e5dd2b776a7003bd6121450999f4 100644 (file)
--- 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,