From 989b793a3bf689757b2b8f08a1c264743d75fa0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Neira=20Ayuso?= Date: Mon, 11 Nov 2013 21:09:35 +0100 Subject: src: unify parse and output types Unify parse and output types that are redundant to all existing nftables objects. Thus, all NFT_*_O_[XML|JSON|DEFAULT] are merged into NFT_OUTPUT_[JSON|XML] and NFT_PARSE_[JSON|XML]. Signed-off-by: Alvaro Neira Ayuso Signed-off-by: Pablo Neira Ayuso --- include/libnftables/rule.h | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'include/libnftables/rule.h') diff --git a/include/libnftables/rule.h b/include/libnftables/rule.h index b61afb0..4957a2a 100644 --- a/include/libnftables/rule.h +++ b/include/libnftables/rule.h @@ -6,6 +6,8 @@ #include #include +#include + #ifdef __cplusplus extern "C" { #endif @@ -45,20 +47,7 @@ struct nlmsghdr; void nft_rule_nlmsg_build_payload(struct nlmsghdr *nlh, struct nft_rule *t); -enum { - NFT_RULE_O_DEFAULT = 0, - NFT_RULE_O_XML, - NFT_RULE_O_JSON, -}; - -enum nft_rule_parse_type { - NFT_RULE_PARSE_NONE = 0, - NFT_RULE_PARSE_XML, - NFT_RULE_PARSE_JSON, - NFT_RULE_PARSE_MAX, -}; - -int nft_rule_parse(struct nft_rule *r, enum nft_rule_parse_type type, const char *data); +int nft_rule_parse(struct nft_rule *r, enum nft_parse_type type, const char *data); int nft_rule_snprintf(char *buf, size_t size, struct nft_rule *t, uint32_t type, uint32_t flags); int nft_rule_fprintf(FILE *fp, struct nft_rule *r, uint32_t type, uint32_t flags); -- cgit v1.2.3