data_reg: Fix conditional code in XML parsing functions
PATCH 1/1 data_reg: Fix conditional code in XML parsing functions
All the XML parsing chunk was conditional but the main function. I think is better to do the conditional compilation by function, returning -1 and setting errno = EOPNOTSUPP.
Signed-off-by Arturo Borrero Gonzalez <[email protected]>
--- src/expr/data_reg.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
src/expr/data_reg.c +11 -2
@@ -25,9 +25,9 @@#include "data_reg.h" #include "internal.h" -#ifdef XML_PARSING static int nft_data_reg_verdict_xml_parse (union nft_data_reg *reg,char *xml) { +#ifdef XML_PARSING mxml_node_t *tree =NULL ;mxml_node_t *node =NULL ;char *endptr;
@@ -76,12 +76,15 @@ static int nft_data_reg_verdict_xml_parse(union nft_data_reg *reg, char *xml)mxmlDelete (tree);return 0 ; +#else errno =EOPNOTSUPP ;return -1 ; +#endif }static int nft_data_reg_chain_xml_parse (union nft_data_reg *reg,char *xml) { +#ifdef XML_PARSING mxml_node_t *tree =NULL ;mxml_node_t *node =NULL ;
@@ -128,10 +131,15 @@ static int nft_data_reg_chain_xml_parse(union nft_data_reg *reg, char *xml)mxmlDelete (tree);return 0 ; +#else + errno =EOPNOTSUPP ; +return -1 ; +#endif }static int nft_data_reg_value_xml_parse (union nft_data_reg *reg,char *xml) { +#ifdef XML_PARSING mxml_node_t *tree =NULL ;mxml_node_t *node =NULL ;int i, len;
@@ -211,10 +219,11 @@ static int nft_data_reg_value_xml_parse(union nft_data_reg *reg, char *xml)mxmlDelete (tree);return 0 ; +#else errno =EOPNOTSUPP ;return -1 ; -}#endif +}int nft_data_reg_xml_parse (union nft_data_reg *reg,char *xml) {
Pablo Neira Ayuso
maintainerQuoted 2 lines · Arturo Borrero
All the XML parsing chunk was conditional but the main function. I think is better to do the conditional compilation by function, returning -1 and setting errno = EOPNOTSUPP.
Those functions are static, thus not exported. It doesn't make sense to me to use this approach in this case.