Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 1 | From 9e2c810ebc3c917ea7483205178416e9eaf952fe Mon Sep 17 00:00:00 2001 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 2 | From: Alex Kiernan <alex.kiernan@gmail.com> |
| 3 | Date: Wed, 7 Nov 2018 19:41:54 +0000 |
| 4 | Subject: [PATCH] avoid naming local function as one of printf family |
| 5 | |
| 6 | Fixes build issues with clang |
| 7 | error: no member named '__builtin___snprintf_chk' in 'struct expr_ops' |
| 8 | |
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | Signed-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 Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 38 | src/expr/osf.c | 2 +- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 39 | 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 Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 48 | src/expr/tproxy.c | 2 +- |
| 49 | src/expr/tunnel.c | 2 +- |
| 50 | src/expr/xfrm.c | 2 +- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 51 | src/obj/counter.c | 2 +- |
| 52 | src/obj/ct_helper.c | 2 +- |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 53 | src/obj/ct_timeout.c | 2 +- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 54 | src/obj/limit.c | 2 +- |
| 55 | src/obj/quota.c | 2 +- |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 56 | 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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 60 | |
| 61 | diff --git a/include/expr_ops.h b/include/expr_ops.h |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 62 | index a7f1b9a..d2946de 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 63 | --- a/include/expr_ops.h |
| 64 | +++ b/include/expr_ops.h |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 65 | @@ -17,7 +17,7 @@ struct expr_ops { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 66 | 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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 71 | }; |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 72 | |
| 73 | struct expr_ops *nftnl_expr_ops_lookup(const char *name); |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 74 | diff --git a/include/obj.h b/include/obj.h |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 75 | index 35b5c40..decd1ce 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 76 | --- a/include/obj.h |
| 77 | +++ b/include/obj.h |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 78 | @@ -92,7 +92,7 @@ struct obj_ops { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 79 | 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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 84 | }; |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 85 | |
| 86 | extern struct obj_ops obj_ops_counter; |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 87 | diff --git a/src/expr.c b/src/expr.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 88 | index 80c4c36..b698a60 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 89 | --- a/src/expr.c |
| 90 | +++ b/src/expr.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 91 | @@ -275,10 +275,10 @@ int nftnl_expr_snprintf(char *buf, size_t size, const struct nftnl_expr *expr, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 92 | 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; |
| 104 | diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 105 | index c9d40df..27d644b 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 106 | --- a/src/expr/bitwise.c |
| 107 | +++ b/src/expr/bitwise.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 108 | @@ -219,5 +219,5 @@ struct expr_ops expr_ops_bitwise = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 109 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 114 | }; |
| 115 | diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 116 | index efdfa2b..7ae9dfb 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 117 | --- a/src/expr/byteorder.c |
| 118 | +++ b/src/expr/byteorder.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 119 | @@ -234,5 +234,5 @@ struct expr_ops expr_ops_byteorder = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 120 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 125 | }; |
| 126 | diff --git a/src/expr/cmp.c b/src/expr/cmp.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 127 | index 86d7842..e3be442 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 128 | --- a/src/expr/cmp.c |
| 129 | +++ b/src/expr/cmp.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 130 | @@ -216,5 +216,5 @@ struct expr_ops expr_ops_cmp = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 131 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 136 | }; |
| 137 | diff --git a/src/expr/connlimit.c b/src/expr/connlimit.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 138 | index 53af93b..6c8bc40 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 139 | --- a/src/expr/connlimit.c |
| 140 | +++ b/src/expr/connlimit.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 141 | @@ -149,5 +149,5 @@ struct expr_ops expr_ops_connlimit = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 142 | .get = nftnl_expr_connlimit_get, |
| 143 | .parse = nftnl_expr_connlimit_parse, |
| 144 | .build = nftnl_expr_connlimit_build, |
| 145 | - .snprintf = nftnl_expr_connlimit_snprintf, |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 146 | + .snprintf_ = nftnl_expr_connlimit_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 147 | }; |
| 148 | diff --git a/src/expr/counter.c b/src/expr/counter.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 149 | index 89a602e..a32a69e 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 150 | --- a/src/expr/counter.c |
| 151 | +++ b/src/expr/counter.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 152 | @@ -147,5 +147,5 @@ struct expr_ops expr_ops_counter = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 153 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 158 | }; |
| 159 | diff --git a/src/expr/ct.c b/src/expr/ct.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 160 | index b9ca2dc..6fbed1d 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 161 | --- a/src/expr/ct.c |
| 162 | +++ b/src/expr/ct.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 163 | @@ -272,5 +272,5 @@ struct expr_ops expr_ops_ct = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 164 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 169 | }; |
| 170 | diff --git a/src/expr/dup.c b/src/expr/dup.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 171 | index 2bb35e5..d9bd4b1 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 172 | --- a/src/expr/dup.c |
| 173 | +++ b/src/expr/dup.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 174 | @@ -154,5 +154,5 @@ struct expr_ops expr_ops_dup = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 175 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 180 | }; |
| 181 | diff --git a/src/expr/dynset.c b/src/expr/dynset.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 182 | index 68115ba..6e43bb4 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 183 | --- a/src/expr/dynset.c |
| 184 | +++ b/src/expr/dynset.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 185 | @@ -288,5 +288,5 @@ struct expr_ops expr_ops_dynset = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 186 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 191 | }; |
| 192 | diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 193 | index bef453e..f2696d6 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 194 | --- a/src/expr/exthdr.c |
| 195 | +++ b/src/expr/exthdr.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 196 | @@ -271,5 +271,5 @@ struct expr_ops expr_ops_exthdr = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 197 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 202 | }; |
| 203 | diff --git a/src/expr/fib.c b/src/expr/fib.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 204 | index 9475af4..8e7090d 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 205 | --- a/src/expr/fib.c |
| 206 | +++ b/src/expr/fib.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 207 | @@ -213,5 +213,5 @@ struct expr_ops expr_ops_fib = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 208 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 213 | }; |
| 214 | diff --git a/src/expr/flow_offload.c b/src/expr/flow_offload.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 215 | index 6ccec9a..c2f2478 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 216 | --- a/src/expr/flow_offload.c |
| 217 | +++ b/src/expr/flow_offload.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 218 | @@ -134,5 +134,5 @@ struct expr_ops expr_ops_flow = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 219 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 224 | }; |
| 225 | diff --git a/src/expr/fwd.c b/src/expr/fwd.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 226 | index cff8235..bcd7d3f 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 227 | --- a/src/expr/fwd.c |
| 228 | +++ b/src/expr/fwd.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 229 | @@ -174,5 +174,5 @@ struct expr_ops expr_ops_fwd = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 230 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 235 | }; |
| 236 | diff --git a/src/expr/hash.c b/src/expr/hash.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 237 | index 2c801d2..a9f6e7e 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 238 | --- a/src/expr/hash.c |
| 239 | +++ b/src/expr/hash.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 240 | @@ -241,5 +241,5 @@ struct expr_ops expr_ops_hash = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 241 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 246 | }; |
| 247 | diff --git a/src/expr/immediate.c b/src/expr/immediate.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 248 | index 47106ae..ea86c88 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 249 | --- a/src/expr/immediate.c |
| 250 | +++ b/src/expr/immediate.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 251 | @@ -235,5 +235,5 @@ struct expr_ops expr_ops_immediate = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 252 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 257 | }; |
| 258 | diff --git a/src/expr/limit.c b/src/expr/limit.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 259 | index 5872e27..0ce482f 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 260 | --- a/src/expr/limit.c |
| 261 | +++ b/src/expr/limit.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 262 | @@ -216,5 +216,5 @@ struct expr_ops expr_ops_limit = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 263 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 268 | }; |
| 269 | diff --git a/src/expr/log.c b/src/expr/log.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 270 | index bbe43d2..5506bc2 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 271 | --- a/src/expr/log.c |
| 272 | +++ b/src/expr/log.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 273 | @@ -267,5 +267,5 @@ struct expr_ops expr_ops_log = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 274 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 279 | }; |
| 280 | diff --git a/src/expr/lookup.c b/src/expr/lookup.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 281 | index a495ac0..678868c 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 282 | --- a/src/expr/lookup.c |
| 283 | +++ b/src/expr/lookup.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 284 | @@ -221,5 +221,5 @@ struct expr_ops expr_ops_lookup = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 285 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 290 | }; |
| 291 | diff --git a/src/expr/masq.c b/src/expr/masq.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 292 | index f6f3ceb..88292a6 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 293 | --- a/src/expr/masq.c |
| 294 | +++ b/src/expr/masq.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 295 | @@ -169,5 +169,5 @@ struct expr_ops expr_ops_masq = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 296 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 301 | }; |
| 302 | diff --git a/src/expr/match.c b/src/expr/match.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 303 | index 4fa74b2..249c6b5 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 304 | --- a/src/expr/match.c |
| 305 | +++ b/src/expr/match.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 306 | @@ -198,5 +198,5 @@ struct expr_ops expr_ops_match = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 307 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 312 | }; |
| 313 | diff --git a/src/expr/meta.c b/src/expr/meta.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 314 | index ffcc896..5eaeb68 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 315 | --- a/src/expr/meta.c |
| 316 | +++ b/src/expr/meta.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 317 | @@ -222,5 +222,5 @@ struct expr_ops expr_ops_meta = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 318 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 323 | }; |
| 324 | diff --git a/src/expr/nat.c b/src/expr/nat.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 325 | index 6b7d50e..be4a579 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 326 | --- a/src/expr/nat.c |
| 327 | +++ b/src/expr/nat.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 328 | @@ -279,5 +279,5 @@ struct expr_ops expr_ops_nat = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 329 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 334 | }; |
| 335 | diff --git a/src/expr/numgen.c b/src/expr/numgen.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 336 | index 4e0d541..5995ee3 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 337 | --- a/src/expr/numgen.c |
| 338 | +++ b/src/expr/numgen.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 339 | @@ -195,5 +195,5 @@ struct expr_ops expr_ops_ng = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 340 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 345 | }; |
| 346 | diff --git a/src/expr/objref.c b/src/expr/objref.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 347 | index 7388b18..e673ffd 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 348 | --- a/src/expr/objref.c |
| 349 | +++ b/src/expr/objref.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 350 | @@ -210,5 +210,5 @@ struct expr_ops expr_ops_objref = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 351 | .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 Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 356 | }; |
| 357 | diff --git a/src/expr/osf.c b/src/expr/osf.c |
| 358 | index 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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 367 | }; |
| 368 | diff --git a/src/expr/payload.c b/src/expr/payload.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 369 | index 2192dad..37aacc4 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 370 | --- a/src/expr/payload.c |
| 371 | +++ b/src/expr/payload.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 372 | @@ -266,5 +266,5 @@ struct expr_ops expr_ops_payload = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 373 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 378 | }; |
| 379 | diff --git a/src/expr/queue.c b/src/expr/queue.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 380 | index 051ef71..b06feff 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 381 | --- a/src/expr/queue.c |
| 382 | +++ b/src/expr/queue.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 383 | @@ -207,5 +207,5 @@ struct expr_ops expr_ops_queue = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 384 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 389 | }; |
| 390 | diff --git a/src/expr/quota.c b/src/expr/quota.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 391 | index 39a92e6..41797be 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 392 | --- a/src/expr/quota.c |
| 393 | +++ b/src/expr/quota.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 394 | @@ -161,5 +161,5 @@ struct expr_ops expr_ops_quota = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 395 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 400 | }; |
| 401 | diff --git a/src/expr/range.c b/src/expr/range.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 402 | index d1d5083..b619cdf 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 403 | --- a/src/expr/range.c |
| 404 | +++ b/src/expr/range.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 405 | @@ -227,5 +227,5 @@ struct expr_ops expr_ops_range = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 406 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 411 | }; |
| 412 | diff --git a/src/expr/redir.c b/src/expr/redir.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 413 | index 477659a..5c4ebeb 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 414 | --- a/src/expr/redir.c |
| 415 | +++ b/src/expr/redir.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 416 | @@ -181,5 +181,5 @@ struct expr_ops expr_ops_redir = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 417 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 422 | }; |
| 423 | diff --git a/src/expr/reject.c b/src/expr/reject.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 424 | index 141942e..a98990d 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 425 | --- a/src/expr/reject.c |
| 426 | +++ b/src/expr/reject.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 427 | @@ -148,5 +148,5 @@ struct expr_ops expr_ops_reject = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 428 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 433 | }; |
| 434 | diff --git a/src/expr/rt.c b/src/expr/rt.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 435 | index 0fce72d..32ace19 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 436 | --- a/src/expr/rt.c |
| 437 | +++ b/src/expr/rt.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 438 | @@ -177,5 +177,5 @@ struct expr_ops expr_ops_rt = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 439 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 444 | }; |
| 445 | diff --git a/src/expr/socket.c b/src/expr/socket.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 446 | index 96550d5..2394dbf 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 447 | --- a/src/expr/socket.c |
| 448 | +++ b/src/expr/socket.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 449 | @@ -174,5 +174,5 @@ struct expr_ops expr_ops_socket = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 450 | .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 | }; |
| 456 | diff --git a/src/expr/target.c b/src/expr/target.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 457 | index 9100038..7180085 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 458 | --- a/src/expr/target.c |
| 459 | +++ b/src/expr/target.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 460 | @@ -198,5 +198,5 @@ struct expr_ops expr_ops_target = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 461 | .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 Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 466 | }; |
| 467 | diff --git a/src/expr/tproxy.c b/src/expr/tproxy.c |
| 468 | index 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 | }; |
| 478 | diff --git a/src/expr/tunnel.c b/src/expr/tunnel.c |
| 479 | index 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 | }; |
| 489 | diff --git a/src/expr/xfrm.c b/src/expr/xfrm.c |
| 490 | index 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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 499 | }; |
| 500 | diff --git a/src/obj/counter.c b/src/obj/counter.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 501 | index 1baba4e..3710bce 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 502 | --- a/src/obj/counter.c |
| 503 | +++ b/src/obj/counter.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 504 | @@ -145,5 +145,5 @@ struct obj_ops obj_ops_counter = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 505 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 510 | }; |
| 511 | diff --git a/src/obj/ct_helper.c b/src/obj/ct_helper.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 512 | index d91f636..2037461 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 513 | --- a/src/obj/ct_helper.c |
| 514 | +++ b/src/obj/ct_helper.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 515 | @@ -166,5 +166,5 @@ struct obj_ops obj_ops_ct_helper = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 516 | .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 Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 521 | }; |
| 522 | diff --git a/src/obj/ct_timeout.c b/src/obj/ct_timeout.c |
| 523 | index 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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 532 | }; |
| 533 | diff --git a/src/obj/limit.c b/src/obj/limit.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 534 | index 60b0159..538f37a 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 535 | --- a/src/obj/limit.c |
| 536 | +++ b/src/obj/limit.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 537 | @@ -185,5 +185,5 @@ struct obj_ops obj_ops_limit = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 538 | .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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 543 | }; |
| 544 | diff --git a/src/obj/quota.c b/src/obj/quota.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 545 | index 1914037..585a088 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 546 | --- a/src/obj/quota.c |
| 547 | +++ b/src/obj/quota.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 548 | @@ -161,5 +161,5 @@ struct obj_ops obj_ops_quota = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 549 | .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 Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 554 | }; |
| 555 | diff --git a/src/obj/secmark.c b/src/obj/secmark.c |
| 556 | index 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 | }; |
| 566 | diff --git a/src/obj/tunnel.c b/src/obj/tunnel.c |
| 567 | index 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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 576 | }; |
| 577 | diff --git a/src/object.c b/src/object.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 578 | index 5c8d183..d489cdd 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 579 | --- a/src/object.c |
| 580 | +++ b/src/object.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 581 | @@ -369,7 +369,7 @@ static int nftnl_obj_snprintf_dflt(char *buf, size_t size, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 582 | 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 Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 590 | -- |
| 591 | 2.17.1 |
| 592 | |