On Tue, Jan 07, 2014 at 12:47:27PM +0100, Arturo Borrero Gonzalez wrote:
> Rework parsing symbols logic, so we get a cleaner file.
>
> Also, this allows us to use XML(libmxml)/JSON(libjannson) internal datatypes
> without fear.
>
> Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@xxxxxxxxx>
> ---
> 0 files changed
>
> diff --git a/src/internal.h b/src/internal.h
> index 5fef6d6..83cb4e8 100644
> --- a/src/internal.h
> +++ b/src/internal.h
> @@ -40,6 +40,10 @@ struct nft_parse_err {
>
> #ifdef XML_PARSING
> #include <mxml.h>
> +#else
> +#define mxml_node_t void
> +#endif /* XML_PARSING */
I failed to see the benefit of this patch.
> +
> #define NFT_XML_MAND 0
> #define NFT_XML_OPT (1 << 0)
> mxml_node_t *nft_mxml_build_tree(const char *xml, const char *treename,
> @@ -78,10 +82,13 @@ int nft_mxml_rule_parse(mxml_node_t *tree, struct nft_rule *r,
> struct nft_set;
> int nft_mxml_set_parse(mxml_node_t *tree, struct nft_set *s,
> struct nft_parse_err *err);
> -#endif
We don't save any ifdef.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
