Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame^] | 1 | From 373e13e28e34b4d415fc096e1c7175f4ecfbf0da Mon Sep 17 00:00:00 2001 |
| 2 | From: Yuan Chao <yuanc.fnst@cn.fujitsu.com> |
| 3 | Date: Wed, 21 Aug 2019 11:18:56 +0900 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 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> |
Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame^] | 11 | |
| 12 | Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com> |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 13 | --- |
| 14 | include/expr_ops.h | 2 +- |
| 15 | include/obj.h | 2 +- |
| 16 | src/expr.c | 4 ++-- |
| 17 | src/expr/bitwise.c | 2 +- |
| 18 | src/expr/byteorder.c | 2 +- |
| 19 | src/expr/cmp.c | 2 +- |
| 20 | src/expr/connlimit.c | 2 +- |
| 21 | src/expr/counter.c | 2 +- |
| 22 | src/expr/ct.c | 2 +- |
| 23 | src/expr/dup.c | 2 +- |
| 24 | src/expr/dynset.c | 2 +- |
| 25 | src/expr/exthdr.c | 2 +- |
| 26 | src/expr/fib.c | 2 +- |
| 27 | src/expr/flow_offload.c | 2 +- |
| 28 | src/expr/fwd.c | 2 +- |
| 29 | src/expr/hash.c | 2 +- |
| 30 | src/expr/immediate.c | 2 +- |
| 31 | src/expr/limit.c | 2 +- |
| 32 | src/expr/log.c | 2 +- |
| 33 | src/expr/lookup.c | 2 +- |
| 34 | src/expr/masq.c | 2 +- |
| 35 | src/expr/match.c | 2 +- |
| 36 | src/expr/meta.c | 2 +- |
| 37 | src/expr/nat.c | 2 +- |
| 38 | src/expr/numgen.c | 2 +- |
| 39 | src/expr/objref.c | 2 +- |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 40 | src/expr/osf.c | 2 +- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 41 | src/expr/payload.c | 2 +- |
| 42 | src/expr/queue.c | 2 +- |
| 43 | src/expr/quota.c | 2 +- |
| 44 | src/expr/range.c | 2 +- |
| 45 | src/expr/redir.c | 2 +- |
| 46 | src/expr/reject.c | 2 +- |
| 47 | src/expr/rt.c | 2 +- |
| 48 | src/expr/socket.c | 2 +- |
Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame^] | 49 | src/expr/synproxy.c | 2 +- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 50 | src/expr/target.c | 2 +- |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 51 | src/expr/tproxy.c | 2 +- |
| 52 | src/expr/tunnel.c | 2 +- |
| 53 | src/expr/xfrm.c | 2 +- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 54 | src/obj/counter.c | 2 +- |
Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame^] | 55 | src/obj/ct_expect.c | 2 +- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 56 | src/obj/ct_helper.c | 2 +- |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 57 | src/obj/ct_timeout.c | 2 +- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 58 | src/obj/limit.c | 2 +- |
| 59 | src/obj/quota.c | 2 +- |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 60 | src/obj/secmark.c | 2 +- |
| 61 | src/obj/tunnel.c | 2 +- |
| 62 | src/object.c | 2 +- |
Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame^] | 63 | 49 files changed, 50 insertions(+), 50 deletions(-) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 64 | |
| 65 | diff --git a/include/expr_ops.h b/include/expr_ops.h |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 66 | index a7f1b9a..d2946de 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 67 | --- a/include/expr_ops.h |
| 68 | +++ b/include/expr_ops.h |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 69 | @@ -17,7 +17,7 @@ struct expr_ops { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 70 | const void *(*get)(const struct nftnl_expr *e, uint16_t type, uint32_t *data_len); |
| 71 | int (*parse)(struct nftnl_expr *e, struct nlattr *attr); |
| 72 | void (*build)(struct nlmsghdr *nlh, const struct nftnl_expr *e); |
| 73 | - int (*snprintf)(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_expr *e); |
| 74 | + 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] | 75 | }; |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 76 | |
| 77 | struct expr_ops *nftnl_expr_ops_lookup(const char *name); |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 78 | diff --git a/include/obj.h b/include/obj.h |
Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame^] | 79 | index 9394d79..08610d7 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 80 | --- a/include/obj.h |
| 81 | +++ b/include/obj.h |
Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame^] | 82 | @@ -99,7 +99,7 @@ struct obj_ops { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 83 | const void *(*get)(const struct nftnl_obj *e, uint16_t type, uint32_t *data_len); |
| 84 | int (*parse)(struct nftnl_obj *e, struct nlattr *attr); |
| 85 | void (*build)(struct nlmsghdr *nlh, const struct nftnl_obj *e); |
| 86 | - int (*snprintf)(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_obj *e); |
| 87 | + 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] | 88 | }; |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 89 | |
| 90 | extern struct obj_ops obj_ops_counter; |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 91 | diff --git a/src/expr.c b/src/expr.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 92 | index 80c4c36..b698a60 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 93 | --- a/src/expr.c |
| 94 | +++ b/src/expr.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 95 | @@ -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] | 96 | if (size) |
| 97 | buf[0] = '\0'; |
| 98 | |
| 99 | - if (!expr->ops->snprintf) |
| 100 | + if (!expr->ops->snprintf_) |
| 101 | return 0; |
| 102 | |
| 103 | - ret = expr->ops->snprintf(buf + offset, remain, type, flags, expr); |
| 104 | + ret = expr->ops->snprintf_(buf + offset, remain, type, flags, expr); |
| 105 | SNPRINTF_BUFFER_SIZE(ret, remain, offset); |
| 106 | |
| 107 | return offset; |
| 108 | diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 109 | index c9d40df..27d644b 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 110 | --- a/src/expr/bitwise.c |
| 111 | +++ b/src/expr/bitwise.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 112 | @@ -219,5 +219,5 @@ struct expr_ops expr_ops_bitwise = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 113 | .get = nftnl_expr_bitwise_get, |
| 114 | .parse = nftnl_expr_bitwise_parse, |
| 115 | .build = nftnl_expr_bitwise_build, |
| 116 | - .snprintf = nftnl_expr_bitwise_snprintf, |
| 117 | + .snprintf_ = nftnl_expr_bitwise_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 118 | }; |
| 119 | diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 120 | index efdfa2b..7ae9dfb 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 121 | --- a/src/expr/byteorder.c |
| 122 | +++ b/src/expr/byteorder.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 123 | @@ -234,5 +234,5 @@ struct expr_ops expr_ops_byteorder = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 124 | .get = nftnl_expr_byteorder_get, |
| 125 | .parse = nftnl_expr_byteorder_parse, |
| 126 | .build = nftnl_expr_byteorder_build, |
| 127 | - .snprintf = nftnl_expr_byteorder_snprintf, |
| 128 | + .snprintf_ = nftnl_expr_byteorder_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 129 | }; |
| 130 | diff --git a/src/expr/cmp.c b/src/expr/cmp.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 131 | index 86d7842..e3be442 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 132 | --- a/src/expr/cmp.c |
| 133 | +++ b/src/expr/cmp.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 134 | @@ -216,5 +216,5 @@ struct expr_ops expr_ops_cmp = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 135 | .get = nftnl_expr_cmp_get, |
| 136 | .parse = nftnl_expr_cmp_parse, |
| 137 | .build = nftnl_expr_cmp_build, |
| 138 | - .snprintf = nftnl_expr_cmp_snprintf, |
| 139 | + .snprintf_ = nftnl_expr_cmp_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 140 | }; |
| 141 | diff --git a/src/expr/connlimit.c b/src/expr/connlimit.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 142 | index 53af93b..6c8bc40 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 143 | --- a/src/expr/connlimit.c |
| 144 | +++ b/src/expr/connlimit.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 145 | @@ -149,5 +149,5 @@ struct expr_ops expr_ops_connlimit = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 146 | .get = nftnl_expr_connlimit_get, |
| 147 | .parse = nftnl_expr_connlimit_parse, |
| 148 | .build = nftnl_expr_connlimit_build, |
| 149 | - .snprintf = nftnl_expr_connlimit_snprintf, |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 150 | + .snprintf_ = nftnl_expr_connlimit_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 151 | }; |
| 152 | diff --git a/src/expr/counter.c b/src/expr/counter.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 153 | index 89a602e..a32a69e 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 154 | --- a/src/expr/counter.c |
| 155 | +++ b/src/expr/counter.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 156 | @@ -147,5 +147,5 @@ struct expr_ops expr_ops_counter = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 157 | .get = nftnl_expr_counter_get, |
| 158 | .parse = nftnl_expr_counter_parse, |
| 159 | .build = nftnl_expr_counter_build, |
| 160 | - .snprintf = nftnl_expr_counter_snprintf, |
| 161 | + .snprintf_ = nftnl_expr_counter_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 162 | }; |
| 163 | diff --git a/src/expr/ct.c b/src/expr/ct.c |
Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame^] | 164 | index 124de9d..7bde179 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 165 | --- a/src/expr/ct.c |
| 166 | +++ b/src/expr/ct.c |
Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame^] | 167 | @@ -273,5 +273,5 @@ struct expr_ops expr_ops_ct = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 168 | .get = nftnl_expr_ct_get, |
| 169 | .parse = nftnl_expr_ct_parse, |
| 170 | .build = nftnl_expr_ct_build, |
| 171 | - .snprintf = nftnl_expr_ct_snprintf, |
| 172 | + .snprintf_ = nftnl_expr_ct_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 173 | }; |
| 174 | diff --git a/src/expr/dup.c b/src/expr/dup.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 175 | index 2bb35e5..d9bd4b1 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 176 | --- a/src/expr/dup.c |
| 177 | +++ b/src/expr/dup.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 178 | @@ -154,5 +154,5 @@ struct expr_ops expr_ops_dup = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 179 | .get = nftnl_expr_dup_get, |
| 180 | .parse = nftnl_expr_dup_parse, |
| 181 | .build = nftnl_expr_dup_build, |
| 182 | - .snprintf = nftnl_expr_dup_snprintf, |
| 183 | + .snprintf_ = nftnl_expr_dup_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 184 | }; |
| 185 | diff --git a/src/expr/dynset.c b/src/expr/dynset.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 186 | index 68115ba..6e43bb4 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 187 | --- a/src/expr/dynset.c |
| 188 | +++ b/src/expr/dynset.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 189 | @@ -288,5 +288,5 @@ struct expr_ops expr_ops_dynset = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 190 | .get = nftnl_expr_dynset_get, |
| 191 | .parse = nftnl_expr_dynset_parse, |
| 192 | .build = nftnl_expr_dynset_build, |
| 193 | - .snprintf = nftnl_expr_dynset_snprintf, |
| 194 | + .snprintf_ = nftnl_expr_dynset_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 195 | }; |
| 196 | diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c |
Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame^] | 197 | index e5f714b..e68792b 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 198 | --- a/src/expr/exthdr.c |
| 199 | +++ b/src/expr/exthdr.c |
Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame^] | 200 | @@ -276,5 +276,5 @@ struct expr_ops expr_ops_exthdr = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 201 | .get = nftnl_expr_exthdr_get, |
| 202 | .parse = nftnl_expr_exthdr_parse, |
| 203 | .build = nftnl_expr_exthdr_build, |
| 204 | - .snprintf = nftnl_expr_exthdr_snprintf, |
| 205 | + .snprintf_ = nftnl_expr_exthdr_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 206 | }; |
| 207 | diff --git a/src/expr/fib.c b/src/expr/fib.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 208 | index 9475af4..8e7090d 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 209 | --- a/src/expr/fib.c |
| 210 | +++ b/src/expr/fib.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 211 | @@ -213,5 +213,5 @@ struct expr_ops expr_ops_fib = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 212 | .get = nftnl_expr_fib_get, |
| 213 | .parse = nftnl_expr_fib_parse, |
| 214 | .build = nftnl_expr_fib_build, |
| 215 | - .snprintf = nftnl_expr_fib_snprintf, |
| 216 | + .snprintf_ = nftnl_expr_fib_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 217 | }; |
| 218 | 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] | 219 | index 6ccec9a..c2f2478 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 220 | --- a/src/expr/flow_offload.c |
| 221 | +++ b/src/expr/flow_offload.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 222 | @@ -134,5 +134,5 @@ struct expr_ops expr_ops_flow = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 223 | .get = nftnl_expr_flow_get, |
| 224 | .parse = nftnl_expr_flow_parse, |
| 225 | .build = nftnl_expr_flow_build, |
| 226 | - .snprintf = nftnl_expr_flow_snprintf, |
| 227 | + .snprintf_ = nftnl_expr_flow_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 228 | }; |
| 229 | diff --git a/src/expr/fwd.c b/src/expr/fwd.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 230 | index cff8235..bcd7d3f 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 231 | --- a/src/expr/fwd.c |
| 232 | +++ b/src/expr/fwd.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 233 | @@ -174,5 +174,5 @@ struct expr_ops expr_ops_fwd = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 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, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 239 | }; |
| 240 | diff --git a/src/expr/hash.c b/src/expr/hash.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 241 | index 2c801d2..a9f6e7e 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 242 | --- a/src/expr/hash.c |
| 243 | +++ b/src/expr/hash.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 244 | @@ -241,5 +241,5 @@ struct expr_ops expr_ops_hash = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 245 | .get = nftnl_expr_hash_get, |
| 246 | .parse = nftnl_expr_hash_parse, |
| 247 | .build = nftnl_expr_hash_build, |
| 248 | - .snprintf = nftnl_expr_hash_snprintf, |
| 249 | + .snprintf_ = nftnl_expr_hash_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 250 | }; |
| 251 | diff --git a/src/expr/immediate.c b/src/expr/immediate.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 252 | index 47106ae..ea86c88 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 253 | --- a/src/expr/immediate.c |
| 254 | +++ b/src/expr/immediate.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 255 | @@ -235,5 +235,5 @@ struct expr_ops expr_ops_immediate = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 256 | .get = nftnl_expr_immediate_get, |
| 257 | .parse = nftnl_expr_immediate_parse, |
| 258 | .build = nftnl_expr_immediate_build, |
| 259 | - .snprintf = nftnl_expr_immediate_snprintf, |
| 260 | + .snprintf_ = nftnl_expr_immediate_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 261 | }; |
| 262 | diff --git a/src/expr/limit.c b/src/expr/limit.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 263 | index 5872e27..0ce482f 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 264 | --- a/src/expr/limit.c |
| 265 | +++ b/src/expr/limit.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 266 | @@ -216,5 +216,5 @@ struct expr_ops expr_ops_limit = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 267 | .get = nftnl_expr_limit_get, |
| 268 | .parse = nftnl_expr_limit_parse, |
| 269 | .build = nftnl_expr_limit_build, |
| 270 | - .snprintf = nftnl_expr_limit_snprintf, |
| 271 | + .snprintf_ = nftnl_expr_limit_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 272 | }; |
| 273 | diff --git a/src/expr/log.c b/src/expr/log.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 274 | index bbe43d2..5506bc2 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 275 | --- a/src/expr/log.c |
| 276 | +++ b/src/expr/log.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 277 | @@ -267,5 +267,5 @@ struct expr_ops expr_ops_log = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 278 | .get = nftnl_expr_log_get, |
| 279 | .parse = nftnl_expr_log_parse, |
| 280 | .build = nftnl_expr_log_build, |
| 281 | - .snprintf = nftnl_expr_log_snprintf, |
| 282 | + .snprintf_ = nftnl_expr_log_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 283 | }; |
| 284 | diff --git a/src/expr/lookup.c b/src/expr/lookup.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 285 | index a495ac0..678868c 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 286 | --- a/src/expr/lookup.c |
| 287 | +++ b/src/expr/lookup.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 288 | @@ -221,5 +221,5 @@ struct expr_ops expr_ops_lookup = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 289 | .get = nftnl_expr_lookup_get, |
| 290 | .parse = nftnl_expr_lookup_parse, |
| 291 | .build = nftnl_expr_lookup_build, |
| 292 | - .snprintf = nftnl_expr_lookup_snprintf, |
| 293 | + .snprintf_ = nftnl_expr_lookup_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 294 | }; |
| 295 | diff --git a/src/expr/masq.c b/src/expr/masq.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 296 | index f6f3ceb..88292a6 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 297 | --- a/src/expr/masq.c |
| 298 | +++ b/src/expr/masq.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 299 | @@ -169,5 +169,5 @@ struct expr_ops expr_ops_masq = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 300 | .get = nftnl_expr_masq_get, |
| 301 | .parse = nftnl_expr_masq_parse, |
| 302 | .build = nftnl_expr_masq_build, |
| 303 | - .snprintf = nftnl_expr_masq_snprintf, |
| 304 | + .snprintf_ = nftnl_expr_masq_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 305 | }; |
| 306 | diff --git a/src/expr/match.c b/src/expr/match.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 307 | index 4fa74b2..249c6b5 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 308 | --- a/src/expr/match.c |
| 309 | +++ b/src/expr/match.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 310 | @@ -198,5 +198,5 @@ struct expr_ops expr_ops_match = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 311 | .get = nftnl_expr_match_get, |
| 312 | .parse = nftnl_expr_match_parse, |
| 313 | .build = nftnl_expr_match_build, |
| 314 | - .snprintf = nftnl_expr_match_snprintf, |
| 315 | + .snprintf_ = nftnl_expr_match_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 316 | }; |
| 317 | diff --git a/src/expr/meta.c b/src/expr/meta.c |
Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame^] | 318 | index 73f6efa..35d5ec5 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 319 | --- a/src/expr/meta.c |
| 320 | +++ b/src/expr/meta.c |
Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame^] | 321 | @@ -226,5 +226,5 @@ struct expr_ops expr_ops_meta = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 322 | .get = nftnl_expr_meta_get, |
| 323 | .parse = nftnl_expr_meta_parse, |
| 324 | .build = nftnl_expr_meta_build, |
| 325 | - .snprintf = nftnl_expr_meta_snprintf, |
| 326 | + .snprintf_ = nftnl_expr_meta_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 327 | }; |
| 328 | diff --git a/src/expr/nat.c b/src/expr/nat.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 329 | index 6b7d50e..be4a579 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 330 | --- a/src/expr/nat.c |
| 331 | +++ b/src/expr/nat.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 332 | @@ -279,5 +279,5 @@ struct expr_ops expr_ops_nat = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 333 | .get = nftnl_expr_nat_get, |
| 334 | .parse = nftnl_expr_nat_parse, |
| 335 | .build = nftnl_expr_nat_build, |
| 336 | - .snprintf = nftnl_expr_nat_snprintf, |
| 337 | + .snprintf_ = nftnl_expr_nat_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 338 | }; |
| 339 | diff --git a/src/expr/numgen.c b/src/expr/numgen.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 340 | index 4e0d541..5995ee3 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 341 | --- a/src/expr/numgen.c |
| 342 | +++ b/src/expr/numgen.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 343 | @@ -195,5 +195,5 @@ struct expr_ops expr_ops_ng = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 344 | .get = nftnl_expr_ng_get, |
| 345 | .parse = nftnl_expr_ng_parse, |
| 346 | .build = nftnl_expr_ng_build, |
| 347 | - .snprintf = nftnl_expr_ng_snprintf, |
| 348 | + .snprintf_ = nftnl_expr_ng_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 349 | }; |
| 350 | diff --git a/src/expr/objref.c b/src/expr/objref.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 351 | index 7388b18..e673ffd 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 352 | --- a/src/expr/objref.c |
| 353 | +++ b/src/expr/objref.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 354 | @@ -210,5 +210,5 @@ struct expr_ops expr_ops_objref = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 355 | .get = nftnl_expr_objref_get, |
| 356 | .parse = nftnl_expr_objref_parse, |
| 357 | .build = nftnl_expr_objref_build, |
| 358 | - .snprintf = nftnl_expr_objref_snprintf, |
| 359 | + .snprintf_ = nftnl_expr_objref_snprintf, |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 360 | }; |
| 361 | diff --git a/src/expr/osf.c b/src/expr/osf.c |
| 362 | index 98d0df9..618b46e 100644 |
| 363 | --- a/src/expr/osf.c |
| 364 | +++ b/src/expr/osf.c |
| 365 | @@ -161,5 +161,5 @@ struct expr_ops expr_ops_osf = { |
| 366 | .get = nftnl_expr_osf_get, |
| 367 | .parse = nftnl_expr_osf_parse, |
| 368 | .build = nftnl_expr_osf_build, |
| 369 | - .snprintf = nftnl_expr_osf_snprintf, |
| 370 | + .snprintf_ = nftnl_expr_osf_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 371 | }; |
| 372 | diff --git a/src/expr/payload.c b/src/expr/payload.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 373 | index 2192dad..37aacc4 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 374 | --- a/src/expr/payload.c |
| 375 | +++ b/src/expr/payload.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 376 | @@ -266,5 +266,5 @@ struct expr_ops expr_ops_payload = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 377 | .get = nftnl_expr_payload_get, |
| 378 | .parse = nftnl_expr_payload_parse, |
| 379 | .build = nftnl_expr_payload_build, |
| 380 | - .snprintf = nftnl_expr_payload_snprintf, |
| 381 | + .snprintf_ = nftnl_expr_payload_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 382 | }; |
| 383 | diff --git a/src/expr/queue.c b/src/expr/queue.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 384 | index 051ef71..b06feff 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 385 | --- a/src/expr/queue.c |
| 386 | +++ b/src/expr/queue.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 387 | @@ -207,5 +207,5 @@ struct expr_ops expr_ops_queue = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 388 | .get = nftnl_expr_queue_get, |
| 389 | .parse = nftnl_expr_queue_parse, |
| 390 | .build = nftnl_expr_queue_build, |
| 391 | - .snprintf = nftnl_expr_queue_snprintf, |
| 392 | + .snprintf_ = nftnl_expr_queue_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 393 | }; |
| 394 | diff --git a/src/expr/quota.c b/src/expr/quota.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 395 | index 39a92e6..41797be 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 396 | --- a/src/expr/quota.c |
| 397 | +++ b/src/expr/quota.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 398 | @@ -161,5 +161,5 @@ struct expr_ops expr_ops_quota = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 399 | .get = nftnl_expr_quota_get, |
| 400 | .parse = nftnl_expr_quota_parse, |
| 401 | .build = nftnl_expr_quota_build, |
| 402 | - .snprintf = nftnl_expr_quota_snprintf, |
| 403 | + .snprintf_ = nftnl_expr_quota_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 404 | }; |
| 405 | diff --git a/src/expr/range.c b/src/expr/range.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 406 | index d1d5083..b619cdf 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 407 | --- a/src/expr/range.c |
| 408 | +++ b/src/expr/range.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 409 | @@ -227,5 +227,5 @@ struct expr_ops expr_ops_range = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 410 | .get = nftnl_expr_range_get, |
| 411 | .parse = nftnl_expr_range_parse, |
| 412 | .build = nftnl_expr_range_build, |
| 413 | - .snprintf = nftnl_expr_range_snprintf, |
| 414 | + .snprintf_ = nftnl_expr_range_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 415 | }; |
| 416 | diff --git a/src/expr/redir.c b/src/expr/redir.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 417 | index 477659a..5c4ebeb 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 418 | --- a/src/expr/redir.c |
| 419 | +++ b/src/expr/redir.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 420 | @@ -181,5 +181,5 @@ struct expr_ops expr_ops_redir = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 421 | .get = nftnl_expr_redir_get, |
| 422 | .parse = nftnl_expr_redir_parse, |
| 423 | .build = nftnl_expr_redir_build, |
| 424 | - .snprintf = nftnl_expr_redir_snprintf, |
| 425 | + .snprintf_ = nftnl_expr_redir_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 426 | }; |
| 427 | diff --git a/src/expr/reject.c b/src/expr/reject.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 428 | index 141942e..a98990d 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 429 | --- a/src/expr/reject.c |
| 430 | +++ b/src/expr/reject.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 431 | @@ -148,5 +148,5 @@ struct expr_ops expr_ops_reject = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 432 | .get = nftnl_expr_reject_get, |
| 433 | .parse = nftnl_expr_reject_parse, |
| 434 | .build = nftnl_expr_reject_build, |
| 435 | - .snprintf = nftnl_expr_reject_snprintf, |
| 436 | + .snprintf_ = nftnl_expr_reject_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 437 | }; |
| 438 | diff --git a/src/expr/rt.c b/src/expr/rt.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 439 | index 0fce72d..32ace19 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 440 | --- a/src/expr/rt.c |
| 441 | +++ b/src/expr/rt.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 442 | @@ -177,5 +177,5 @@ struct expr_ops expr_ops_rt = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 443 | .get = nftnl_expr_rt_get, |
| 444 | .parse = nftnl_expr_rt_parse, |
| 445 | .build = nftnl_expr_rt_build, |
| 446 | - .snprintf = nftnl_expr_rt_snprintf, |
| 447 | + .snprintf_ = nftnl_expr_rt_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 448 | }; |
| 449 | diff --git a/src/expr/socket.c b/src/expr/socket.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 450 | index 96550d5..2394dbf 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 451 | --- a/src/expr/socket.c |
| 452 | +++ b/src/expr/socket.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 453 | @@ -174,5 +174,5 @@ struct expr_ops expr_ops_socket = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 454 | .get = nftnl_expr_socket_get, |
| 455 | .parse = nftnl_expr_socket_parse, |
| 456 | .build = nftnl_expr_socket_build, |
| 457 | - .snprintf = nftnl_expr_socket_snprintf, |
| 458 | + .snprintf_ = nftnl_expr_socket_snprintf, |
| 459 | }; |
Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame^] | 460 | diff --git a/src/expr/synproxy.c b/src/expr/synproxy.c |
| 461 | index 245f4fb..9721029 100644 |
| 462 | --- a/src/expr/synproxy.c |
| 463 | +++ b/src/expr/synproxy.c |
| 464 | @@ -166,5 +166,5 @@ struct expr_ops expr_ops_synproxy = { |
| 465 | .get = nftnl_expr_synproxy_get, |
| 466 | .parse = nftnl_expr_synproxy_parse, |
| 467 | .build = nftnl_expr_synproxy_build, |
| 468 | - .snprintf = nftnl_expr_synproxy_snprintf, |
| 469 | + .snprintf_ = nftnl_expr_synproxy_snprintf, |
| 470 | }; |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 471 | diff --git a/src/expr/target.c b/src/expr/target.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 472 | index 9100038..7180085 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 473 | --- a/src/expr/target.c |
| 474 | +++ b/src/expr/target.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 475 | @@ -198,5 +198,5 @@ struct expr_ops expr_ops_target = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 476 | .get = nftnl_expr_target_get, |
| 477 | .parse = nftnl_expr_target_parse, |
| 478 | .build = nftnl_expr_target_build, |
| 479 | - .snprintf = nftnl_expr_target_snprintf, |
| 480 | + .snprintf_ = nftnl_expr_target_snprintf, |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 481 | }; |
| 482 | diff --git a/src/expr/tproxy.c b/src/expr/tproxy.c |
| 483 | index 3827b75..feabbbe 100644 |
| 484 | --- a/src/expr/tproxy.c |
| 485 | +++ b/src/expr/tproxy.c |
| 486 | @@ -183,5 +183,5 @@ struct expr_ops expr_ops_tproxy = { |
| 487 | .get = nftnl_expr_tproxy_get, |
| 488 | .parse = nftnl_expr_tproxy_parse, |
| 489 | .build = nftnl_expr_tproxy_build, |
| 490 | - .snprintf = nftnl_expr_tproxy_snprintf, |
| 491 | + .snprintf_ = nftnl_expr_tproxy_snprintf, |
| 492 | }; |
| 493 | diff --git a/src/expr/tunnel.c b/src/expr/tunnel.c |
| 494 | index b2b8d72..1ed46d3 100644 |
| 495 | --- a/src/expr/tunnel.c |
| 496 | +++ b/src/expr/tunnel.c |
| 497 | @@ -173,5 +173,5 @@ struct expr_ops expr_ops_tunnel = { |
| 498 | .get = nftnl_expr_tunnel_get, |
| 499 | .parse = nftnl_expr_tunnel_parse, |
| 500 | .build = nftnl_expr_tunnel_build, |
| 501 | - .snprintf = nftnl_expr_tunnel_snprintf, |
| 502 | + .snprintf_ = nftnl_expr_tunnel_snprintf, |
| 503 | }; |
| 504 | diff --git a/src/expr/xfrm.c b/src/expr/xfrm.c |
| 505 | index 8fe5438..b6b2772 100644 |
| 506 | --- a/src/expr/xfrm.c |
| 507 | +++ b/src/expr/xfrm.c |
| 508 | @@ -239,5 +239,5 @@ struct expr_ops expr_ops_xfrm = { |
| 509 | .get = nftnl_expr_xfrm_get, |
| 510 | .parse = nftnl_expr_xfrm_parse, |
| 511 | .build = nftnl_expr_xfrm_build, |
| 512 | - .snprintf = nftnl_expr_xfrm_snprintf, |
| 513 | + .snprintf_ = nftnl_expr_xfrm_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 514 | }; |
| 515 | diff --git a/src/obj/counter.c b/src/obj/counter.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 516 | index 1baba4e..3710bce 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 517 | --- a/src/obj/counter.c |
| 518 | +++ b/src/obj/counter.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 519 | @@ -145,5 +145,5 @@ struct obj_ops obj_ops_counter = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 520 | .get = nftnl_obj_counter_get, |
| 521 | .parse = nftnl_obj_counter_parse, |
| 522 | .build = nftnl_obj_counter_build, |
| 523 | - .snprintf = nftnl_obj_counter_snprintf, |
| 524 | + .snprintf_ = nftnl_obj_counter_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 525 | }; |
Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame^] | 526 | diff --git a/src/obj/ct_expect.c b/src/obj/ct_expect.c |
| 527 | index c0bb5ba..953c08c 100644 |
| 528 | --- a/src/obj/ct_expect.c |
| 529 | +++ b/src/obj/ct_expect.c |
| 530 | @@ -209,5 +209,5 @@ struct obj_ops obj_ops_ct_expect = { |
| 531 | .get = nftnl_obj_ct_expect_get, |
| 532 | .parse = nftnl_obj_ct_expect_parse, |
| 533 | .build = nftnl_obj_ct_expect_build, |
| 534 | - .snprintf = nftnl_obj_ct_expect_snprintf, |
| 535 | + .snprintf_ = nftnl_obj_ct_expect_snprintf, |
| 536 | }; |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 537 | 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] | 538 | index d91f636..2037461 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 539 | --- a/src/obj/ct_helper.c |
| 540 | +++ b/src/obj/ct_helper.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 541 | @@ -166,5 +166,5 @@ struct obj_ops obj_ops_ct_helper = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 542 | .get = nftnl_obj_ct_helper_get, |
| 543 | .parse = nftnl_obj_ct_helper_parse, |
| 544 | .build = nftnl_obj_ct_helper_build, |
| 545 | - .snprintf = nftnl_obj_ct_helper_snprintf, |
| 546 | + .snprintf_ = nftnl_obj_ct_helper_snprintf, |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 547 | }; |
| 548 | diff --git a/src/obj/ct_timeout.c b/src/obj/ct_timeout.c |
| 549 | index e2e9991..a4f2dd2 100644 |
| 550 | --- a/src/obj/ct_timeout.c |
| 551 | +++ b/src/obj/ct_timeout.c |
| 552 | @@ -330,5 +330,5 @@ struct obj_ops obj_ops_ct_timeout = { |
| 553 | .get = nftnl_obj_ct_timeout_get, |
| 554 | .parse = nftnl_obj_ct_timeout_parse, |
| 555 | .build = nftnl_obj_ct_timeout_build, |
| 556 | - .snprintf = nftnl_obj_ct_timeout_snprintf, |
| 557 | + .snprintf_ = nftnl_obj_ct_timeout_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 558 | }; |
| 559 | diff --git a/src/obj/limit.c b/src/obj/limit.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 560 | index 60b0159..538f37a 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 561 | --- a/src/obj/limit.c |
| 562 | +++ b/src/obj/limit.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 563 | @@ -185,5 +185,5 @@ struct obj_ops obj_ops_limit = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 564 | .get = nftnl_obj_limit_get, |
| 565 | .parse = nftnl_obj_limit_parse, |
| 566 | .build = nftnl_obj_limit_build, |
| 567 | - .snprintf = nftnl_obj_limit_snprintf, |
| 568 | + .snprintf_ = nftnl_obj_limit_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 569 | }; |
| 570 | diff --git a/src/obj/quota.c b/src/obj/quota.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 571 | index 1914037..585a088 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 572 | --- a/src/obj/quota.c |
| 573 | +++ b/src/obj/quota.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 574 | @@ -161,5 +161,5 @@ struct obj_ops obj_ops_quota = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 575 | .get = nftnl_obj_quota_get, |
| 576 | .parse = nftnl_obj_quota_parse, |
| 577 | .build = nftnl_obj_quota_build, |
| 578 | - .snprintf = nftnl_obj_quota_snprintf, |
| 579 | + .snprintf_ = nftnl_obj_quota_snprintf, |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 580 | }; |
| 581 | diff --git a/src/obj/secmark.c b/src/obj/secmark.c |
| 582 | index e27b5fa..6241bee 100644 |
| 583 | --- a/src/obj/secmark.c |
| 584 | +++ b/src/obj/secmark.c |
| 585 | @@ -133,5 +133,5 @@ struct obj_ops obj_ops_secmark = { |
| 586 | .get = nftnl_obj_secmark_get, |
| 587 | .parse = nftnl_obj_secmark_parse, |
| 588 | .build = nftnl_obj_secmark_build, |
| 589 | - .snprintf = nftnl_obj_secmark_snprintf, |
| 590 | + .snprintf_ = nftnl_obj_secmark_snprintf, |
| 591 | }; |
| 592 | diff --git a/src/obj/tunnel.c b/src/obj/tunnel.c |
| 593 | index 7ffade8..800eb3e 100644 |
| 594 | --- a/src/obj/tunnel.c |
| 595 | +++ b/src/obj/tunnel.c |
| 596 | @@ -564,5 +564,5 @@ struct obj_ops obj_ops_tunnel = { |
| 597 | .get = nftnl_obj_tunnel_get, |
| 598 | .parse = nftnl_obj_tunnel_parse, |
| 599 | .build = nftnl_obj_tunnel_build, |
| 600 | - .snprintf = nftnl_obj_tunnel_snprintf, |
| 601 | + .snprintf_ = nftnl_obj_tunnel_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 602 | }; |
| 603 | diff --git a/src/object.c b/src/object.c |
Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame^] | 604 | index d8c87ee..5307d7e 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 605 | --- a/src/object.c |
| 606 | +++ b/src/object.c |
Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame^] | 607 | @@ -370,7 +370,7 @@ static int nftnl_obj_snprintf_dflt(char *buf, size_t size, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 608 | SNPRINTF_BUFFER_SIZE(ret, remain, offset); |
| 609 | |
| 610 | if (obj->ops) { |
| 611 | - ret = obj->ops->snprintf(buf + offset, offset, type, flags, |
| 612 | + ret = obj->ops->snprintf_(buf + offset, offset, type, flags, |
| 613 | obj); |
| 614 | SNPRINTF_BUFFER_SIZE(ret, remain, offset); |
| 615 | } |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 616 | -- |
| 617 | 2.17.1 |
| 618 | |