blob: 561f0e554070243eab8c4dd7ddfa7073691ae5c7 [file] [log] [blame]
Brad Bishop26bdd442019-08-16 17:08:17 -04001From 9e2c810ebc3c917ea7483205178416e9eaf952fe Mon Sep 17 00:00:00 2001
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08002From: Alex Kiernan <alex.kiernan@gmail.com>
3Date: Wed, 7 Nov 2018 19:41:54 +0000
4Subject: [PATCH] avoid naming local function as one of printf family
5
6Fixes build issues with clang
7error: no member named '__builtin___snprintf_chk' in 'struct expr_ops'
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
11---
12 include/expr_ops.h | 2 +-
13 include/obj.h | 2 +-
14 src/expr.c | 4 ++--
15 src/expr/bitwise.c | 2 +-
16 src/expr/byteorder.c | 2 +-
17 src/expr/cmp.c | 2 +-
18 src/expr/connlimit.c | 2 +-
19 src/expr/counter.c | 2 +-
20 src/expr/ct.c | 2 +-
21 src/expr/dup.c | 2 +-
22 src/expr/dynset.c | 2 +-
23 src/expr/exthdr.c | 2 +-
24 src/expr/fib.c | 2 +-
25 src/expr/flow_offload.c | 2 +-
26 src/expr/fwd.c | 2 +-
27 src/expr/hash.c | 2 +-
28 src/expr/immediate.c | 2 +-
29 src/expr/limit.c | 2 +-
30 src/expr/log.c | 2 +-
31 src/expr/lookup.c | 2 +-
32 src/expr/masq.c | 2 +-
33 src/expr/match.c | 2 +-
34 src/expr/meta.c | 2 +-
35 src/expr/nat.c | 2 +-
36 src/expr/numgen.c | 2 +-
37 src/expr/objref.c | 2 +-
Brad Bishop26bdd442019-08-16 17:08:17 -040038 src/expr/osf.c | 2 +-
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080039 src/expr/payload.c | 2 +-
40 src/expr/queue.c | 2 +-
41 src/expr/quota.c | 2 +-
42 src/expr/range.c | 2 +-
43 src/expr/redir.c | 2 +-
44 src/expr/reject.c | 2 +-
45 src/expr/rt.c | 2 +-
46 src/expr/socket.c | 2 +-
47 src/expr/target.c | 2 +-
Brad Bishop26bdd442019-08-16 17:08:17 -040048 src/expr/tproxy.c | 2 +-
49 src/expr/tunnel.c | 2 +-
50 src/expr/xfrm.c | 2 +-
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080051 src/obj/counter.c | 2 +-
52 src/obj/ct_helper.c | 2 +-
Brad Bishop26bdd442019-08-16 17:08:17 -040053 src/obj/ct_timeout.c | 2 +-
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080054 src/obj/limit.c | 2 +-
55 src/obj/quota.c | 2 +-
Brad Bishop26bdd442019-08-16 17:08:17 -040056 src/obj/secmark.c | 2 +-
57 src/obj/tunnel.c | 2 +-
58 src/object.c | 2 +-
59 47 files changed, 48 insertions(+), 48 deletions(-)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080060
61diff --git a/include/expr_ops.h b/include/expr_ops.h
Brad Bishop26bdd442019-08-16 17:08:17 -040062index a7f1b9a..d2946de 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080063--- a/include/expr_ops.h
64+++ b/include/expr_ops.h
Brad Bishop26bdd442019-08-16 17:08:17 -040065@@ -17,7 +17,7 @@ struct expr_ops {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080066 const void *(*get)(const struct nftnl_expr *e, uint16_t type, uint32_t *data_len);
67 int (*parse)(struct nftnl_expr *e, struct nlattr *attr);
68 void (*build)(struct nlmsghdr *nlh, const struct nftnl_expr *e);
69- int (*snprintf)(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_expr *e);
70+ int (*snprintf_)(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_expr *e);
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080071 };
Brad Bishop26bdd442019-08-16 17:08:17 -040072
73 struct expr_ops *nftnl_expr_ops_lookup(const char *name);
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080074diff --git a/include/obj.h b/include/obj.h
Brad Bishop26bdd442019-08-16 17:08:17 -040075index 35b5c40..decd1ce 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080076--- a/include/obj.h
77+++ b/include/obj.h
Brad Bishop26bdd442019-08-16 17:08:17 -040078@@ -92,7 +92,7 @@ struct obj_ops {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080079 const void *(*get)(const struct nftnl_obj *e, uint16_t type, uint32_t *data_len);
80 int (*parse)(struct nftnl_obj *e, struct nlattr *attr);
81 void (*build)(struct nlmsghdr *nlh, const struct nftnl_obj *e);
82- int (*snprintf)(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_obj *e);
83+ int (*snprintf_)(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_obj *e);
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080084 };
Brad Bishop26bdd442019-08-16 17:08:17 -040085
86 extern struct obj_ops obj_ops_counter;
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080087diff --git a/src/expr.c b/src/expr.c
Brad Bishop26bdd442019-08-16 17:08:17 -040088index 80c4c36..b698a60 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080089--- a/src/expr.c
90+++ b/src/expr.c
Brad Bishop26bdd442019-08-16 17:08:17 -040091@@ -275,10 +275,10 @@ int nftnl_expr_snprintf(char *buf, size_t size, const struct nftnl_expr *expr,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080092 if (size)
93 buf[0] = '\0';
94
95- if (!expr->ops->snprintf)
96+ if (!expr->ops->snprintf_)
97 return 0;
98
99- ret = expr->ops->snprintf(buf + offset, remain, type, flags, expr);
100+ ret = expr->ops->snprintf_(buf + offset, remain, type, flags, expr);
101 SNPRINTF_BUFFER_SIZE(ret, remain, offset);
102
103 return offset;
104diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400105index c9d40df..27d644b 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800106--- a/src/expr/bitwise.c
107+++ b/src/expr/bitwise.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400108@@ -219,5 +219,5 @@ struct expr_ops expr_ops_bitwise = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800109 .get = nftnl_expr_bitwise_get,
110 .parse = nftnl_expr_bitwise_parse,
111 .build = nftnl_expr_bitwise_build,
112- .snprintf = nftnl_expr_bitwise_snprintf,
113+ .snprintf_ = nftnl_expr_bitwise_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800114 };
115diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400116index efdfa2b..7ae9dfb 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800117--- a/src/expr/byteorder.c
118+++ b/src/expr/byteorder.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400119@@ -234,5 +234,5 @@ struct expr_ops expr_ops_byteorder = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800120 .get = nftnl_expr_byteorder_get,
121 .parse = nftnl_expr_byteorder_parse,
122 .build = nftnl_expr_byteorder_build,
123- .snprintf = nftnl_expr_byteorder_snprintf,
124+ .snprintf_ = nftnl_expr_byteorder_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800125 };
126diff --git a/src/expr/cmp.c b/src/expr/cmp.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400127index 86d7842..e3be442 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800128--- a/src/expr/cmp.c
129+++ b/src/expr/cmp.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400130@@ -216,5 +216,5 @@ struct expr_ops expr_ops_cmp = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800131 .get = nftnl_expr_cmp_get,
132 .parse = nftnl_expr_cmp_parse,
133 .build = nftnl_expr_cmp_build,
134- .snprintf = nftnl_expr_cmp_snprintf,
135+ .snprintf_ = nftnl_expr_cmp_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800136 };
137diff --git a/src/expr/connlimit.c b/src/expr/connlimit.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400138index 53af93b..6c8bc40 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800139--- a/src/expr/connlimit.c
140+++ b/src/expr/connlimit.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400141@@ -149,5 +149,5 @@ struct expr_ops expr_ops_connlimit = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800142 .get = nftnl_expr_connlimit_get,
143 .parse = nftnl_expr_connlimit_parse,
144 .build = nftnl_expr_connlimit_build,
145- .snprintf = nftnl_expr_connlimit_snprintf,
Brad Bishop26bdd442019-08-16 17:08:17 -0400146+ .snprintf_ = nftnl_expr_connlimit_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800147 };
148diff --git a/src/expr/counter.c b/src/expr/counter.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400149index 89a602e..a32a69e 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800150--- a/src/expr/counter.c
151+++ b/src/expr/counter.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400152@@ -147,5 +147,5 @@ struct expr_ops expr_ops_counter = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800153 .get = nftnl_expr_counter_get,
154 .parse = nftnl_expr_counter_parse,
155 .build = nftnl_expr_counter_build,
156- .snprintf = nftnl_expr_counter_snprintf,
157+ .snprintf_ = nftnl_expr_counter_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800158 };
159diff --git a/src/expr/ct.c b/src/expr/ct.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400160index b9ca2dc..6fbed1d 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800161--- a/src/expr/ct.c
162+++ b/src/expr/ct.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400163@@ -272,5 +272,5 @@ struct expr_ops expr_ops_ct = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800164 .get = nftnl_expr_ct_get,
165 .parse = nftnl_expr_ct_parse,
166 .build = nftnl_expr_ct_build,
167- .snprintf = nftnl_expr_ct_snprintf,
168+ .snprintf_ = nftnl_expr_ct_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800169 };
170diff --git a/src/expr/dup.c b/src/expr/dup.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400171index 2bb35e5..d9bd4b1 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800172--- a/src/expr/dup.c
173+++ b/src/expr/dup.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400174@@ -154,5 +154,5 @@ struct expr_ops expr_ops_dup = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800175 .get = nftnl_expr_dup_get,
176 .parse = nftnl_expr_dup_parse,
177 .build = nftnl_expr_dup_build,
178- .snprintf = nftnl_expr_dup_snprintf,
179+ .snprintf_ = nftnl_expr_dup_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800180 };
181diff --git a/src/expr/dynset.c b/src/expr/dynset.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400182index 68115ba..6e43bb4 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800183--- a/src/expr/dynset.c
184+++ b/src/expr/dynset.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400185@@ -288,5 +288,5 @@ struct expr_ops expr_ops_dynset = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800186 .get = nftnl_expr_dynset_get,
187 .parse = nftnl_expr_dynset_parse,
188 .build = nftnl_expr_dynset_build,
189- .snprintf = nftnl_expr_dynset_snprintf,
190+ .snprintf_ = nftnl_expr_dynset_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800191 };
192diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400193index bef453e..f2696d6 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800194--- a/src/expr/exthdr.c
195+++ b/src/expr/exthdr.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400196@@ -271,5 +271,5 @@ struct expr_ops expr_ops_exthdr = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800197 .get = nftnl_expr_exthdr_get,
198 .parse = nftnl_expr_exthdr_parse,
199 .build = nftnl_expr_exthdr_build,
200- .snprintf = nftnl_expr_exthdr_snprintf,
201+ .snprintf_ = nftnl_expr_exthdr_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800202 };
203diff --git a/src/expr/fib.c b/src/expr/fib.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400204index 9475af4..8e7090d 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800205--- a/src/expr/fib.c
206+++ b/src/expr/fib.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400207@@ -213,5 +213,5 @@ struct expr_ops expr_ops_fib = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800208 .get = nftnl_expr_fib_get,
209 .parse = nftnl_expr_fib_parse,
210 .build = nftnl_expr_fib_build,
211- .snprintf = nftnl_expr_fib_snprintf,
212+ .snprintf_ = nftnl_expr_fib_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800213 };
214diff --git a/src/expr/flow_offload.c b/src/expr/flow_offload.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400215index 6ccec9a..c2f2478 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800216--- a/src/expr/flow_offload.c
217+++ b/src/expr/flow_offload.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400218@@ -134,5 +134,5 @@ struct expr_ops expr_ops_flow = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800219 .get = nftnl_expr_flow_get,
220 .parse = nftnl_expr_flow_parse,
221 .build = nftnl_expr_flow_build,
222- .snprintf = nftnl_expr_flow_snprintf,
223+ .snprintf_ = nftnl_expr_flow_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800224 };
225diff --git a/src/expr/fwd.c b/src/expr/fwd.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400226index cff8235..bcd7d3f 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800227--- a/src/expr/fwd.c
228+++ b/src/expr/fwd.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400229@@ -174,5 +174,5 @@ struct expr_ops expr_ops_fwd = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800230 .get = nftnl_expr_fwd_get,
231 .parse = nftnl_expr_fwd_parse,
232 .build = nftnl_expr_fwd_build,
233- .snprintf = nftnl_expr_fwd_snprintf,
234+ .snprintf_ = nftnl_expr_fwd_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800235 };
236diff --git a/src/expr/hash.c b/src/expr/hash.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400237index 2c801d2..a9f6e7e 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800238--- a/src/expr/hash.c
239+++ b/src/expr/hash.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400240@@ -241,5 +241,5 @@ struct expr_ops expr_ops_hash = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800241 .get = nftnl_expr_hash_get,
242 .parse = nftnl_expr_hash_parse,
243 .build = nftnl_expr_hash_build,
244- .snprintf = nftnl_expr_hash_snprintf,
245+ .snprintf_ = nftnl_expr_hash_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800246 };
247diff --git a/src/expr/immediate.c b/src/expr/immediate.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400248index 47106ae..ea86c88 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800249--- a/src/expr/immediate.c
250+++ b/src/expr/immediate.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400251@@ -235,5 +235,5 @@ struct expr_ops expr_ops_immediate = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800252 .get = nftnl_expr_immediate_get,
253 .parse = nftnl_expr_immediate_parse,
254 .build = nftnl_expr_immediate_build,
255- .snprintf = nftnl_expr_immediate_snprintf,
256+ .snprintf_ = nftnl_expr_immediate_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800257 };
258diff --git a/src/expr/limit.c b/src/expr/limit.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400259index 5872e27..0ce482f 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800260--- a/src/expr/limit.c
261+++ b/src/expr/limit.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400262@@ -216,5 +216,5 @@ struct expr_ops expr_ops_limit = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800263 .get = nftnl_expr_limit_get,
264 .parse = nftnl_expr_limit_parse,
265 .build = nftnl_expr_limit_build,
266- .snprintf = nftnl_expr_limit_snprintf,
267+ .snprintf_ = nftnl_expr_limit_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800268 };
269diff --git a/src/expr/log.c b/src/expr/log.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400270index bbe43d2..5506bc2 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800271--- a/src/expr/log.c
272+++ b/src/expr/log.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400273@@ -267,5 +267,5 @@ struct expr_ops expr_ops_log = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800274 .get = nftnl_expr_log_get,
275 .parse = nftnl_expr_log_parse,
276 .build = nftnl_expr_log_build,
277- .snprintf = nftnl_expr_log_snprintf,
278+ .snprintf_ = nftnl_expr_log_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800279 };
280diff --git a/src/expr/lookup.c b/src/expr/lookup.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400281index a495ac0..678868c 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800282--- a/src/expr/lookup.c
283+++ b/src/expr/lookup.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400284@@ -221,5 +221,5 @@ struct expr_ops expr_ops_lookup = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800285 .get = nftnl_expr_lookup_get,
286 .parse = nftnl_expr_lookup_parse,
287 .build = nftnl_expr_lookup_build,
288- .snprintf = nftnl_expr_lookup_snprintf,
289+ .snprintf_ = nftnl_expr_lookup_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800290 };
291diff --git a/src/expr/masq.c b/src/expr/masq.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400292index f6f3ceb..88292a6 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800293--- a/src/expr/masq.c
294+++ b/src/expr/masq.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400295@@ -169,5 +169,5 @@ struct expr_ops expr_ops_masq = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800296 .get = nftnl_expr_masq_get,
297 .parse = nftnl_expr_masq_parse,
298 .build = nftnl_expr_masq_build,
299- .snprintf = nftnl_expr_masq_snprintf,
300+ .snprintf_ = nftnl_expr_masq_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800301 };
302diff --git a/src/expr/match.c b/src/expr/match.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400303index 4fa74b2..249c6b5 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800304--- a/src/expr/match.c
305+++ b/src/expr/match.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400306@@ -198,5 +198,5 @@ struct expr_ops expr_ops_match = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800307 .get = nftnl_expr_match_get,
308 .parse = nftnl_expr_match_parse,
309 .build = nftnl_expr_match_build,
310- .snprintf = nftnl_expr_match_snprintf,
311+ .snprintf_ = nftnl_expr_match_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800312 };
313diff --git a/src/expr/meta.c b/src/expr/meta.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400314index ffcc896..5eaeb68 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800315--- a/src/expr/meta.c
316+++ b/src/expr/meta.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400317@@ -222,5 +222,5 @@ struct expr_ops expr_ops_meta = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800318 .get = nftnl_expr_meta_get,
319 .parse = nftnl_expr_meta_parse,
320 .build = nftnl_expr_meta_build,
321- .snprintf = nftnl_expr_meta_snprintf,
322+ .snprintf_ = nftnl_expr_meta_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800323 };
324diff --git a/src/expr/nat.c b/src/expr/nat.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400325index 6b7d50e..be4a579 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800326--- a/src/expr/nat.c
327+++ b/src/expr/nat.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400328@@ -279,5 +279,5 @@ struct expr_ops expr_ops_nat = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800329 .get = nftnl_expr_nat_get,
330 .parse = nftnl_expr_nat_parse,
331 .build = nftnl_expr_nat_build,
332- .snprintf = nftnl_expr_nat_snprintf,
333+ .snprintf_ = nftnl_expr_nat_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800334 };
335diff --git a/src/expr/numgen.c b/src/expr/numgen.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400336index 4e0d541..5995ee3 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800337--- a/src/expr/numgen.c
338+++ b/src/expr/numgen.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400339@@ -195,5 +195,5 @@ struct expr_ops expr_ops_ng = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800340 .get = nftnl_expr_ng_get,
341 .parse = nftnl_expr_ng_parse,
342 .build = nftnl_expr_ng_build,
343- .snprintf = nftnl_expr_ng_snprintf,
344+ .snprintf_ = nftnl_expr_ng_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800345 };
346diff --git a/src/expr/objref.c b/src/expr/objref.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400347index 7388b18..e673ffd 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800348--- a/src/expr/objref.c
349+++ b/src/expr/objref.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400350@@ -210,5 +210,5 @@ struct expr_ops expr_ops_objref = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800351 .get = nftnl_expr_objref_get,
352 .parse = nftnl_expr_objref_parse,
353 .build = nftnl_expr_objref_build,
354- .snprintf = nftnl_expr_objref_snprintf,
355+ .snprintf_ = nftnl_expr_objref_snprintf,
Brad Bishop26bdd442019-08-16 17:08:17 -0400356 };
357diff --git a/src/expr/osf.c b/src/expr/osf.c
358index 98d0df9..618b46e 100644
359--- a/src/expr/osf.c
360+++ b/src/expr/osf.c
361@@ -161,5 +161,5 @@ struct expr_ops expr_ops_osf = {
362 .get = nftnl_expr_osf_get,
363 .parse = nftnl_expr_osf_parse,
364 .build = nftnl_expr_osf_build,
365- .snprintf = nftnl_expr_osf_snprintf,
366+ .snprintf_ = nftnl_expr_osf_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800367 };
368diff --git a/src/expr/payload.c b/src/expr/payload.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400369index 2192dad..37aacc4 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800370--- a/src/expr/payload.c
371+++ b/src/expr/payload.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400372@@ -266,5 +266,5 @@ struct expr_ops expr_ops_payload = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800373 .get = nftnl_expr_payload_get,
374 .parse = nftnl_expr_payload_parse,
375 .build = nftnl_expr_payload_build,
376- .snprintf = nftnl_expr_payload_snprintf,
377+ .snprintf_ = nftnl_expr_payload_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800378 };
379diff --git a/src/expr/queue.c b/src/expr/queue.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400380index 051ef71..b06feff 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800381--- a/src/expr/queue.c
382+++ b/src/expr/queue.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400383@@ -207,5 +207,5 @@ struct expr_ops expr_ops_queue = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800384 .get = nftnl_expr_queue_get,
385 .parse = nftnl_expr_queue_parse,
386 .build = nftnl_expr_queue_build,
387- .snprintf = nftnl_expr_queue_snprintf,
388+ .snprintf_ = nftnl_expr_queue_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800389 };
390diff --git a/src/expr/quota.c b/src/expr/quota.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400391index 39a92e6..41797be 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800392--- a/src/expr/quota.c
393+++ b/src/expr/quota.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400394@@ -161,5 +161,5 @@ struct expr_ops expr_ops_quota = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800395 .get = nftnl_expr_quota_get,
396 .parse = nftnl_expr_quota_parse,
397 .build = nftnl_expr_quota_build,
398- .snprintf = nftnl_expr_quota_snprintf,
399+ .snprintf_ = nftnl_expr_quota_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800400 };
401diff --git a/src/expr/range.c b/src/expr/range.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400402index d1d5083..b619cdf 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800403--- a/src/expr/range.c
404+++ b/src/expr/range.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400405@@ -227,5 +227,5 @@ struct expr_ops expr_ops_range = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800406 .get = nftnl_expr_range_get,
407 .parse = nftnl_expr_range_parse,
408 .build = nftnl_expr_range_build,
409- .snprintf = nftnl_expr_range_snprintf,
410+ .snprintf_ = nftnl_expr_range_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800411 };
412diff --git a/src/expr/redir.c b/src/expr/redir.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400413index 477659a..5c4ebeb 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800414--- a/src/expr/redir.c
415+++ b/src/expr/redir.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400416@@ -181,5 +181,5 @@ struct expr_ops expr_ops_redir = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800417 .get = nftnl_expr_redir_get,
418 .parse = nftnl_expr_redir_parse,
419 .build = nftnl_expr_redir_build,
420- .snprintf = nftnl_expr_redir_snprintf,
421+ .snprintf_ = nftnl_expr_redir_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800422 };
423diff --git a/src/expr/reject.c b/src/expr/reject.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400424index 141942e..a98990d 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800425--- a/src/expr/reject.c
426+++ b/src/expr/reject.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400427@@ -148,5 +148,5 @@ struct expr_ops expr_ops_reject = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800428 .get = nftnl_expr_reject_get,
429 .parse = nftnl_expr_reject_parse,
430 .build = nftnl_expr_reject_build,
431- .snprintf = nftnl_expr_reject_snprintf,
432+ .snprintf_ = nftnl_expr_reject_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800433 };
434diff --git a/src/expr/rt.c b/src/expr/rt.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400435index 0fce72d..32ace19 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800436--- a/src/expr/rt.c
437+++ b/src/expr/rt.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400438@@ -177,5 +177,5 @@ struct expr_ops expr_ops_rt = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800439 .get = nftnl_expr_rt_get,
440 .parse = nftnl_expr_rt_parse,
441 .build = nftnl_expr_rt_build,
442- .snprintf = nftnl_expr_rt_snprintf,
443+ .snprintf_ = nftnl_expr_rt_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800444 };
445diff --git a/src/expr/socket.c b/src/expr/socket.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400446index 96550d5..2394dbf 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800447--- a/src/expr/socket.c
448+++ b/src/expr/socket.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400449@@ -174,5 +174,5 @@ struct expr_ops expr_ops_socket = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800450 .get = nftnl_expr_socket_get,
451 .parse = nftnl_expr_socket_parse,
452 .build = nftnl_expr_socket_build,
453- .snprintf = nftnl_expr_socket_snprintf,
454+ .snprintf_ = nftnl_expr_socket_snprintf,
455 };
456diff --git a/src/expr/target.c b/src/expr/target.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400457index 9100038..7180085 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800458--- a/src/expr/target.c
459+++ b/src/expr/target.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400460@@ -198,5 +198,5 @@ struct expr_ops expr_ops_target = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800461 .get = nftnl_expr_target_get,
462 .parse = nftnl_expr_target_parse,
463 .build = nftnl_expr_target_build,
464- .snprintf = nftnl_expr_target_snprintf,
465+ .snprintf_ = nftnl_expr_target_snprintf,
Brad Bishop26bdd442019-08-16 17:08:17 -0400466 };
467diff --git a/src/expr/tproxy.c b/src/expr/tproxy.c
468index 3827b75..feabbbe 100644
469--- a/src/expr/tproxy.c
470+++ b/src/expr/tproxy.c
471@@ -183,5 +183,5 @@ struct expr_ops expr_ops_tproxy = {
472 .get = nftnl_expr_tproxy_get,
473 .parse = nftnl_expr_tproxy_parse,
474 .build = nftnl_expr_tproxy_build,
475- .snprintf = nftnl_expr_tproxy_snprintf,
476+ .snprintf_ = nftnl_expr_tproxy_snprintf,
477 };
478diff --git a/src/expr/tunnel.c b/src/expr/tunnel.c
479index b2b8d72..1ed46d3 100644
480--- a/src/expr/tunnel.c
481+++ b/src/expr/tunnel.c
482@@ -173,5 +173,5 @@ struct expr_ops expr_ops_tunnel = {
483 .get = nftnl_expr_tunnel_get,
484 .parse = nftnl_expr_tunnel_parse,
485 .build = nftnl_expr_tunnel_build,
486- .snprintf = nftnl_expr_tunnel_snprintf,
487+ .snprintf_ = nftnl_expr_tunnel_snprintf,
488 };
489diff --git a/src/expr/xfrm.c b/src/expr/xfrm.c
490index 8fe5438..b6b2772 100644
491--- a/src/expr/xfrm.c
492+++ b/src/expr/xfrm.c
493@@ -239,5 +239,5 @@ struct expr_ops expr_ops_xfrm = {
494 .get = nftnl_expr_xfrm_get,
495 .parse = nftnl_expr_xfrm_parse,
496 .build = nftnl_expr_xfrm_build,
497- .snprintf = nftnl_expr_xfrm_snprintf,
498+ .snprintf_ = nftnl_expr_xfrm_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800499 };
500diff --git a/src/obj/counter.c b/src/obj/counter.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400501index 1baba4e..3710bce 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800502--- a/src/obj/counter.c
503+++ b/src/obj/counter.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400504@@ -145,5 +145,5 @@ struct obj_ops obj_ops_counter = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800505 .get = nftnl_obj_counter_get,
506 .parse = nftnl_obj_counter_parse,
507 .build = nftnl_obj_counter_build,
508- .snprintf = nftnl_obj_counter_snprintf,
509+ .snprintf_ = nftnl_obj_counter_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800510 };
511diff --git a/src/obj/ct_helper.c b/src/obj/ct_helper.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400512index d91f636..2037461 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800513--- a/src/obj/ct_helper.c
514+++ b/src/obj/ct_helper.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400515@@ -166,5 +166,5 @@ struct obj_ops obj_ops_ct_helper = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800516 .get = nftnl_obj_ct_helper_get,
517 .parse = nftnl_obj_ct_helper_parse,
518 .build = nftnl_obj_ct_helper_build,
519- .snprintf = nftnl_obj_ct_helper_snprintf,
520+ .snprintf_ = nftnl_obj_ct_helper_snprintf,
Brad Bishop26bdd442019-08-16 17:08:17 -0400521 };
522diff --git a/src/obj/ct_timeout.c b/src/obj/ct_timeout.c
523index e2e9991..a4f2dd2 100644
524--- a/src/obj/ct_timeout.c
525+++ b/src/obj/ct_timeout.c
526@@ -330,5 +330,5 @@ struct obj_ops obj_ops_ct_timeout = {
527 .get = nftnl_obj_ct_timeout_get,
528 .parse = nftnl_obj_ct_timeout_parse,
529 .build = nftnl_obj_ct_timeout_build,
530- .snprintf = nftnl_obj_ct_timeout_snprintf,
531+ .snprintf_ = nftnl_obj_ct_timeout_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800532 };
533diff --git a/src/obj/limit.c b/src/obj/limit.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400534index 60b0159..538f37a 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800535--- a/src/obj/limit.c
536+++ b/src/obj/limit.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400537@@ -185,5 +185,5 @@ struct obj_ops obj_ops_limit = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800538 .get = nftnl_obj_limit_get,
539 .parse = nftnl_obj_limit_parse,
540 .build = nftnl_obj_limit_build,
541- .snprintf = nftnl_obj_limit_snprintf,
542+ .snprintf_ = nftnl_obj_limit_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800543 };
544diff --git a/src/obj/quota.c b/src/obj/quota.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400545index 1914037..585a088 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800546--- a/src/obj/quota.c
547+++ b/src/obj/quota.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400548@@ -161,5 +161,5 @@ struct obj_ops obj_ops_quota = {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800549 .get = nftnl_obj_quota_get,
550 .parse = nftnl_obj_quota_parse,
551 .build = nftnl_obj_quota_build,
552- .snprintf = nftnl_obj_quota_snprintf,
553+ .snprintf_ = nftnl_obj_quota_snprintf,
Brad Bishop26bdd442019-08-16 17:08:17 -0400554 };
555diff --git a/src/obj/secmark.c b/src/obj/secmark.c
556index e27b5fa..6241bee 100644
557--- a/src/obj/secmark.c
558+++ b/src/obj/secmark.c
559@@ -133,5 +133,5 @@ struct obj_ops obj_ops_secmark = {
560 .get = nftnl_obj_secmark_get,
561 .parse = nftnl_obj_secmark_parse,
562 .build = nftnl_obj_secmark_build,
563- .snprintf = nftnl_obj_secmark_snprintf,
564+ .snprintf_ = nftnl_obj_secmark_snprintf,
565 };
566diff --git a/src/obj/tunnel.c b/src/obj/tunnel.c
567index 7ffade8..800eb3e 100644
568--- a/src/obj/tunnel.c
569+++ b/src/obj/tunnel.c
570@@ -564,5 +564,5 @@ struct obj_ops obj_ops_tunnel = {
571 .get = nftnl_obj_tunnel_get,
572 .parse = nftnl_obj_tunnel_parse,
573 .build = nftnl_obj_tunnel_build,
574- .snprintf = nftnl_obj_tunnel_snprintf,
575+ .snprintf_ = nftnl_obj_tunnel_snprintf,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800576 };
577diff --git a/src/object.c b/src/object.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400578index 5c8d183..d489cdd 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800579--- a/src/object.c
580+++ b/src/object.c
Brad Bishop26bdd442019-08-16 17:08:17 -0400581@@ -369,7 +369,7 @@ static int nftnl_obj_snprintf_dflt(char *buf, size_t size,
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800582 SNPRINTF_BUFFER_SIZE(ret, remain, offset);
583
584 if (obj->ops) {
585- ret = obj->ops->snprintf(buf + offset, offset, type, flags,
586+ ret = obj->ops->snprintf_(buf + offset, offset, type, flags,
587 obj);
588 SNPRINTF_BUFFER_SIZE(ret, remain, offset);
589 }
Brad Bishop26bdd442019-08-16 17:08:17 -0400590--
5912.17.1
592