This function can be used either side of the map, so rename it to something generic.
Signed-off-by: Pablo Neira Ayuso <[email protected]> --- include/datatype.h | 4 ++-- src/datatype.c | 6 +++--- src/evaluate.c | 2 +- src/netlink.c | 2 +- src/rule.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/datatype.h b/include/datatype.h index 3ce3a888f063..b78d76f78f76 100644 --- a/include/datatype.h +++ b/include/datatype.h @@ -254,8 +254,8 @@ concat_subtype_lookup(uint32_t type, unsigned int n) } extern const struct datatype * -set_keytype_alloc(const struct datatype *orig_dtype, unsigned int byteorder); -extern void set_keytype_destroy(const struct datatype *dtype); +set_datatype_alloc(const struct datatype *orig_dtype, unsigned int byteorder); +extern void set_datatype_destroy(const struct datatype *dtype); extern void time_print(uint64_t seconds); extern struct error_record *time_parse(const struct location *loc, diff --git a/src/datatype.c b/src/datatype.c index 64b8b8845b10..6b1dd4a09abb 100644 --- a/src/datatype.c +++ b/src/datatype.c @@ -1029,8 +1029,8 @@ void concat_type_destroy(const struct datatype *dtype) dtype_free(dtype); } -const struct datatype *set_keytype_alloc(const struct datatype *orig_dtype, - unsigned int byteorder) +const struct datatype *set_datatype_alloc(const struct datatype *orig_dtype, + unsigned int byteorder) { struct datatype *dtype; @@ -1044,7 +1044,7 @@ const struct datatype *set_keytype_alloc(const struct datatype *orig_dtype, return dtype; } -void set_keytype_destroy(const struct datatype *dtype) +void set_datatype_destroy(const struct datatype *dtype) { if (dtype->flags & DTYPE_F_CLONE) dtype_free(dtype); diff --git a/src/evaluate.c b/src/evaluate.c index 21f1a475d5e9..07a611804a90 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -73,7 +73,7 @@ static struct expr *implicit_set_declaration(struct eval_ctx *ctx, set = set_alloc(&expr->location); set->flags = NFT_SET_ANONYMOUS | expr->set_flags; set->handle.set = xstrdup(name), - set->keytype = set_keytype_alloc(keytype, keybyteorder); + set->keytype = set_datatype_alloc(keytype, keybyteorder); set->keylen = keylen; set->init = expr; diff --git a/src/netlink.c b/src/netlink.c index 1f3398225892..60d86d61c504 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -1189,7 +1189,7 @@ static struct set *netlink_delinearize_set(struct netlink_ctx *ctx, set->handle.table = xstrdup(nftnl_set_get_str(nls, NFTNL_SET_TABLE)); set->handle.set = xstrdup(nftnl_set_get_str(nls, NFTNL_SET_NAME)); - set->keytype = set_keytype_alloc(keytype, byteorder); + set->keytype = set_datatype_alloc(keytype, byteorder); set->keylen = nftnl_set_get_u32(nls, NFTNL_SET_KEY_LEN) * BITS_PER_BYTE; set->flags = nftnl_set_get_u32(nls, NFTNL_SET_FLAGS); diff --git a/src/rule.c b/src/rule.c index b47076f000ee..6045747710db 100644 --- a/src/rule.c +++ b/src/rule.c @@ -210,7 +210,7 @@ void set_free(struct set *set) if (set->init != NULL) expr_free(set->init); handle_free(&set->handle); - set_keytype_destroy(set->keytype); + set_datatype_destroy(set->keytype); xfree(set); } -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
