From 907a9f8e5a93f5bcd449643eb3916a656d634758 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 20 Dec 2016 13:47:11 +0100 Subject: src: get rid of aliases and compat This machinery was introduced to avoid sudden compilation breakage of old nftables releases. With the upcoming release of 0.7 (and 0.6 which is now 6 months old) this is not required anymore. Moreover, users gain nothing from older releases since they are half-boiled and buggy. So let's get rid of aliases now. Bump LIBVERSION and update map file. Signed-off-by: Pablo Neira Ayuso --- src/object.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/object.c') diff --git a/src/object.c b/src/object.c index 0d3dc2b..9594d2f 100644 --- a/src/object.c +++ b/src/object.c @@ -419,14 +419,14 @@ static int nftnl_obj_cmd_snprintf(char *buf, size_t size, SNPRINTF_BUFFER_SIZE(ret, size, len, offset); switch (type) { - case NFT_OUTPUT_DEFAULT: + case NFTNL_OUTPUT_DEFAULT: ret = nftnl_obj_snprintf_dflt(buf + offset, len, obj, type, flags); break; - case NFT_OUTPUT_JSON: + case NFTNL_OUTPUT_JSON: ret = nftnl_obj_export(buf + offset, len, obj, type, flags); break; - case NFT_OUTPUT_XML: + case NFTNL_OUTPUT_XML: default: return -1; } @@ -455,7 +455,7 @@ static int nftnl_obj_do_snprintf(char *buf, size_t size, const void *obj, int nftnl_obj_fprintf(FILE *fp, const struct nftnl_obj *obj, uint32_t type, uint32_t flags) { - return nftnl_fprintf(fp, obj, NFT_CMD_UNSPEC, type, flags, + return nftnl_fprintf(fp, obj, NFTNL_CMD_UNSPEC, type, flags, nftnl_obj_do_snprintf); } EXPORT_SYMBOL(nftnl_obj_fprintf); -- cgit v1.2.3