From b9f530c40a72fa4abeddaf497da970cd9223e22d Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Tue, 24 Nov 2015 11:02:09 +0100 Subject: src: rename EXPORT_SYMBOL to EXPORT_SYMBOL_ALIAS Future symbols don't need backwards-compat aliases. Signed-off-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso --- src/rule.c | 74 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) (limited to 'src/rule.c') diff --git a/src/rule.c b/src/rule.c index 0fb27ed..3a32bf6 100644 --- a/src/rule.c +++ b/src/rule.c @@ -62,7 +62,7 @@ struct nftnl_rule *nftnl_rule_alloc(void) return r; } -EXPORT_SYMBOL(nftnl_rule_alloc, nft_rule_alloc); +EXPORT_SYMBOL_ALIAS(nftnl_rule_alloc, nft_rule_alloc); void nftnl_rule_free(struct nftnl_rule *r) { @@ -78,13 +78,13 @@ void nftnl_rule_free(struct nftnl_rule *r) xfree(r); } -EXPORT_SYMBOL(nftnl_rule_free, nft_rule_free); +EXPORT_SYMBOL_ALIAS(nftnl_rule_free, nft_rule_free); bool nftnl_rule_is_set(const struct nftnl_rule *r, uint16_t attr) { return r->flags & (1 << attr); } -EXPORT_SYMBOL(nftnl_rule_is_set, nft_rule_attr_is_set); +EXPORT_SYMBOL_ALIAS(nftnl_rule_is_set, nft_rule_attr_is_set); void nftnl_rule_unset(struct nftnl_rule *r, uint16_t attr) { @@ -115,7 +115,7 @@ void nftnl_rule_unset(struct nftnl_rule *r, uint16_t attr) r->flags &= ~(1 << attr); } -EXPORT_SYMBOL(nftnl_rule_unset, nft_rule_attr_unset); +EXPORT_SYMBOL_ALIAS(nftnl_rule_unset, nft_rule_attr_unset); static uint32_t nftnl_rule_validate[NFTNL_RULE_MAX + 1] = { [NFTNL_RULE_HANDLE] = sizeof(uint64_t), @@ -168,31 +168,31 @@ void nftnl_rule_set_data(struct nftnl_rule *r, uint16_t attr, } r->flags |= (1 << attr); } -EXPORT_SYMBOL(nftnl_rule_set_data, nft_rule_attr_set_data); +EXPORT_SYMBOL_ALIAS(nftnl_rule_set_data, nft_rule_attr_set_data); void nftnl_rule_set(struct nftnl_rule *r, uint16_t attr, const void *data) { nftnl_rule_set_data(r, attr, data, nftnl_rule_validate[attr]); } -EXPORT_SYMBOL(nftnl_rule_set, nft_rule_attr_set); +EXPORT_SYMBOL_ALIAS(nftnl_rule_set, nft_rule_attr_set); void nftnl_rule_set_u32(struct nftnl_rule *r, uint16_t attr, uint32_t val) { nftnl_rule_set_data(r, attr, &val, sizeof(uint32_t)); } -EXPORT_SYMBOL(nftnl_rule_set_u32, nft_rule_attr_set_u32); +EXPORT_SYMBOL_ALIAS(nftnl_rule_set_u32, nft_rule_attr_set_u32); void nftnl_rule_set_u64(struct nftnl_rule *r, uint16_t attr, uint64_t val) { nftnl_rule_set_data(r, attr, &val, sizeof(uint64_t)); } -EXPORT_SYMBOL(nftnl_rule_set_u64, nft_rule_attr_set_u64); +EXPORT_SYMBOL_ALIAS(nftnl_rule_set_u64, nft_rule_attr_set_u64); void nftnl_rule_set_str(struct nftnl_rule *r, uint16_t attr, const char *str) { nftnl_rule_set_data(r, attr, str, strlen(str)); } -EXPORT_SYMBOL(nftnl_rule_set_str, nft_rule_attr_set_str); +EXPORT_SYMBOL_ALIAS(nftnl_rule_set_str, nft_rule_attr_set_str); const void *nftnl_rule_get_data(const struct nftnl_rule *r, uint16_t attr, uint32_t *data_len) @@ -226,20 +226,20 @@ const void *nftnl_rule_get_data(const struct nftnl_rule *r, uint16_t attr, } return NULL; } -EXPORT_SYMBOL(nftnl_rule_get_data, nft_rule_attr_get_data); +EXPORT_SYMBOL_ALIAS(nftnl_rule_get_data, nft_rule_attr_get_data); const void *nftnl_rule_get(const struct nftnl_rule *r, uint16_t attr) { uint32_t data_len; return nftnl_rule_get_data(r, attr, &data_len); } -EXPORT_SYMBOL(nftnl_rule_get, nft_rule_attr_get); +EXPORT_SYMBOL_ALIAS(nftnl_rule_get, nft_rule_attr_get); const char *nftnl_rule_get_str(const struct nftnl_rule *r, uint16_t attr) { return nftnl_rule_get(r, attr); } -EXPORT_SYMBOL(nftnl_rule_get_str, nft_rule_attr_get_str); +EXPORT_SYMBOL_ALIAS(nftnl_rule_get_str, nft_rule_attr_get_str); uint32_t nftnl_rule_get_u32(const struct nftnl_rule *r, uint16_t attr) { @@ -250,7 +250,7 @@ uint32_t nftnl_rule_get_u32(const struct nftnl_rule *r, uint16_t attr) return val ? *val : 0; } -EXPORT_SYMBOL(nftnl_rule_get_u32, nft_rule_attr_get_u32); +EXPORT_SYMBOL_ALIAS(nftnl_rule_get_u32, nft_rule_attr_get_u32); uint64_t nftnl_rule_get_u64(const struct nftnl_rule *r, uint16_t attr) { @@ -261,7 +261,7 @@ uint64_t nftnl_rule_get_u64(const struct nftnl_rule *r, uint16_t attr) return val ? *val : 0; } -EXPORT_SYMBOL(nftnl_rule_get_u64, nft_rule_attr_get_u64); +EXPORT_SYMBOL_ALIAS(nftnl_rule_get_u64, nft_rule_attr_get_u64); uint8_t nftnl_rule_get_u8(const struct nftnl_rule *r, uint16_t attr) { @@ -272,7 +272,7 @@ uint8_t nftnl_rule_get_u8(const struct nftnl_rule *r, uint16_t attr) return val ? *val : 0; } -EXPORT_SYMBOL(nftnl_rule_get_u8, nft_rule_attr_get_u8); +EXPORT_SYMBOL_ALIAS(nftnl_rule_get_u8, nft_rule_attr_get_u8); void nftnl_rule_nlmsg_build_payload(struct nlmsghdr *nlh, struct nftnl_rule *r) { @@ -313,13 +313,13 @@ void nftnl_rule_nlmsg_build_payload(struct nlmsghdr *nlh, struct nftnl_rule *r) mnl_attr_nest_end(nlh, nest); } } -EXPORT_SYMBOL(nftnl_rule_nlmsg_build_payload, nft_rule_nlmsg_build_payload); +EXPORT_SYMBOL_ALIAS(nftnl_rule_nlmsg_build_payload, nft_rule_nlmsg_build_payload); void nftnl_rule_add_expr(struct nftnl_rule *r, struct nftnl_expr *expr) { list_add_tail(&expr->head, &r->expr_list); } -EXPORT_SYMBOL(nftnl_rule_add_expr, nft_rule_add_expr); +EXPORT_SYMBOL_ALIAS(nftnl_rule_add_expr, nft_rule_add_expr); static int nftnl_rule_parse_attr_cb(const struct nlattr *attr, void *data) { @@ -468,7 +468,7 @@ int nftnl_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_rule *r) return ret; } -EXPORT_SYMBOL(nftnl_rule_nlmsg_parse, nft_rule_nlmsg_parse); +EXPORT_SYMBOL_ALIAS(nftnl_rule_nlmsg_parse, nft_rule_nlmsg_parse); #ifdef JSON_PARSING int nftnl_jansson_parse_rule(struct nftnl_rule *r, json_t *tree, @@ -702,14 +702,14 @@ int nftnl_rule_parse(struct nftnl_rule *r, enum nftnl_parse_type type, { return nftnl_rule_do_parse(r, type, data, err, NFTNL_PARSE_BUFFER); } -EXPORT_SYMBOL(nftnl_rule_parse, nft_rule_parse); +EXPORT_SYMBOL_ALIAS(nftnl_rule_parse, nft_rule_parse); int nftnl_rule_parse_file(struct nftnl_rule *r, enum nftnl_parse_type type, FILE *fp, struct nftnl_parse_err *err) { return nftnl_rule_do_parse(r, type, fp, err, NFTNL_PARSE_FILE); } -EXPORT_SYMBOL(nftnl_rule_parse_file, nft_rule_parse_file); +EXPORT_SYMBOL_ALIAS(nftnl_rule_parse_file, nft_rule_parse_file); static int nftnl_rule_snprintf_json(char *buf, size_t size, struct nftnl_rule *r, uint32_t type, uint32_t flags) @@ -967,7 +967,7 @@ int nftnl_rule_snprintf(char *buf, size_t size, struct nftnl_rule *r, return nftnl_rule_cmd_snprintf(buf, size, r, nftnl_flag2cmd(flags), type, flags); } -EXPORT_SYMBOL(nftnl_rule_snprintf, nft_rule_snprintf); +EXPORT_SYMBOL_ALIAS(nftnl_rule_snprintf, nft_rule_snprintf); static inline int nftnl_rule_do_snprintf(char *buf, size_t size, void *r, uint32_t cmd, uint32_t type, @@ -982,7 +982,7 @@ int nftnl_rule_fprintf(FILE *fp, struct nftnl_rule *r, uint32_t type, return nftnl_fprintf(fp, r, NFTNL_CMD_UNSPEC, type, flags, nftnl_rule_do_snprintf); } -EXPORT_SYMBOL(nftnl_rule_fprintf, nft_rule_fprintf); +EXPORT_SYMBOL_ALIAS(nftnl_rule_fprintf, nft_rule_fprintf); int nftnl_expr_foreach(struct nftnl_rule *r, int (*cb)(struct nftnl_expr *e, void *data), @@ -998,7 +998,7 @@ int nftnl_expr_foreach(struct nftnl_rule *r, } return 0; } -EXPORT_SYMBOL(nftnl_expr_foreach, nft_rule_expr_foreach); +EXPORT_SYMBOL_ALIAS(nftnl_expr_foreach, nft_rule_expr_foreach); struct nftnl_expr_iter { struct nftnl_rule *r; @@ -1022,7 +1022,7 @@ struct nftnl_expr_iter *nftnl_expr_iter_create(struct nftnl_rule *r) return iter; } -EXPORT_SYMBOL(nftnl_expr_iter_create, nft_rule_expr_iter_create); +EXPORT_SYMBOL_ALIAS(nftnl_expr_iter_create, nft_rule_expr_iter_create); struct nftnl_expr *nftnl_expr_iter_next(struct nftnl_expr_iter *iter) { @@ -1038,13 +1038,13 @@ struct nftnl_expr *nftnl_expr_iter_next(struct nftnl_expr_iter *iter) return expr; } -EXPORT_SYMBOL(nftnl_expr_iter_next, nft_rule_expr_iter_next); +EXPORT_SYMBOL_ALIAS(nftnl_expr_iter_next, nft_rule_expr_iter_next); void nftnl_expr_iter_destroy(struct nftnl_expr_iter *iter) { xfree(iter); } -EXPORT_SYMBOL(nftnl_expr_iter_destroy, nft_rule_expr_iter_destroy); +EXPORT_SYMBOL_ALIAS(nftnl_expr_iter_destroy, nft_rule_expr_iter_destroy); struct nftnl_rule_list { struct list_head list; @@ -1062,7 +1062,7 @@ struct nftnl_rule_list *nftnl_rule_list_alloc(void) return list; } -EXPORT_SYMBOL(nftnl_rule_list_alloc, nft_rule_list_alloc); +EXPORT_SYMBOL_ALIAS(nftnl_rule_list_alloc, nft_rule_list_alloc); void nftnl_rule_list_free(struct nftnl_rule_list *list) { @@ -1074,31 +1074,31 @@ void nftnl_rule_list_free(struct nftnl_rule_list *list) } xfree(list); } -EXPORT_SYMBOL(nftnl_rule_list_free, nft_rule_list_free); +EXPORT_SYMBOL_ALIAS(nftnl_rule_list_free, nft_rule_list_free); int nftnl_rule_list_is_empty(struct nftnl_rule_list *list) { return list_empty(&list->list); } -EXPORT_SYMBOL(nftnl_rule_list_is_empty, nft_rule_list_is_empty); +EXPORT_SYMBOL_ALIAS(nftnl_rule_list_is_empty, nft_rule_list_is_empty); void nftnl_rule_list_add(struct nftnl_rule *r, struct nftnl_rule_list *list) { list_add(&r->head, &list->list); } -EXPORT_SYMBOL(nftnl_rule_list_add, nft_rule_list_add); +EXPORT_SYMBOL_ALIAS(nftnl_rule_list_add, nft_rule_list_add); void nftnl_rule_list_add_tail(struct nftnl_rule *r, struct nftnl_rule_list *list) { list_add_tail(&r->head, &list->list); } -EXPORT_SYMBOL(nftnl_rule_list_add_tail, nft_rule_list_add_tail); +EXPORT_SYMBOL_ALIAS(nftnl_rule_list_add_tail, nft_rule_list_add_tail); void nftnl_rule_list_del(struct nftnl_rule *r) { list_del(&r->head); } -EXPORT_SYMBOL(nftnl_rule_list_del, nft_rule_list_del); +EXPORT_SYMBOL_ALIAS(nftnl_rule_list_del, nft_rule_list_del); int nftnl_rule_list_foreach(struct nftnl_rule_list *rule_list, int (*cb)(struct nftnl_rule *r, void *data), @@ -1114,7 +1114,7 @@ int nftnl_rule_list_foreach(struct nftnl_rule_list *rule_list, } return 0; } -EXPORT_SYMBOL(nftnl_rule_list_foreach, nft_rule_list_foreach); +EXPORT_SYMBOL_ALIAS(nftnl_rule_list_foreach, nft_rule_list_foreach); struct nftnl_rule_list_iter { struct nftnl_rule_list *list; @@ -1137,13 +1137,13 @@ struct nftnl_rule_list_iter *nftnl_rule_list_iter_create(struct nftnl_rule_list return iter; } -EXPORT_SYMBOL(nftnl_rule_list_iter_create, nft_rule_list_iter_create); +EXPORT_SYMBOL_ALIAS(nftnl_rule_list_iter_create, nft_rule_list_iter_create); struct nftnl_rule *nftnl_rule_list_iter_cur(struct nftnl_rule_list_iter *iter) { return iter->cur; } -EXPORT_SYMBOL(nftnl_rule_list_iter_cur, nft_rule_list_iter_cur); +EXPORT_SYMBOL_ALIAS(nftnl_rule_list_iter_cur, nft_rule_list_iter_cur); struct nftnl_rule *nftnl_rule_list_iter_next(struct nftnl_rule_list_iter *iter) { @@ -1159,10 +1159,10 @@ struct nftnl_rule *nftnl_rule_list_iter_next(struct nftnl_rule_list_iter *iter) return r; } -EXPORT_SYMBOL(nftnl_rule_list_iter_next, nft_rule_list_iter_next); +EXPORT_SYMBOL_ALIAS(nftnl_rule_list_iter_next, nft_rule_list_iter_next); void nftnl_rule_list_iter_destroy(struct nftnl_rule_list_iter *iter) { xfree(iter); } -EXPORT_SYMBOL(nftnl_rule_list_iter_destroy, nft_rule_list_iter_destroy); +EXPORT_SYMBOL_ALIAS(nftnl_rule_list_iter_destroy, nft_rule_list_iter_destroy); -- cgit v1.2.3