From 760768890e60617acfd144dce875a4a3be14513c Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 1 Sep 2015 20:19:56 +0200 Subject: src: rename existing functions to use the nftnl_ prefix So we can use the nft_* prefix anytime soon for our upcoming higher level library. After this patch, the nft_* symbols become an alias of the nftnl_* symbols. Signed-off-by: Pablo Neira Ayuso --- include/json.h | 86 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'include/json.h') diff --git a/include/json.h b/include/json.h index 821c15f..a15a65b 100644 --- a/include/json.h +++ b/include/json.h @@ -6,51 +6,51 @@ #include #include "common.h" -struct nft_table; -struct nft_chain; -struct nft_rule; -struct nft_set; -struct nft_set_elem; -struct nft_set_list; -union nft_data_reg; +struct nftnl_table; +struct nftnl_chain; +struct nftnl_rule; +struct nftnl_set; +struct nftnl_set_elem; +struct nftnl_set_list; +union nftnl_data_reg; -int nft_jansson_parse_val(json_t *root, const char *node_name, int type, - void *out, struct nft_parse_err *err); -const char *nft_jansson_parse_str(json_t *root, const char *node_name, - struct nft_parse_err *err); -bool nft_jansson_node_exist(json_t *root, const char *node_name); -json_t *nft_jansson_create_root(const void *json, json_error_t *error, - struct nft_parse_err *err, enum nft_parse_input input); -json_t *nft_jansson_get_node(json_t *root, const char *node_name, - struct nft_parse_err *err); -void nft_jansson_free_root(json_t *root); -int nft_jansson_parse_family(json_t *root, void *out, struct nft_parse_err *err); -int nft_jansson_str2num(json_t *root, const char *node_name, int base, void *out, - enum nft_type type, struct nft_parse_err *err); -int nft_jansson_parse_reg(json_t *root, const char *node_name, int type, - void *out, struct nft_parse_err *err); -struct nft_rule_expr *nft_jansson_expr_parse(json_t *root, - struct nft_parse_err *err, - struct nft_set_list *set_list); -int nft_jansson_data_reg_parse(json_t *root, const char *node_name, - union nft_data_reg *data_reg, - struct nft_parse_err *err); -int nft_jansson_set_elem_parse(struct nft_set_elem *e, json_t *root, - struct nft_parse_err *err); -int nft_jansson_parse_table(struct nft_table *t, json_t *tree, - struct nft_parse_err *err); -int nft_jansson_parse_chain(struct nft_chain *c, json_t *tree, - struct nft_parse_err *err); -int nft_jansson_parse_rule(struct nft_rule *r, json_t *tree, - struct nft_parse_err *err, - struct nft_set_list *set_list); -int nft_jansson_parse_set(struct nft_set *s, json_t *tree, - struct nft_parse_err *err); -int nft_jansson_parse_elem(struct nft_set *s, json_t *tree, - struct nft_parse_err *err); +int nftnl_jansson_parse_val(json_t *root, const char *node_name, int type, + void *out, struct nftnl_parse_err *err); +const char *nftnl_jansson_parse_str(json_t *root, const char *node_name, + struct nftnl_parse_err *err); +bool nftnl_jansson_node_exist(json_t *root, const char *node_name); +json_t *nftnl_jansson_create_root(const void *json, json_error_t *error, + struct nftnl_parse_err *err, enum nftnl_parse_input input); +json_t *nftnl_jansson_get_node(json_t *root, const char *node_name, + struct nftnl_parse_err *err); +void nftnl_jansson_free_root(json_t *root); +int nftnl_jansson_parse_family(json_t *root, void *out, struct nftnl_parse_err *err); +int nftnl_jansson_str2num(json_t *root, const char *node_name, int base, void *out, + enum nftnl_type type, struct nftnl_parse_err *err); +int nftnl_jansson_parse_reg(json_t *root, const char *node_name, int type, + void *out, struct nftnl_parse_err *err); +struct nftnl_rule_expr *nftnl_jansson_expr_parse(json_t *root, + struct nftnl_parse_err *err, + struct nftnl_set_list *set_list); +int nftnl_jansson_data_reg_parse(json_t *root, const char *node_name, + union nftnl_data_reg *data_reg, + struct nftnl_parse_err *err); +int nftnl_jansson_set_elem_parse(struct nftnl_set_elem *e, json_t *root, + struct nftnl_parse_err *err); +int nftnl_jansson_parse_table(struct nftnl_table *t, json_t *tree, + struct nftnl_parse_err *err); +int nftnl_jansson_parse_chain(struct nftnl_chain *c, json_t *tree, + struct nftnl_parse_err *err); +int nftnl_jansson_parse_rule(struct nftnl_rule *r, json_t *tree, + struct nftnl_parse_err *err, + struct nftnl_set_list *set_list); +int nftnl_jansson_parse_set(struct nftnl_set *s, json_t *tree, + struct nftnl_parse_err *err); +int nftnl_jansson_parse_elem(struct nftnl_set *s, json_t *tree, + struct nftnl_parse_err *err); -int nft_data_reg_json_parse(union nft_data_reg *reg, json_t *data, - struct nft_parse_err *err); +int nftnl_data_reg_json_parse(union nftnl_data_reg *reg, json_t *data, + struct nftnl_parse_err *err); #else #define json_t void #endif -- cgit v1.2.3