From 3f994836f6bb124a5c0185ab6659ef7f57ceac5f Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Thu, 25 Jul 2013 21:21:51 +0200 Subject: src: xml: consolidate common XML code via nft_mxml_str_parse This patch moves common XML string parsing code to nft_mxml_str_parse(). Signed-off-by: Pablo Neira Ayuso --- src/expr/log.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/expr/log.c') diff --git a/src/expr/log.c b/src/expr/log.c index 9ff2d32..0872ee0 100644 --- a/src/expr/log.c +++ b/src/expr/log.c @@ -156,16 +156,13 @@ static int nft_rule_expr_log_xml_parse(struct nft_rule_expr *e, mxml_node_t *tre { #ifdef XML_PARSING struct nft_expr_log *log = nft_expr_data(e); - mxml_node_t *node = NULL; + const char *prefix; - node = mxmlFindElement(tree, tree, "prefix", NULL, NULL, - MXML_DESCEND_FIRST); - if (node == NULL) { - errno = EINVAL; + prefix = nft_mxml_str_parse(tree, "prefix", MXML_DESCEND_FIRST); + if (prefix == NULL) return -1; - } - log->prefix = strdup(node->child->value.opaque); + log->prefix = strdup(prefix); e->flags |= (1 << NFT_EXPR_LOG_PREFIX); if (nft_mxml_num_parse(tree, "group", MXML_DESCEND_FIRST, BASE_DEC, -- cgit v1.2.3