summaryrefslogtreecommitdiffstats
path: root/src/jansson.c
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2015-09-07 17:56:47 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2015-09-07 20:00:57 +0200
commit206d98a54305a1178c7d9c5e234699813f8c6f5a (patch)
treecf4a1335eb6724cfbdb3a8caa5346a78758d9506 /src/jansson.c
parent96807c4c05e1e76b8bbf00d874a28a279e7d2840 (diff)
src: rename nftnl_rule_expr to nftnl_expr
Use a shorter name for this, morever this can be used from sets so the _rule_ is misleading. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/jansson.c')
-rw-r--r--src/jansson.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/jansson.c b/src/jansson.c
index 5ba26d3..5c89ec7 100644
--- a/src/jansson.c
+++ b/src/jansson.c
@@ -186,11 +186,11 @@ int nftnl_jansson_str2num(json_t *root, const char *node_name, int base,
return nftnl_strtoi(str, base, out, type);
}
-struct nftnl_rule_expr *nftnl_jansson_expr_parse(json_t *root,
+struct nftnl_expr *nftnl_jansson_expr_parse(json_t *root,
struct nftnl_parse_err *err,
struct nftnl_set_list *set_list)
{
- struct nftnl_rule_expr *e;
+ struct nftnl_expr *e;
const char *type;
uint32_t set_id;
int ret;
@@ -199,7 +199,7 @@ struct nftnl_rule_expr *nftnl_jansson_expr_parse(json_t *root,
if (type == NULL)
return NULL;
- e = nftnl_rule_expr_alloc(type);
+ e = nftnl_expr_alloc(type);
if (e == NULL) {
err->node_name = "type";
return NULL;
@@ -210,7 +210,7 @@ struct nftnl_rule_expr *nftnl_jansson_expr_parse(json_t *root,
if (set_list != NULL &&
strcmp(type, "lookup") == 0 &&
nftnl_set_lookup_id(e, set_list, &set_id))
- nftnl_rule_expr_set_u32(e, NFTNL_EXPR_LOOKUP_SET_ID, set_id);
+ nftnl_expr_set_u32(e, NFTNL_EXPR_LOOKUP_SET_ID, set_id);
return ret < 0 ? NULL : e;
}