From 907a9f8e5a93f5bcd449643eb3916a656d634758 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 20 Dec 2016 13:47:11 +0100 Subject: src: get rid of aliases and compat This machinery was introduced to avoid sudden compilation breakage of old nftables releases. With the upcoming release of 0.7 (and 0.6 which is now 6 months old) this is not required anymore. Moreover, users gain nothing from older releases since they are half-boiled and buggy. So let's get rid of aliases now. Bump LIBVERSION and update map file. Signed-off-by: Pablo Neira Ayuso --- src/set.c | 64 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'src/set.c') diff --git a/src/set.c b/src/set.c index 14d28b5..cce5e63 100644 --- a/src/set.c +++ b/src/set.c @@ -38,7 +38,7 @@ struct nftnl_set *nftnl_set_alloc(void) INIT_LIST_HEAD(&s->element_list); return s; } -EXPORT_SYMBOL_ALIAS(nftnl_set_alloc, nft_set_alloc); +EXPORT_SYMBOL(nftnl_set_alloc); void nftnl_set_free(const struct nftnl_set *s) { @@ -55,13 +55,13 @@ void nftnl_set_free(const struct nftnl_set *s) } xfree(s); } -EXPORT_SYMBOL_ALIAS(nftnl_set_free, nft_set_free); +EXPORT_SYMBOL(nftnl_set_free); bool nftnl_set_is_set(const struct nftnl_set *s, uint16_t attr) { return s->flags & (1 << attr); } -EXPORT_SYMBOL_ALIAS(nftnl_set_is_set, nft_set_attr_is_set); +EXPORT_SYMBOL(nftnl_set_is_set); void nftnl_set_unset(struct nftnl_set *s, uint16_t attr) { @@ -97,7 +97,7 @@ void nftnl_set_unset(struct nftnl_set *s, uint16_t attr) s->flags &= ~(1 << attr); } -EXPORT_SYMBOL_ALIAS(nftnl_set_unset, nft_set_attr_unset); +EXPORT_SYMBOL(nftnl_set_unset); static uint32_t nftnl_set_validate[NFTNL_SET_MAX + 1] = { [NFTNL_SET_FLAGS] = sizeof(uint32_t), @@ -186,31 +186,31 @@ int nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data, s->flags |= (1 << attr); return 0; } -EXPORT_SYMBOL_ALIAS(nftnl_set_set_data, nft_set_attr_set_data); +EXPORT_SYMBOL(nftnl_set_set_data); int nftnl_set_set(struct nftnl_set *s, uint16_t attr, const void *data) { return nftnl_set_set_data(s, attr, data, nftnl_set_validate[attr]); } -EXPORT_SYMBOL_ALIAS(nftnl_set_set, nft_set_attr_set); +EXPORT_SYMBOL(nftnl_set_set); void nftnl_set_set_u32(struct nftnl_set *s, uint16_t attr, uint32_t val) { nftnl_set_set(s, attr, &val); } -EXPORT_SYMBOL_ALIAS(nftnl_set_set_u32, nft_set_attr_set_u32); +EXPORT_SYMBOL(nftnl_set_set_u32); void nftnl_set_set_u64(struct nftnl_set *s, uint16_t attr, uint64_t val) { nftnl_set_set(s, attr, &val); } -EXPORT_SYMBOL_ALIAS(nftnl_set_set_u64, nft_set_attr_set_u64); +EXPORT_SYMBOL(nftnl_set_set_u64); int nftnl_set_set_str(struct nftnl_set *s, uint16_t attr, const char *str) { return nftnl_set_set_data(s, attr, str, strlen(str) + 1); } -EXPORT_SYMBOL_ALIAS(nftnl_set_set_str, nft_set_attr_set_str); +EXPORT_SYMBOL(nftnl_set_set_str); const void *nftnl_set_get_data(const struct nftnl_set *s, uint16_t attr, uint32_t *data_len) @@ -267,20 +267,20 @@ const void *nftnl_set_get_data(const struct nftnl_set *s, uint16_t attr, } return NULL; } -EXPORT_SYMBOL_ALIAS(nftnl_set_get_data, nft_set_attr_get_data); +EXPORT_SYMBOL(nftnl_set_get_data); const void *nftnl_set_get(const struct nftnl_set *s, uint16_t attr) { uint32_t data_len; return nftnl_set_get_data(s, attr, &data_len); } -EXPORT_SYMBOL_ALIAS(nftnl_set_get, nft_set_attr_get); +EXPORT_SYMBOL(nftnl_set_get); const char *nftnl_set_get_str(const struct nftnl_set *s, uint16_t attr) { return nftnl_set_get(s, attr); } -EXPORT_SYMBOL_ALIAS(nftnl_set_get_str, nft_set_attr_get_str); +EXPORT_SYMBOL(nftnl_set_get_str); uint32_t nftnl_set_get_u32(const struct nftnl_set *s, uint16_t attr) { @@ -291,7 +291,7 @@ uint32_t nftnl_set_get_u32(const struct nftnl_set *s, uint16_t attr) return val ? *val : 0; } -EXPORT_SYMBOL_ALIAS(nftnl_set_get_u32, nft_set_attr_get_u32); +EXPORT_SYMBOL(nftnl_set_get_u32); uint64_t nftnl_set_get_u64(const struct nftnl_set *s, uint16_t attr) { @@ -302,7 +302,7 @@ uint64_t nftnl_set_get_u64(const struct nftnl_set *s, uint16_t attr) return val ? *val : 0; } -EXPORT_SYMBOL_ALIAS(nftnl_set_get_u64, nft_set_attr_get_u64); +EXPORT_SYMBOL(nftnl_set_get_u64); struct nftnl_set *nftnl_set_clone(const struct nftnl_set *set) { @@ -383,7 +383,7 @@ void nftnl_set_nlmsg_build_payload(struct nlmsghdr *nlh, struct nftnl_set *s) if (s->flags & (1 << NFTNL_SET_USERDATA)) mnl_attr_put(nlh, NFTA_SET_USERDATA, s->user.len, s->user.data); } -EXPORT_SYMBOL_ALIAS(nftnl_set_nlmsg_build_payload, nft_set_nlmsg_build_payload); +EXPORT_SYMBOL(nftnl_set_nlmsg_build_payload); static int nftnl_set_parse_attr_cb(const struct nlattr *attr, void *data) { @@ -546,7 +546,7 @@ int nftnl_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s) return 0; } -EXPORT_SYMBOL_ALIAS(nftnl_set_nlmsg_parse, nft_set_nlmsg_parse); +EXPORT_SYMBOL(nftnl_set_nlmsg_parse); #ifdef JSON_PARSING static int nftnl_jansson_parse_set_info(struct nftnl_set *s, json_t *tree, @@ -723,14 +723,14 @@ int nftnl_set_parse(struct nftnl_set *s, enum nftnl_parse_type type, { return nftnl_set_do_parse(s, type, data, err, NFTNL_PARSE_BUFFER); } -EXPORT_SYMBOL_ALIAS(nftnl_set_parse, nft_set_parse); +EXPORT_SYMBOL(nftnl_set_parse); int nftnl_set_parse_file(struct nftnl_set *s, enum nftnl_parse_type type, FILE *fp, struct nftnl_parse_err *err) { return nftnl_set_do_parse(s, type, fp, err, NFTNL_PARSE_FILE); } -EXPORT_SYMBOL_ALIAS(nftnl_set_parse_file, nft_set_parse_file); +EXPORT_SYMBOL(nftnl_set_parse_file); static int nftnl_set_snprintf_json(char *buf, size_t size, const struct nftnl_set *s, @@ -924,7 +924,7 @@ int nftnl_set_snprintf(char *buf, size_t size, const struct nftnl_set *s, return nftnl_set_cmd_snprintf(buf, size, s, nftnl_flag2cmd(flags), type, flags); } -EXPORT_SYMBOL_ALIAS(nftnl_set_snprintf, nft_set_snprintf); +EXPORT_SYMBOL(nftnl_set_snprintf); static int nftnl_set_do_snprintf(char *buf, size_t size, const void *s, uint32_t cmd, uint32_t type, uint32_t flags) @@ -938,13 +938,13 @@ int nftnl_set_fprintf(FILE *fp, const struct nftnl_set *s, uint32_t type, return nftnl_fprintf(fp, s, NFTNL_CMD_UNSPEC, type, flags, nftnl_set_do_snprintf); } -EXPORT_SYMBOL_ALIAS(nftnl_set_fprintf, nft_set_fprintf); +EXPORT_SYMBOL(nftnl_set_fprintf); void nftnl_set_elem_add(struct nftnl_set *s, struct nftnl_set_elem *elem) { list_add_tail(&elem->head, &s->element_list); } -EXPORT_SYMBOL_ALIAS(nftnl_set_elem_add, nft_set_elem_add); +EXPORT_SYMBOL(nftnl_set_elem_add); struct nftnl_set_list { struct list_head list; @@ -962,7 +962,7 @@ struct nftnl_set_list *nftnl_set_list_alloc(void) return list; } -EXPORT_SYMBOL_ALIAS(nftnl_set_list_alloc, nft_set_list_alloc); +EXPORT_SYMBOL(nftnl_set_list_alloc); void nftnl_set_list_free(struct nftnl_set_list *list) { @@ -974,31 +974,31 @@ void nftnl_set_list_free(struct nftnl_set_list *list) } xfree(list); } -EXPORT_SYMBOL_ALIAS(nftnl_set_list_free, nft_set_list_free); +EXPORT_SYMBOL(nftnl_set_list_free); int nftnl_set_list_is_empty(const struct nftnl_set_list *list) { return list_empty(&list->list); } -EXPORT_SYMBOL_ALIAS(nftnl_set_list_is_empty, nft_set_list_is_empty); +EXPORT_SYMBOL(nftnl_set_list_is_empty); void nftnl_set_list_add(struct nftnl_set *s, struct nftnl_set_list *list) { list_add(&s->head, &list->list); } -EXPORT_SYMBOL_ALIAS(nftnl_set_list_add, nft_set_list_add); +EXPORT_SYMBOL(nftnl_set_list_add); void nftnl_set_list_add_tail(struct nftnl_set *s, struct nftnl_set_list *list) { list_add_tail(&s->head, &list->list); } -EXPORT_SYMBOL_ALIAS(nftnl_set_list_add_tail, nft_set_list_add_tail); +EXPORT_SYMBOL(nftnl_set_list_add_tail); void nftnl_set_list_del(struct nftnl_set *s) { list_del(&s->head); } -EXPORT_SYMBOL_ALIAS(nftnl_set_list_del, nft_set_list_del); +EXPORT_SYMBOL(nftnl_set_list_del); int nftnl_set_list_foreach(struct nftnl_set_list *set_list, int (*cb)(struct nftnl_set *t, void *data), void *data) @@ -1013,7 +1013,7 @@ int nftnl_set_list_foreach(struct nftnl_set_list *set_list, } return 0; } -EXPORT_SYMBOL_ALIAS(nftnl_set_list_foreach, nft_set_list_foreach); +EXPORT_SYMBOL(nftnl_set_list_foreach); struct nftnl_set_list_iter { const struct nftnl_set_list *list; @@ -1037,14 +1037,14 @@ nftnl_set_list_iter_create(const struct nftnl_set_list *l) return iter; } -EXPORT_SYMBOL_ALIAS(nftnl_set_list_iter_create, nft_set_list_iter_create); +EXPORT_SYMBOL(nftnl_set_list_iter_create); struct nftnl_set * nftnl_set_list_iter_cur(const struct nftnl_set_list_iter *iter) { return iter->cur; } -EXPORT_SYMBOL_ALIAS(nftnl_set_list_iter_cur, nft_set_list_iter_cur); +EXPORT_SYMBOL(nftnl_set_list_iter_cur); struct nftnl_set *nftnl_set_list_iter_next(struct nftnl_set_list_iter *iter) { @@ -1060,13 +1060,13 @@ struct nftnl_set *nftnl_set_list_iter_next(struct nftnl_set_list_iter *iter) return s; } -EXPORT_SYMBOL_ALIAS(nftnl_set_list_iter_next, nft_set_list_iter_next); +EXPORT_SYMBOL(nftnl_set_list_iter_next); void nftnl_set_list_iter_destroy(const struct nftnl_set_list_iter *iter) { xfree(iter); } -EXPORT_SYMBOL_ALIAS(nftnl_set_list_iter_destroy, nft_set_list_iter_destroy); +EXPORT_SYMBOL(nftnl_set_list_iter_destroy); static struct nftnl_set *nftnl_set_lookup(const char *this_set_name, struct nftnl_set_list *set_list) -- cgit v1.2.3