summaryrefslogtreecommitdiffstats
path: root/src/rule.c
diff options
context:
space:
mode:
authorÁlvaro Neira Ayuso <alvaroneay@gmail.com>2013-11-11 21:09:35 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2013-11-14 00:38:38 +0100
commit989b793a3bf689757b2b8f08a1c264743d75fa0f (patch)
tree8a932779feb9b906282cc929ad0cab30799c8176 /src/rule.c
parent838ae8f60f43061778ce1b7f08cb08fc60fd21f9 (diff)
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 <alvaroneay@gmail.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/rule.c')
-rw-r--r--src/rule.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rule.c b/src/rule.c
index 3b45dc7..4f70dab 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -658,16 +658,16 @@ static int nft_rule_xml_parse(struct nft_rule *r, const char *xml)
#endif
}
-int nft_rule_parse(struct nft_rule *r, enum nft_rule_parse_type type,
+int nft_rule_parse(struct nft_rule *r, enum nft_parse_type type,
const char *data)
{
int ret;
switch (type) {
- case NFT_RULE_PARSE_XML:
+ case NFT_PARSE_XML:
ret = nft_rule_xml_parse(r, data);
break;
- case NFT_RULE_PARSE_JSON:
+ case NFT_PARSE_JSON:
ret = nft_rule_json_parse(r, data);
break;
default:
@@ -806,11 +806,11 @@ int nft_rule_snprintf(char *buf, size_t size, struct nft_rule *r,
uint32_t type, uint32_t flags)
{
switch(type) {
- case NFT_RULE_O_DEFAULT:
+ case NFT_OUTPUT_DEFAULT:
return nft_rule_snprintf_default(buf, size, r, type, flags);
- case NFT_RULE_O_XML:
+ case NFT_OUTPUT_XML:
return nft_rule_snprintf_xml(buf, size, r, type, flags);
- case NFT_RULE_O_JSON:
+ case NFT_OUTPUT_JSON:
return nft_rule_snprintf_json(buf, size, r, type, flags);
default:
break;