Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 5ea9fa9d345005f2f53b1b598edb85f5f24ca9da Mon Sep 17 00:00:00 2001 |
| 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 +- |
| 38 | src/expr/payload.c | 2 +- |
| 39 | src/expr/queue.c | 2 +- |
| 40 | src/expr/quota.c | 2 +- |
| 41 | src/expr/range.c | 2 +- |
| 42 | src/expr/redir.c | 2 +- |
| 43 | src/expr/reject.c | 2 +- |
| 44 | src/expr/rt.c | 2 +- |
| 45 | src/expr/socket.c | 2 +- |
| 46 | src/expr/target.c | 2 +- |
| 47 | src/obj/counter.c | 2 +- |
| 48 | src/obj/ct_helper.c | 2 +- |
| 49 | src/obj/limit.c | 2 +- |
| 50 | src/obj/quota.c | 2 +- |
| 51 | src/object.c | 4 ++-- |
| 52 | 40 files changed, 42 insertions(+), 42 deletions(-) |
| 53 | |
| 54 | diff --git a/include/expr_ops.h b/include/expr_ops.h |
| 55 | index e639390..c4fe050 100644 |
| 56 | --- a/include/expr_ops.h |
| 57 | +++ b/include/expr_ops.h |
| 58 | @@ -18,7 +18,7 @@ struct expr_ops { |
| 59 | const void *(*get)(const struct nftnl_expr *e, uint16_t type, uint32_t *data_len); |
| 60 | int (*parse)(struct nftnl_expr *e, struct nlattr *attr); |
| 61 | void (*build)(struct nlmsghdr *nlh, const struct nftnl_expr *e); |
| 62 | - int (*snprintf)(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_expr *e); |
| 63 | + int (*snprintf_)(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_expr *e); |
| 64 | int (*json_parse)(struct nftnl_expr *e, json_t *data, |
| 65 | struct nftnl_parse_err *err); |
| 66 | }; |
| 67 | diff --git a/include/obj.h b/include/obj.h |
| 68 | index 4a728c8..4c20bd1 100644 |
| 69 | --- a/include/obj.h |
| 70 | +++ b/include/obj.h |
| 71 | @@ -55,7 +55,7 @@ struct obj_ops { |
| 72 | const void *(*get)(const struct nftnl_obj *e, uint16_t type, uint32_t *data_len); |
| 73 | int (*parse)(struct nftnl_obj *e, struct nlattr *attr); |
| 74 | void (*build)(struct nlmsghdr *nlh, const struct nftnl_obj *e); |
| 75 | - int (*snprintf)(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_obj *e); |
| 76 | + int (*snprintf_)(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_obj *e); |
| 77 | int (*json_parse)(struct nftnl_obj *e, json_t *data, |
| 78 | struct nftnl_parse_err *err); |
| 79 | }; |
| 80 | diff --git a/src/expr.c b/src/expr.c |
| 81 | index 62565e0..2489c30 100644 |
| 82 | --- a/src/expr.c |
| 83 | +++ b/src/expr.c |
| 84 | @@ -285,10 +285,10 @@ int nftnl_expr_snprintf(char *buf, size_t size, const struct nftnl_expr *expr, |
| 85 | if (size) |
| 86 | buf[0] = '\0'; |
| 87 | |
| 88 | - if (!expr->ops->snprintf) |
| 89 | + if (!expr->ops->snprintf_) |
| 90 | return 0; |
| 91 | |
| 92 | - ret = expr->ops->snprintf(buf + offset, remain, type, flags, expr); |
| 93 | + ret = expr->ops->snprintf_(buf + offset, remain, type, flags, expr); |
| 94 | SNPRINTF_BUFFER_SIZE(ret, remain, offset); |
| 95 | |
| 96 | return offset; |
| 97 | diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c |
| 98 | index a89734b..f8360b1 100644 |
| 99 | --- a/src/expr/bitwise.c |
| 100 | +++ b/src/expr/bitwise.c |
| 101 | @@ -299,6 +299,6 @@ struct expr_ops expr_ops_bitwise = { |
| 102 | .get = nftnl_expr_bitwise_get, |
| 103 | .parse = nftnl_expr_bitwise_parse, |
| 104 | .build = nftnl_expr_bitwise_build, |
| 105 | - .snprintf = nftnl_expr_bitwise_snprintf, |
| 106 | + .snprintf_ = nftnl_expr_bitwise_snprintf, |
| 107 | .json_parse = nftnl_expr_bitwise_json_parse, |
| 108 | }; |
| 109 | diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c |
| 110 | index 47c04cf..61f733f 100644 |
| 111 | --- a/src/expr/byteorder.c |
| 112 | +++ b/src/expr/byteorder.c |
| 113 | @@ -314,6 +314,6 @@ struct expr_ops expr_ops_byteorder = { |
| 114 | .get = nftnl_expr_byteorder_get, |
| 115 | .parse = nftnl_expr_byteorder_parse, |
| 116 | .build = nftnl_expr_byteorder_build, |
| 117 | - .snprintf = nftnl_expr_byteorder_snprintf, |
| 118 | + .snprintf_ = nftnl_expr_byteorder_snprintf, |
| 119 | .json_parse = nftnl_expr_byteorder_json_parse, |
| 120 | }; |
| 121 | diff --git a/src/expr/cmp.c b/src/expr/cmp.c |
| 122 | index b26d0eb..522c7be 100644 |
| 123 | --- a/src/expr/cmp.c |
| 124 | +++ b/src/expr/cmp.c |
| 125 | @@ -284,6 +284,6 @@ struct expr_ops expr_ops_cmp = { |
| 126 | .get = nftnl_expr_cmp_get, |
| 127 | .parse = nftnl_expr_cmp_parse, |
| 128 | .build = nftnl_expr_cmp_build, |
| 129 | - .snprintf = nftnl_expr_cmp_snprintf, |
| 130 | + .snprintf_ = nftnl_expr_cmp_snprintf, |
| 131 | .json_parse = nftnl_expr_cmp_json_parse, |
| 132 | }; |
| 133 | diff --git a/src/expr/connlimit.c b/src/expr/connlimit.c |
| 134 | index 60965b5..4e41866 100644 |
| 135 | --- a/src/expr/connlimit.c |
| 136 | +++ b/src/expr/connlimit.c |
| 137 | @@ -202,6 +202,6 @@ struct expr_ops expr_ops_connlimit = { |
| 138 | .get = nftnl_expr_connlimit_get, |
| 139 | .parse = nftnl_expr_connlimit_parse, |
| 140 | .build = nftnl_expr_connlimit_build, |
| 141 | - .snprintf = nftnl_expr_connlimit_snprintf, |
| 142 | + .snprintf_ = nftnl_expr_connlimit_snprintf, |
| 143 | .json_parse = nftnl_expr_connlimit_json_parse, |
| 144 | }; |
| 145 | diff --git a/src/expr/counter.c b/src/expr/counter.c |
| 146 | index 21901e8..9fd7655 100644 |
| 147 | --- a/src/expr/counter.c |
| 148 | +++ b/src/expr/counter.c |
| 149 | @@ -200,6 +200,6 @@ struct expr_ops expr_ops_counter = { |
| 150 | .get = nftnl_expr_counter_get, |
| 151 | .parse = nftnl_expr_counter_parse, |
| 152 | .build = nftnl_expr_counter_build, |
| 153 | - .snprintf = nftnl_expr_counter_snprintf, |
| 154 | + .snprintf_ = nftnl_expr_counter_snprintf, |
| 155 | .json_parse = nftnl_expr_counter_json_parse, |
| 156 | }; |
| 157 | diff --git a/src/expr/ct.c b/src/expr/ct.c |
| 158 | index 39e9be6..b363f7c 100644 |
| 159 | --- a/src/expr/ct.c |
| 160 | +++ b/src/expr/ct.c |
| 161 | @@ -357,6 +357,6 @@ struct expr_ops expr_ops_ct = { |
| 162 | .get = nftnl_expr_ct_get, |
| 163 | .parse = nftnl_expr_ct_parse, |
| 164 | .build = nftnl_expr_ct_build, |
| 165 | - .snprintf = nftnl_expr_ct_snprintf, |
| 166 | + .snprintf_ = nftnl_expr_ct_snprintf, |
| 167 | .json_parse = nftnl_expr_ct_json_parse, |
| 168 | }; |
| 169 | diff --git a/src/expr/dup.c b/src/expr/dup.c |
| 170 | index ed8e620..8d603e3 100644 |
| 171 | --- a/src/expr/dup.c |
| 172 | +++ b/src/expr/dup.c |
| 173 | @@ -206,6 +206,6 @@ struct expr_ops expr_ops_dup = { |
| 174 | .get = nftnl_expr_dup_get, |
| 175 | .parse = nftnl_expr_dup_parse, |
| 176 | .build = nftnl_expr_dup_build, |
| 177 | - .snprintf = nftnl_expr_dup_snprintf, |
| 178 | + .snprintf_ = nftnl_expr_dup_snprintf, |
| 179 | .json_parse = nftnl_expr_dup_json_parse, |
| 180 | }; |
| 181 | diff --git a/src/expr/dynset.c b/src/expr/dynset.c |
| 182 | index 160d0e1..a43f4da 100644 |
| 183 | --- a/src/expr/dynset.c |
| 184 | +++ b/src/expr/dynset.c |
| 185 | @@ -368,6 +368,6 @@ struct expr_ops expr_ops_dynset = { |
| 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, |
| 191 | .json_parse = nftnl_expr_dynset_json_parse, |
| 192 | }; |
| 193 | diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c |
| 194 | index 75cafbc..89ea7f5 100644 |
| 195 | --- a/src/expr/exthdr.c |
| 196 | +++ b/src/expr/exthdr.c |
| 197 | @@ -385,6 +385,6 @@ struct expr_ops expr_ops_exthdr = { |
| 198 | .get = nftnl_expr_exthdr_get, |
| 199 | .parse = nftnl_expr_exthdr_parse, |
| 200 | .build = nftnl_expr_exthdr_build, |
| 201 | - .snprintf = nftnl_expr_exthdr_snprintf, |
| 202 | + .snprintf_ = nftnl_expr_exthdr_snprintf, |
| 203 | .json_parse = nftnl_expr_exthdr_json_parse, |
| 204 | }; |
| 205 | diff --git a/src/expr/fib.c b/src/expr/fib.c |
| 206 | index b922b26..ece4645 100644 |
| 207 | --- a/src/expr/fib.c |
| 208 | +++ b/src/expr/fib.c |
| 209 | @@ -274,6 +274,6 @@ struct expr_ops expr_ops_fib = { |
| 210 | .get = nftnl_expr_fib_get, |
| 211 | .parse = nftnl_expr_fib_parse, |
| 212 | .build = nftnl_expr_fib_build, |
| 213 | - .snprintf = nftnl_expr_fib_snprintf, |
| 214 | + .snprintf_ = nftnl_expr_fib_snprintf, |
| 215 | .json_parse = nftnl_expr_fib_json_parse, |
| 216 | }; |
| 217 | diff --git a/src/expr/flow_offload.c b/src/expr/flow_offload.c |
| 218 | index a2001c9..9cdbc21 100644 |
| 219 | --- a/src/expr/flow_offload.c |
| 220 | +++ b/src/expr/flow_offload.c |
| 221 | @@ -179,6 +179,6 @@ struct expr_ops expr_ops_flow = { |
| 222 | .get = nftnl_expr_flow_get, |
| 223 | .parse = nftnl_expr_flow_parse, |
| 224 | .build = nftnl_expr_flow_build, |
| 225 | - .snprintf = nftnl_expr_flow_snprintf, |
| 226 | + .snprintf_ = nftnl_expr_flow_snprintf, |
| 227 | .json_parse = nftnl_expr_flow_json_parse, |
| 228 | }; |
| 229 | diff --git a/src/expr/fwd.c b/src/expr/fwd.c |
| 230 | index 9021606..7178f43 100644 |
| 231 | --- a/src/expr/fwd.c |
| 232 | +++ b/src/expr/fwd.c |
| 233 | @@ -233,6 +233,6 @@ struct expr_ops expr_ops_fwd = { |
| 234 | .get = nftnl_expr_fwd_get, |
| 235 | .parse = nftnl_expr_fwd_parse, |
| 236 | .build = nftnl_expr_fwd_build, |
| 237 | - .snprintf = nftnl_expr_fwd_snprintf, |
| 238 | + .snprintf_ = nftnl_expr_fwd_snprintf, |
| 239 | .json_parse = nftnl_expr_fwd_json_parse, |
| 240 | }; |
| 241 | diff --git a/src/expr/hash.c b/src/expr/hash.c |
| 242 | index 415537e..186c5b0 100644 |
| 243 | --- a/src/expr/hash.c |
| 244 | +++ b/src/expr/hash.c |
| 245 | @@ -383,6 +383,6 @@ struct expr_ops expr_ops_hash = { |
| 246 | .get = nftnl_expr_hash_get, |
| 247 | .parse = nftnl_expr_hash_parse, |
| 248 | .build = nftnl_expr_hash_build, |
| 249 | - .snprintf = nftnl_expr_hash_snprintf, |
| 250 | + .snprintf_ = nftnl_expr_hash_snprintf, |
| 251 | .json_parse = nftnl_expr_hash_json_parse, |
| 252 | }; |
| 253 | diff --git a/src/expr/immediate.c b/src/expr/immediate.c |
| 254 | index b0570bd..91ccbdc 100644 |
| 255 | --- a/src/expr/immediate.c |
| 256 | +++ b/src/expr/immediate.c |
| 257 | @@ -316,6 +316,6 @@ struct expr_ops expr_ops_immediate = { |
| 258 | .get = nftnl_expr_immediate_get, |
| 259 | .parse = nftnl_expr_immediate_parse, |
| 260 | .build = nftnl_expr_immediate_build, |
| 261 | - .snprintf = nftnl_expr_immediate_snprintf, |
| 262 | + .snprintf_ = nftnl_expr_immediate_snprintf, |
| 263 | .json_parse = nftnl_expr_immediate_json_parse, |
| 264 | }; |
| 265 | diff --git a/src/expr/limit.c b/src/expr/limit.c |
| 266 | index 856ab18..e71fc2f 100644 |
| 267 | --- a/src/expr/limit.c |
| 268 | +++ b/src/expr/limit.c |
| 269 | @@ -285,6 +285,6 @@ struct expr_ops expr_ops_limit = { |
| 270 | .get = nftnl_expr_limit_get, |
| 271 | .parse = nftnl_expr_limit_parse, |
| 272 | .build = nftnl_expr_limit_build, |
| 273 | - .snprintf = nftnl_expr_limit_snprintf, |
| 274 | + .snprintf_ = nftnl_expr_limit_snprintf, |
| 275 | .json_parse = nftnl_expr_limit_json_parse, |
| 276 | }; |
| 277 | diff --git a/src/expr/log.c b/src/expr/log.c |
| 278 | index 86d9651..5769c1c 100644 |
| 279 | --- a/src/expr/log.c |
| 280 | +++ b/src/expr/log.c |
| 281 | @@ -353,6 +353,6 @@ struct expr_ops expr_ops_log = { |
| 282 | .get = nftnl_expr_log_get, |
| 283 | .parse = nftnl_expr_log_parse, |
| 284 | .build = nftnl_expr_log_build, |
| 285 | - .snprintf = nftnl_expr_log_snprintf, |
| 286 | + .snprintf_ = nftnl_expr_log_snprintf, |
| 287 | .json_parse = nftnl_expr_log_json_parse, |
| 288 | }; |
| 289 | diff --git a/src/expr/lookup.c b/src/expr/lookup.c |
| 290 | index 5fcb81f..b2f0dd6 100644 |
| 291 | --- a/src/expr/lookup.c |
| 292 | +++ b/src/expr/lookup.c |
| 293 | @@ -292,6 +292,6 @@ struct expr_ops expr_ops_lookup = { |
| 294 | .get = nftnl_expr_lookup_get, |
| 295 | .parse = nftnl_expr_lookup_parse, |
| 296 | .build = nftnl_expr_lookup_build, |
| 297 | - .snprintf = nftnl_expr_lookup_snprintf, |
| 298 | + .snprintf_ = nftnl_expr_lookup_snprintf, |
| 299 | .json_parse = nftnl_expr_lookup_json_parse, |
| 300 | }; |
| 301 | diff --git a/src/expr/masq.c b/src/expr/masq.c |
| 302 | index 7c235d3..adec325 100644 |
| 303 | --- a/src/expr/masq.c |
| 304 | +++ b/src/expr/masq.c |
| 305 | @@ -228,6 +228,6 @@ struct expr_ops expr_ops_masq = { |
| 306 | .get = nftnl_expr_masq_get, |
| 307 | .parse = nftnl_expr_masq_parse, |
| 308 | .build = nftnl_expr_masq_build, |
| 309 | - .snprintf = nftnl_expr_masq_snprintf, |
| 310 | + .snprintf_ = nftnl_expr_masq_snprintf, |
| 311 | .json_parse = nftnl_expr_masq_json_parse, |
| 312 | }; |
| 313 | diff --git a/src/expr/match.c b/src/expr/match.c |
| 314 | index dd09e1e..f0d8868 100644 |
| 315 | --- a/src/expr/match.c |
| 316 | +++ b/src/expr/match.c |
| 317 | @@ -249,6 +249,6 @@ struct expr_ops expr_ops_match = { |
| 318 | .get = nftnl_expr_match_get, |
| 319 | .parse = nftnl_expr_match_parse, |
| 320 | .build = nftnl_expr_match_build, |
| 321 | - .snprintf = nftnl_expr_match_snprintf, |
| 322 | + .snprintf_ = nftnl_expr_match_snprintf, |
| 323 | .json_parse = nftnl_expr_match_json_parse, |
| 324 | }; |
| 325 | diff --git a/src/expr/meta.c b/src/expr/meta.c |
| 326 | index de82105..91f1ebb 100644 |
| 327 | --- a/src/expr/meta.c |
| 328 | +++ b/src/expr/meta.c |
| 329 | @@ -291,6 +291,6 @@ struct expr_ops expr_ops_meta = { |
| 330 | .get = nftnl_expr_meta_get, |
| 331 | .parse = nftnl_expr_meta_parse, |
| 332 | .build = nftnl_expr_meta_build, |
| 333 | - .snprintf = nftnl_expr_meta_snprintf, |
| 334 | + .snprintf_ = nftnl_expr_meta_snprintf, |
| 335 | .json_parse = nftnl_expr_meta_json_parse, |
| 336 | }; |
| 337 | diff --git a/src/expr/nat.c b/src/expr/nat.c |
| 338 | index 9271303..427c282 100644 |
| 339 | --- a/src/expr/nat.c |
| 340 | +++ b/src/expr/nat.c |
| 341 | @@ -384,6 +384,6 @@ struct expr_ops expr_ops_nat = { |
| 342 | .get = nftnl_expr_nat_get, |
| 343 | .parse = nftnl_expr_nat_parse, |
| 344 | .build = nftnl_expr_nat_build, |
| 345 | - .snprintf = nftnl_expr_nat_snprintf, |
| 346 | + .snprintf_ = nftnl_expr_nat_snprintf, |
| 347 | .json_parse = nftnl_expr_nat_json_parse, |
| 348 | }; |
| 349 | diff --git a/src/expr/numgen.c b/src/expr/numgen.c |
| 350 | index 5336fde..8e0479a 100644 |
| 351 | --- a/src/expr/numgen.c |
| 352 | +++ b/src/expr/numgen.c |
| 353 | @@ -313,6 +313,6 @@ struct expr_ops expr_ops_ng = { |
| 354 | .get = nftnl_expr_ng_get, |
| 355 | .parse = nftnl_expr_ng_parse, |
| 356 | .build = nftnl_expr_ng_build, |
| 357 | - .snprintf = nftnl_expr_ng_snprintf, |
| 358 | + .snprintf_ = nftnl_expr_ng_snprintf, |
| 359 | .json_parse = nftnl_expr_ng_json_parse, |
| 360 | }; |
| 361 | diff --git a/src/expr/objref.c b/src/expr/objref.c |
| 362 | index 64ee863..4504488 100644 |
| 363 | --- a/src/expr/objref.c |
| 364 | +++ b/src/expr/objref.c |
| 365 | @@ -278,6 +278,6 @@ struct expr_ops expr_ops_objref = { |
| 366 | .get = nftnl_expr_objref_get, |
| 367 | .parse = nftnl_expr_objref_parse, |
| 368 | .build = nftnl_expr_objref_build, |
| 369 | - .snprintf = nftnl_expr_objref_snprintf, |
| 370 | + .snprintf_ = nftnl_expr_objref_snprintf, |
| 371 | .json_parse = nftnl_expr_objref_json_parse, |
| 372 | }; |
| 373 | diff --git a/src/expr/payload.c b/src/expr/payload.c |
| 374 | index 91e1587..894ac08 100644 |
| 375 | --- a/src/expr/payload.c |
| 376 | +++ b/src/expr/payload.c |
| 377 | @@ -348,6 +348,6 @@ struct expr_ops expr_ops_payload = { |
| 378 | .get = nftnl_expr_payload_get, |
| 379 | .parse = nftnl_expr_payload_parse, |
| 380 | .build = nftnl_expr_payload_build, |
| 381 | - .snprintf = nftnl_expr_payload_snprintf, |
| 382 | + .snprintf_ = nftnl_expr_payload_snprintf, |
| 383 | .json_parse = nftnl_expr_payload_json_parse, |
| 384 | }; |
| 385 | diff --git a/src/expr/queue.c b/src/expr/queue.c |
| 386 | index a392a27..ee26c10 100644 |
| 387 | --- a/src/expr/queue.c |
| 388 | +++ b/src/expr/queue.c |
| 389 | @@ -275,6 +275,6 @@ struct expr_ops expr_ops_queue = { |
| 390 | .get = nftnl_expr_queue_get, |
| 391 | .parse = nftnl_expr_queue_parse, |
| 392 | .build = nftnl_expr_queue_build, |
| 393 | - .snprintf = nftnl_expr_queue_snprintf, |
| 394 | + .snprintf_ = nftnl_expr_queue_snprintf, |
| 395 | .json_parse = nftnl_expr_queue_json_parse, |
| 396 | }; |
| 397 | diff --git a/src/expr/quota.c b/src/expr/quota.c |
| 398 | index 667e6e1..ff5d182 100644 |
| 399 | --- a/src/expr/quota.c |
| 400 | +++ b/src/expr/quota.c |
| 401 | @@ -203,6 +203,6 @@ struct expr_ops expr_ops_quota = { |
| 402 | .get = nftnl_expr_quota_get, |
| 403 | .parse = nftnl_expr_quota_parse, |
| 404 | .build = nftnl_expr_quota_build, |
| 405 | - .snprintf = nftnl_expr_quota_snprintf, |
| 406 | + .snprintf_ = nftnl_expr_quota_snprintf, |
| 407 | .json_parse = nftnl_expr_quota_json_parse, |
| 408 | }; |
| 409 | diff --git a/src/expr/range.c b/src/expr/range.c |
| 410 | index b2789ff..8910f8a 100644 |
| 411 | --- a/src/expr/range.c |
| 412 | +++ b/src/expr/range.c |
| 413 | @@ -283,6 +283,6 @@ struct expr_ops expr_ops_range = { |
| 414 | .get = nftnl_expr_range_get, |
| 415 | .parse = nftnl_expr_range_parse, |
| 416 | .build = nftnl_expr_range_build, |
| 417 | - .snprintf = nftnl_expr_range_snprintf, |
| 418 | + .snprintf_ = nftnl_expr_range_snprintf, |
| 419 | .json_parse = nftnl_expr_range_json_parse, |
| 420 | }; |
| 421 | diff --git a/src/expr/redir.c b/src/expr/redir.c |
| 422 | index b2aa345..41b77ab 100644 |
| 423 | --- a/src/expr/redir.c |
| 424 | +++ b/src/expr/redir.c |
| 425 | @@ -242,6 +242,6 @@ struct expr_ops expr_ops_redir = { |
| 426 | .get = nftnl_expr_redir_get, |
| 427 | .parse = nftnl_expr_redir_parse, |
| 428 | .build = nftnl_expr_redir_build, |
| 429 | - .snprintf = nftnl_expr_redir_snprintf, |
| 430 | + .snprintf_ = nftnl_expr_redir_snprintf, |
| 431 | .json_parse = nftnl_expr_redir_json_parse, |
| 432 | }; |
| 433 | diff --git a/src/expr/reject.c b/src/expr/reject.c |
| 434 | index 11d8b20..b10e729 100644 |
| 435 | --- a/src/expr/reject.c |
| 436 | +++ b/src/expr/reject.c |
| 437 | @@ -200,6 +200,6 @@ struct expr_ops expr_ops_reject = { |
| 438 | .get = nftnl_expr_reject_get, |
| 439 | .parse = nftnl_expr_reject_parse, |
| 440 | .build = nftnl_expr_reject_build, |
| 441 | - .snprintf = nftnl_expr_reject_snprintf, |
| 442 | + .snprintf_ = nftnl_expr_reject_snprintf, |
| 443 | .json_parse = nftnl_expr_reject_json_parse, |
| 444 | }; |
| 445 | diff --git a/src/expr/rt.c b/src/expr/rt.c |
| 446 | index c3c92c7..688a042 100644 |
| 447 | --- a/src/expr/rt.c |
| 448 | +++ b/src/expr/rt.c |
| 449 | @@ -235,6 +235,6 @@ struct expr_ops expr_ops_rt = { |
| 450 | .get = nftnl_expr_rt_get, |
| 451 | .parse = nftnl_expr_rt_parse, |
| 452 | .build = nftnl_expr_rt_build, |
| 453 | - .snprintf = nftnl_expr_rt_snprintf, |
| 454 | + .snprintf_ = nftnl_expr_rt_snprintf, |
| 455 | .json_parse = nftnl_expr_rt_json_parse, |
| 456 | }; |
| 457 | diff --git a/src/expr/socket.c b/src/expr/socket.c |
| 458 | index db160a1..4c50011 100644 |
| 459 | --- a/src/expr/socket.c |
| 460 | +++ b/src/expr/socket.c |
| 461 | @@ -204,5 +204,5 @@ struct expr_ops expr_ops_socket = { |
| 462 | .get = nftnl_expr_socket_get, |
| 463 | .parse = nftnl_expr_socket_parse, |
| 464 | .build = nftnl_expr_socket_build, |
| 465 | - .snprintf = nftnl_expr_socket_snprintf, |
| 466 | + .snprintf_ = nftnl_expr_socket_snprintf, |
| 467 | }; |
| 468 | diff --git a/src/expr/target.c b/src/expr/target.c |
| 469 | index ed4bf7d..2ef4078 100644 |
| 470 | --- a/src/expr/target.c |
| 471 | +++ b/src/expr/target.c |
| 472 | @@ -249,6 +249,6 @@ struct expr_ops expr_ops_target = { |
| 473 | .get = nftnl_expr_target_get, |
| 474 | .parse = nftnl_expr_target_parse, |
| 475 | .build = nftnl_expr_target_build, |
| 476 | - .snprintf = nftnl_expr_target_snprintf, |
| 477 | + .snprintf_ = nftnl_expr_target_snprintf, |
| 478 | .json_parse = nftnl_expr_target_json_parse, |
| 479 | }; |
| 480 | diff --git a/src/obj/counter.c b/src/obj/counter.c |
| 481 | index 332bb2b..edeb7be 100644 |
| 482 | --- a/src/obj/counter.c |
| 483 | +++ b/src/obj/counter.c |
| 484 | @@ -182,6 +182,6 @@ struct obj_ops obj_ops_counter = { |
| 485 | .get = nftnl_obj_counter_get, |
| 486 | .parse = nftnl_obj_counter_parse, |
| 487 | .build = nftnl_obj_counter_build, |
| 488 | - .snprintf = nftnl_obj_counter_snprintf, |
| 489 | + .snprintf_ = nftnl_obj_counter_snprintf, |
| 490 | .json_parse = nftnl_obj_counter_json_parse, |
| 491 | }; |
| 492 | diff --git a/src/obj/ct_helper.c b/src/obj/ct_helper.c |
| 493 | index 62569fe..69757ff 100644 |
| 494 | --- a/src/obj/ct_helper.c |
| 495 | +++ b/src/obj/ct_helper.c |
| 496 | @@ -208,6 +208,6 @@ struct obj_ops obj_ops_ct_helper = { |
| 497 | .get = nftnl_obj_ct_helper_get, |
| 498 | .parse = nftnl_obj_ct_helper_parse, |
| 499 | .build = nftnl_obj_ct_helper_build, |
| 500 | - .snprintf = nftnl_obj_ct_helper_snprintf, |
| 501 | + .snprintf_ = nftnl_obj_ct_helper_snprintf, |
| 502 | .json_parse = nftnl_obj_quota_json_parse, |
| 503 | }; |
| 504 | diff --git a/src/obj/limit.c b/src/obj/limit.c |
| 505 | index 7f8bcf7..25018b6 100644 |
| 506 | --- a/src/obj/limit.c |
| 507 | +++ b/src/obj/limit.c |
| 508 | @@ -236,6 +236,6 @@ struct obj_ops obj_ops_limit = { |
| 509 | .get = nftnl_obj_limit_get, |
| 510 | .parse = nftnl_obj_limit_parse, |
| 511 | .build = nftnl_obj_limit_build, |
| 512 | - .snprintf = nftnl_obj_limit_snprintf, |
| 513 | + .snprintf_ = nftnl_obj_limit_snprintf, |
| 514 | .json_parse = nftnl_obj_limit_json_parse, |
| 515 | }; |
| 516 | diff --git a/src/obj/quota.c b/src/obj/quota.c |
| 517 | index 6d36784..ecaa8b1 100644 |
| 518 | --- a/src/obj/quota.c |
| 519 | +++ b/src/obj/quota.c |
| 520 | @@ -203,6 +203,6 @@ struct obj_ops obj_ops_quota = { |
| 521 | .get = nftnl_obj_quota_get, |
| 522 | .parse = nftnl_obj_quota_parse, |
| 523 | .build = nftnl_obj_quota_build, |
| 524 | - .snprintf = nftnl_obj_quota_snprintf, |
| 525 | + .snprintf_ = nftnl_obj_quota_snprintf, |
| 526 | .json_parse = nftnl_obj_quota_json_parse, |
| 527 | }; |
| 528 | diff --git a/src/object.c b/src/object.c |
| 529 | index d8278f3..9654b7b 100644 |
| 530 | --- a/src/object.c |
| 531 | +++ b/src/object.c |
| 532 | @@ -429,7 +429,7 @@ static int nftnl_obj_export(char *buf, size_t size, |
| 533 | nftnl_buf_u64(&b, type, obj->handle, HANDLE); |
| 534 | |
| 535 | if (obj->ops) |
| 536 | - ret = obj->ops->snprintf(buf + b.len, size - b.len, type, |
| 537 | + ret = obj->ops->snprintf_(buf + b.len, size - b.len, type, |
| 538 | flags, obj); |
| 539 | |
| 540 | b.len += ret; |
| 541 | @@ -450,7 +450,7 @@ static int nftnl_obj_snprintf_dflt(char *buf, size_t size, |
| 542 | SNPRINTF_BUFFER_SIZE(ret, remain, offset); |
| 543 | |
| 544 | if (obj->ops) { |
| 545 | - ret = obj->ops->snprintf(buf + offset, offset, type, flags, |
| 546 | + ret = obj->ops->snprintf_(buf + offset, offset, type, flags, |
| 547 | obj); |
| 548 | SNPRINTF_BUFFER_SIZE(ret, remain, offset); |
| 549 | } |