From be9019acf97391d58838e3c21fe7db9cfc27b5f9 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Thu, 25 Jul 2013 21:46:46 +0200 Subject: expr: ct: use nft_mxml_str_parse Replace existing code to use this function. Signed-off-by: Pablo Neira Ayuso --- src/expr/ct.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/expr/ct.c b/src/expr/ct.c index a0323e1..866c743 100644 --- a/src/expr/ct.c +++ b/src/expr/ct.c @@ -182,7 +182,7 @@ static int nft_rule_expr_ct_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree { #ifdef XML_PARSING struct nft_expr_ct *ct = nft_expr_data(e); - mxml_node_t *node = NULL; + const char *key_str; int32_t reg; int key; uint8_t dir; @@ -194,11 +194,11 @@ static int nft_rule_expr_ct_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree ct->dreg = reg; e->flags |= (1 << NFT_EXPR_CT_DREG); - node = mxmlFindElement(tree, tree, "key", NULL, NULL, MXML_DESCEND); - if (node == NULL) - goto err; + key_str = nft_mxml_str_parse(tree, "key", MXML_DESCEND_FIRST); + if (key_str == NULL) + return -1; - key = str2ctkey(node->child->value.opaque); + key = str2ctkey(key_str); if (key < 0) goto err; -- cgit v1.2.3