From 206d98a54305a1178c7d9c5e234699813f8c6f5a Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Mon, 7 Sep 2015 17:56:47 +0200 Subject: 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 --- src/mxml.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/mxml.c') diff --git a/src/mxml.c b/src/mxml.c index de43f73..51dbf1b 100644 --- a/src/mxml.c +++ b/src/mxml.c @@ -58,12 +58,12 @@ err: return NULL; } -struct nftnl_rule_expr *nftnl_mxml_expr_parse(mxml_node_t *node, +struct nftnl_expr *nftnl_mxml_expr_parse(mxml_node_t *node, struct nftnl_parse_err *err, struct nftnl_set_list *set_list) { mxml_node_t *tree; - struct nftnl_rule_expr *e; + struct nftnl_expr *e; const char *expr_name; char *xml_text; uint32_t set_id; @@ -76,7 +76,7 @@ struct nftnl_rule_expr *nftnl_mxml_expr_parse(mxml_node_t *node, goto err; } - e = nftnl_rule_expr_alloc(expr_name); + e = nftnl_expr_alloc(expr_name); if (e == NULL) goto err; @@ -96,11 +96,11 @@ struct nftnl_rule_expr *nftnl_mxml_expr_parse(mxml_node_t *node, if (set_list != NULL && strcmp(expr_name, "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; err_expr: - nftnl_rule_expr_free(e); + nftnl_expr_free(e); err: mxmlDelete(tree); errno = EINVAL; -- cgit v1.2.3