Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 1 | From e03b003610a176d608da9a02e433e7ded7e4b75f Mon Sep 17 00:00:00 2001 |
| 2 | From: Todd Cunningham <tcunningham07@gmail.com> |
| 3 | Date: Wed, 11 Dec 2019 10:18:56 +1000 |
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 | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 13 | Signed-off-by: Todd Cunningham <tcunningham07@gmail.com> |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 14 | |
| 15 | Use wiggle to get the patch to apply for version 1.2.0. |
| 16 | |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 17 | Add the same change in src/expr/last.c to make the patch apply for |
| 18 | 1.2.1. Also correct the patch to show the original author and metadata. |
| 19 | |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 20 | Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 21 | --- |
| 22 | include/expr_ops.h | 2 +- |
| 23 | include/obj.h | 2 +- |
| 24 | src/expr.c | 4 ++-- |
| 25 | src/expr/bitwise.c | 2 +- |
| 26 | src/expr/byteorder.c | 2 +- |
| 27 | src/expr/cmp.c | 2 +- |
| 28 | src/expr/connlimit.c | 2 +- |
| 29 | src/expr/counter.c | 2 +- |
| 30 | src/expr/ct.c | 2 +- |
| 31 | src/expr/dup.c | 2 +- |
| 32 | src/expr/dynset.c | 2 +- |
| 33 | src/expr/exthdr.c | 2 +- |
| 34 | src/expr/fib.c | 2 +- |
| 35 | src/expr/flow_offload.c | 2 +- |
| 36 | src/expr/fwd.c | 2 +- |
| 37 | src/expr/hash.c | 2 +- |
| 38 | src/expr/immediate.c | 2 +- |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 39 | src/expr/last.c | 2 +- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 40 | src/expr/limit.c | 2 +- |
| 41 | src/expr/log.c | 2 +- |
| 42 | src/expr/lookup.c | 2 +- |
| 43 | src/expr/masq.c | 2 +- |
| 44 | src/expr/match.c | 2 +- |
| 45 | src/expr/meta.c | 2 +- |
| 46 | src/expr/nat.c | 2 +- |
| 47 | src/expr/numgen.c | 2 +- |
| 48 | src/expr/objref.c | 2 +- |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 49 | src/expr/osf.c | 2 +- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 50 | src/expr/payload.c | 2 +- |
| 51 | src/expr/queue.c | 2 +- |
| 52 | src/expr/quota.c | 2 +- |
| 53 | src/expr/range.c | 2 +- |
| 54 | src/expr/redir.c | 2 +- |
| 55 | src/expr/reject.c | 2 +- |
| 56 | src/expr/rt.c | 2 +- |
| 57 | src/expr/socket.c | 2 +- |
Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame] | 58 | src/expr/synproxy.c | 2 +- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 59 | src/expr/target.c | 2 +- |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 60 | src/expr/tproxy.c | 2 +- |
| 61 | src/expr/tunnel.c | 2 +- |
| 62 | src/expr/xfrm.c | 2 +- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 63 | src/obj/counter.c | 2 +- |
Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame] | 64 | src/obj/ct_expect.c | 2 +- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 65 | src/obj/ct_helper.c | 2 +- |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 66 | src/obj/ct_timeout.c | 2 +- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 67 | src/obj/limit.c | 2 +- |
| 68 | src/obj/quota.c | 2 +- |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 69 | src/obj/secmark.c | 2 +- |
Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 70 | src/obj/synproxy.c | 2 +- |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 71 | src/obj/tunnel.c | 2 +- |
| 72 | src/object.c | 2 +- |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 73 | 51 files changed, 52 insertions(+), 52 deletions(-) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 74 | |
| 75 | diff --git a/include/expr_ops.h b/include/expr_ops.h |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 76 | index 7a6aa23..d3a2855 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 77 | --- a/include/expr_ops.h |
| 78 | +++ b/include/expr_ops.h |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 79 | @@ -18,7 +18,7 @@ struct expr_ops { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 80 | const void *(*get)(const struct nftnl_expr *e, uint16_t type, uint32_t *data_len); |
| 81 | int (*parse)(struct nftnl_expr *e, struct nlattr *attr); |
| 82 | void (*build)(struct nlmsghdr *nlh, const struct nftnl_expr *e); |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 83 | - int (*snprintf)(char *buf, size_t len, uint32_t flags, const struct nftnl_expr *e); |
| 84 | + int (*snprintf_)(char *buf, size_t len, uint32_t flags, const struct nftnl_expr *e); |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 85 | }; |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 86 | |
| 87 | struct expr_ops *nftnl_expr_ops_lookup(const char *name); |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 88 | diff --git a/include/obj.h b/include/obj.h |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 89 | index 60dc853..1c1c3c1 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 90 | --- a/include/obj.h |
| 91 | +++ b/include/obj.h |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 92 | @@ -109,7 +109,7 @@ struct obj_ops { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 93 | const void *(*get)(const struct nftnl_obj *e, uint16_t type, uint32_t *data_len); |
| 94 | int (*parse)(struct nftnl_obj *e, struct nlattr *attr); |
| 95 | void (*build)(struct nlmsghdr *nlh, const struct nftnl_obj *e); |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 96 | - int (*snprintf)(char *buf, size_t len, uint32_t flags, const struct nftnl_obj *e); |
| 97 | + int (*snprintf_)(char *buf, size_t len, uint32_t flags, const struct nftnl_obj *e); |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 98 | }; |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 99 | |
| 100 | extern struct obj_ops obj_ops_counter; |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 101 | diff --git a/src/expr.c b/src/expr.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 102 | index 277bbde..2231b21 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 103 | --- a/src/expr.c |
| 104 | +++ b/src/expr.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 105 | @@ -279,10 +279,10 @@ int nftnl_expr_snprintf(char *buf, size_t remain, const struct nftnl_expr *expr, |
| 106 | if (remain) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 107 | buf[0] = '\0'; |
| 108 | |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 109 | - if (!expr->ops->snprintf || type != NFTNL_OUTPUT_DEFAULT) |
| 110 | + if (!expr->ops->snprintf_ || type != NFTNL_OUTPUT_DEFAULT) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 111 | return 0; |
| 112 | |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 113 | - ret = expr->ops->snprintf(buf + offset, remain, flags, expr); |
| 114 | + ret = expr->ops->snprintf_(buf + offset, remain, flags, expr); |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 115 | SNPRINTF_BUFFER_SIZE(ret, remain, offset); |
| 116 | |
| 117 | return offset; |
| 118 | diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 119 | index d0c7827..eded505 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 120 | --- a/src/expr/bitwise.c |
| 121 | +++ b/src/expr/bitwise.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 122 | @@ -282,5 +282,5 @@ struct expr_ops expr_ops_bitwise = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 123 | .get = nftnl_expr_bitwise_get, |
| 124 | .parse = nftnl_expr_bitwise_parse, |
| 125 | .build = nftnl_expr_bitwise_build, |
| 126 | - .snprintf = nftnl_expr_bitwise_snprintf, |
| 127 | + .snprintf_ = nftnl_expr_bitwise_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 128 | }; |
| 129 | diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 130 | index d299745..0068ab2 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 131 | --- a/src/expr/byteorder.c |
| 132 | +++ b/src/expr/byteorder.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 133 | @@ -220,5 +220,5 @@ struct expr_ops expr_ops_byteorder = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 134 | .get = nftnl_expr_byteorder_get, |
| 135 | .parse = nftnl_expr_byteorder_parse, |
| 136 | .build = nftnl_expr_byteorder_build, |
| 137 | - .snprintf = nftnl_expr_byteorder_snprintf, |
| 138 | + .snprintf_ = nftnl_expr_byteorder_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 139 | }; |
| 140 | diff --git a/src/expr/cmp.c b/src/expr/cmp.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 141 | index 6030693..7e548e6 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 142 | --- a/src/expr/cmp.c |
| 143 | +++ b/src/expr/cmp.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 144 | @@ -202,5 +202,5 @@ struct expr_ops expr_ops_cmp = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 145 | .get = nftnl_expr_cmp_get, |
| 146 | .parse = nftnl_expr_cmp_parse, |
| 147 | .build = nftnl_expr_cmp_build, |
| 148 | - .snprintf = nftnl_expr_cmp_snprintf, |
| 149 | + .snprintf_ = nftnl_expr_cmp_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 150 | }; |
| 151 | diff --git a/src/expr/connlimit.c b/src/expr/connlimit.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 152 | index 3b37587..39b7092 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 153 | --- a/src/expr/connlimit.c |
| 154 | +++ b/src/expr/connlimit.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 155 | @@ -135,5 +135,5 @@ struct expr_ops expr_ops_connlimit = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 156 | .get = nftnl_expr_connlimit_get, |
| 157 | .parse = nftnl_expr_connlimit_parse, |
| 158 | .build = nftnl_expr_connlimit_build, |
| 159 | - .snprintf = nftnl_expr_connlimit_snprintf, |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 160 | + .snprintf_ = nftnl_expr_connlimit_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 161 | }; |
| 162 | diff --git a/src/expr/counter.c b/src/expr/counter.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 163 | index 1676d70..42c96d9 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 164 | --- a/src/expr/counter.c |
| 165 | +++ b/src/expr/counter.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 166 | @@ -133,5 +133,5 @@ struct expr_ops expr_ops_counter = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 167 | .get = nftnl_expr_counter_get, |
| 168 | .parse = nftnl_expr_counter_parse, |
| 169 | .build = nftnl_expr_counter_build, |
| 170 | - .snprintf = nftnl_expr_counter_snprintf, |
| 171 | + .snprintf_ = nftnl_expr_counter_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 172 | }; |
| 173 | diff --git a/src/expr/ct.c b/src/expr/ct.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 174 | index d5dfc81..8c15db1 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 175 | --- a/src/expr/ct.c |
| 176 | +++ b/src/expr/ct.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 177 | @@ -258,5 +258,5 @@ struct expr_ops expr_ops_ct = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 178 | .get = nftnl_expr_ct_get, |
| 179 | .parse = nftnl_expr_ct_parse, |
| 180 | .build = nftnl_expr_ct_build, |
| 181 | - .snprintf = nftnl_expr_ct_snprintf, |
| 182 | + .snprintf_ = nftnl_expr_ct_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 183 | }; |
| 184 | diff --git a/src/expr/dup.c b/src/expr/dup.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 185 | index f041b55..6238a43 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 186 | --- a/src/expr/dup.c |
| 187 | +++ b/src/expr/dup.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 188 | @@ -138,5 +138,5 @@ struct expr_ops expr_ops_dup = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 189 | .get = nftnl_expr_dup_get, |
| 190 | .parse = nftnl_expr_dup_parse, |
| 191 | .build = nftnl_expr_dup_build, |
| 192 | - .snprintf = nftnl_expr_dup_snprintf, |
| 193 | + .snprintf_ = nftnl_expr_dup_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 194 | }; |
| 195 | diff --git a/src/expr/dynset.c b/src/expr/dynset.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 196 | index 85d64bb..9afbb94 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 197 | --- a/src/expr/dynset.c |
| 198 | +++ b/src/expr/dynset.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 199 | @@ -373,5 +373,5 @@ struct expr_ops expr_ops_dynset = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 200 | .get = nftnl_expr_dynset_get, |
| 201 | .parse = nftnl_expr_dynset_parse, |
| 202 | .build = nftnl_expr_dynset_build, |
| 203 | - .snprintf = nftnl_expr_dynset_snprintf, |
| 204 | + .snprintf_ = nftnl_expr_dynset_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 205 | }; |
| 206 | diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 207 | index 1b813b1..25f1491 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 208 | --- a/src/expr/exthdr.c |
| 209 | +++ b/src/expr/exthdr.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 210 | @@ -262,5 +262,5 @@ struct expr_ops expr_ops_exthdr = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 211 | .get = nftnl_expr_exthdr_get, |
| 212 | .parse = nftnl_expr_exthdr_parse, |
| 213 | .build = nftnl_expr_exthdr_build, |
| 214 | - .snprintf = nftnl_expr_exthdr_snprintf, |
| 215 | + .snprintf_ = nftnl_expr_exthdr_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 216 | }; |
| 217 | diff --git a/src/expr/fib.c b/src/expr/fib.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 218 | index aaff52a..3916e18 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 219 | --- a/src/expr/fib.c |
| 220 | +++ b/src/expr/fib.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 221 | @@ -198,5 +198,5 @@ struct expr_ops expr_ops_fib = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 222 | .get = nftnl_expr_fib_get, |
| 223 | .parse = nftnl_expr_fib_parse, |
| 224 | .build = nftnl_expr_fib_build, |
| 225 | - .snprintf = nftnl_expr_fib_snprintf, |
| 226 | + .snprintf_ = nftnl_expr_fib_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 227 | }; |
| 228 | diff --git a/src/expr/flow_offload.c b/src/expr/flow_offload.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 229 | index a826202..c1ca678 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 230 | --- a/src/expr/flow_offload.c |
| 231 | +++ b/src/expr/flow_offload.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 232 | @@ -120,5 +120,5 @@ struct expr_ops expr_ops_flow = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 233 | .get = nftnl_expr_flow_get, |
| 234 | .parse = nftnl_expr_flow_parse, |
| 235 | .build = nftnl_expr_flow_build, |
| 236 | - .snprintf = nftnl_expr_flow_snprintf, |
| 237 | + .snprintf_ = nftnl_expr_flow_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 238 | }; |
| 239 | diff --git a/src/expr/fwd.c b/src/expr/fwd.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 240 | index 82e5a41..4e80687 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 241 | --- a/src/expr/fwd.c |
| 242 | +++ b/src/expr/fwd.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 243 | @@ -158,5 +158,5 @@ struct expr_ops expr_ops_fwd = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 244 | .get = nftnl_expr_fwd_get, |
| 245 | .parse = nftnl_expr_fwd_parse, |
| 246 | .build = nftnl_expr_fwd_build, |
| 247 | - .snprintf = nftnl_expr_fwd_snprintf, |
| 248 | + .snprintf_ = nftnl_expr_fwd_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 249 | }; |
| 250 | diff --git a/src/expr/hash.c b/src/expr/hash.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 251 | index 10b4a72..84ace31 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 252 | --- a/src/expr/hash.c |
| 253 | +++ b/src/expr/hash.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 254 | @@ -226,5 +226,5 @@ struct expr_ops expr_ops_hash = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 255 | .get = nftnl_expr_hash_get, |
| 256 | .parse = nftnl_expr_hash_parse, |
| 257 | .build = nftnl_expr_hash_build, |
| 258 | - .snprintf = nftnl_expr_hash_snprintf, |
| 259 | + .snprintf_ = nftnl_expr_hash_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 260 | }; |
| 261 | diff --git a/src/expr/immediate.c b/src/expr/immediate.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 262 | index 94b043c..a8a3c1f 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 263 | --- a/src/expr/immediate.c |
| 264 | +++ b/src/expr/immediate.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 265 | @@ -229,5 +229,5 @@ struct expr_ops expr_ops_immediate = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 266 | .get = nftnl_expr_immediate_get, |
| 267 | .parse = nftnl_expr_immediate_parse, |
| 268 | .build = nftnl_expr_immediate_build, |
| 269 | - .snprintf = nftnl_expr_immediate_snprintf, |
| 270 | + .snprintf_ = nftnl_expr_immediate_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 271 | }; |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 272 | diff --git a/src/expr/last.c b/src/expr/last.c |
| 273 | index e2a60c4..2f75464 100644 |
| 274 | --- a/src/expr/last.c |
| 275 | +++ b/src/expr/last.c |
| 276 | @@ -134,5 +134,5 @@ struct expr_ops expr_ops_last = { |
| 277 | .get = nftnl_expr_last_get, |
| 278 | .parse = nftnl_expr_last_parse, |
| 279 | .build = nftnl_expr_last_build, |
| 280 | - .snprintf = nftnl_expr_last_snprintf, |
| 281 | + .snprintf_ = nftnl_expr_last_snprintf, |
| 282 | }; |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 283 | diff --git a/src/expr/limit.c b/src/expr/limit.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 284 | index 3dfd54a..f652df0 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 285 | --- a/src/expr/limit.c |
| 286 | +++ b/src/expr/limit.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 287 | @@ -202,5 +202,5 @@ struct expr_ops expr_ops_limit = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 288 | .get = nftnl_expr_limit_get, |
| 289 | .parse = nftnl_expr_limit_parse, |
| 290 | .build = nftnl_expr_limit_build, |
| 291 | - .snprintf = nftnl_expr_limit_snprintf, |
| 292 | + .snprintf_ = nftnl_expr_limit_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 293 | }; |
| 294 | diff --git a/src/expr/log.c b/src/expr/log.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 295 | index 86db548..d96b7ce 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 296 | --- a/src/expr/log.c |
| 297 | +++ b/src/expr/log.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 298 | @@ -253,5 +253,5 @@ struct expr_ops expr_ops_log = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 299 | .get = nftnl_expr_log_get, |
| 300 | .parse = nftnl_expr_log_parse, |
| 301 | .build = nftnl_expr_log_build, |
| 302 | - .snprintf = nftnl_expr_log_snprintf, |
| 303 | + .snprintf_ = nftnl_expr_log_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 304 | }; |
| 305 | diff --git a/src/expr/lookup.c b/src/expr/lookup.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 306 | index 83adce9..1fbace4 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 307 | --- a/src/expr/lookup.c |
| 308 | +++ b/src/expr/lookup.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 309 | @@ -206,5 +206,5 @@ struct expr_ops expr_ops_lookup = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 310 | .get = nftnl_expr_lookup_get, |
| 311 | .parse = nftnl_expr_lookup_parse, |
| 312 | .build = nftnl_expr_lookup_build, |
| 313 | - .snprintf = nftnl_expr_lookup_snprintf, |
| 314 | + .snprintf_ = nftnl_expr_lookup_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 315 | }; |
| 316 | diff --git a/src/expr/masq.c b/src/expr/masq.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 317 | index 684708c..1ce099c 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 318 | --- a/src/expr/masq.c |
| 319 | +++ b/src/expr/masq.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 320 | @@ -163,5 +163,5 @@ struct expr_ops expr_ops_masq = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 321 | .get = nftnl_expr_masq_get, |
| 322 | .parse = nftnl_expr_masq_parse, |
| 323 | .build = nftnl_expr_masq_build, |
| 324 | - .snprintf = nftnl_expr_masq_snprintf, |
| 325 | + .snprintf_ = nftnl_expr_masq_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 326 | }; |
| 327 | diff --git a/src/expr/match.c b/src/expr/match.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 328 | index 533fdf5..8561986 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 329 | --- a/src/expr/match.c |
| 330 | +++ b/src/expr/match.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 331 | @@ -189,5 +189,5 @@ struct expr_ops expr_ops_match = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 332 | .get = nftnl_expr_match_get, |
| 333 | .parse = nftnl_expr_match_parse, |
| 334 | .build = nftnl_expr_match_build, |
| 335 | - .snprintf = nftnl_expr_match_snprintf, |
| 336 | + .snprintf_ = nftnl_expr_match_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 337 | }; |
| 338 | diff --git a/src/expr/meta.c b/src/expr/meta.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 339 | index 34fbb9b..1ef79a4 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 340 | --- a/src/expr/meta.c |
| 341 | +++ b/src/expr/meta.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 342 | @@ -216,5 +216,5 @@ struct expr_ops expr_ops_meta = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 343 | .get = nftnl_expr_meta_get, |
| 344 | .parse = nftnl_expr_meta_parse, |
| 345 | .build = nftnl_expr_meta_build, |
| 346 | - .snprintf = nftnl_expr_meta_snprintf, |
| 347 | + .snprintf_ = nftnl_expr_meta_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 348 | }; |
| 349 | diff --git a/src/expr/nat.c b/src/expr/nat.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 350 | index 0a9cdd7..bc4a3fa 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 351 | --- a/src/expr/nat.c |
| 352 | +++ b/src/expr/nat.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 353 | @@ -274,5 +274,5 @@ struct expr_ops expr_ops_nat = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 354 | .get = nftnl_expr_nat_get, |
| 355 | .parse = nftnl_expr_nat_parse, |
| 356 | .build = nftnl_expr_nat_build, |
| 357 | - .snprintf = nftnl_expr_nat_snprintf, |
| 358 | + .snprintf_ = nftnl_expr_nat_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 359 | }; |
| 360 | diff --git a/src/expr/numgen.c b/src/expr/numgen.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 361 | index 159dfec..99bb442 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 362 | --- a/src/expr/numgen.c |
| 363 | +++ b/src/expr/numgen.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 364 | @@ -180,5 +180,5 @@ struct expr_ops expr_ops_ng = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 365 | .get = nftnl_expr_ng_get, |
| 366 | .parse = nftnl_expr_ng_parse, |
| 367 | .build = nftnl_expr_ng_build, |
| 368 | - .snprintf = nftnl_expr_ng_snprintf, |
| 369 | + .snprintf_ = nftnl_expr_ng_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 370 | }; |
| 371 | diff --git a/src/expr/objref.c b/src/expr/objref.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 372 | index a4b6470..1b2d387 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 373 | --- a/src/expr/objref.c |
| 374 | +++ b/src/expr/objref.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 375 | @@ -205,5 +205,5 @@ struct expr_ops expr_ops_objref = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 376 | .get = nftnl_expr_objref_get, |
| 377 | .parse = nftnl_expr_objref_parse, |
| 378 | .build = nftnl_expr_objref_build, |
| 379 | - .snprintf = nftnl_expr_objref_snprintf, |
| 380 | + .snprintf_ = nftnl_expr_objref_snprintf, |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 381 | }; |
| 382 | diff --git a/src/expr/osf.c b/src/expr/osf.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 383 | index 215a681..75a6b3c 100644 |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 384 | --- a/src/expr/osf.c |
| 385 | +++ b/src/expr/osf.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 386 | @@ -147,5 +147,5 @@ struct expr_ops expr_ops_osf = { |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 387 | .get = nftnl_expr_osf_get, |
| 388 | .parse = nftnl_expr_osf_parse, |
| 389 | .build = nftnl_expr_osf_build, |
| 390 | - .snprintf = nftnl_expr_osf_snprintf, |
| 391 | + .snprintf_ = nftnl_expr_osf_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 392 | }; |
| 393 | diff --git a/src/expr/payload.c b/src/expr/payload.c |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 394 | index 82747ec..e9130ec 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 395 | --- a/src/expr/payload.c |
| 396 | +++ b/src/expr/payload.c |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 397 | @@ -259,5 +259,5 @@ struct expr_ops expr_ops_payload = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 398 | .get = nftnl_expr_payload_get, |
| 399 | .parse = nftnl_expr_payload_parse, |
| 400 | .build = nftnl_expr_payload_build, |
| 401 | - .snprintf = nftnl_expr_payload_snprintf, |
| 402 | + .snprintf_ = nftnl_expr_payload_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 403 | }; |
| 404 | diff --git a/src/expr/queue.c b/src/expr/queue.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 405 | index 8f70977..6bc76ef 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 406 | --- a/src/expr/queue.c |
| 407 | +++ b/src/expr/queue.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 408 | @@ -193,5 +193,5 @@ struct expr_ops expr_ops_queue = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 409 | .get = nftnl_expr_queue_get, |
| 410 | .parse = nftnl_expr_queue_parse, |
| 411 | .build = nftnl_expr_queue_build, |
| 412 | - .snprintf = nftnl_expr_queue_snprintf, |
| 413 | + .snprintf_ = nftnl_expr_queue_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 414 | }; |
| 415 | diff --git a/src/expr/quota.c b/src/expr/quota.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 416 | index 8c841d8..1a5f2fa 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 417 | --- a/src/expr/quota.c |
| 418 | +++ b/src/expr/quota.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 419 | @@ -147,5 +147,5 @@ struct expr_ops expr_ops_quota = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 420 | .get = nftnl_expr_quota_get, |
| 421 | .parse = nftnl_expr_quota_parse, |
| 422 | .build = nftnl_expr_quota_build, |
| 423 | - .snprintf = nftnl_expr_quota_snprintf, |
| 424 | + .snprintf_ = nftnl_expr_quota_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 425 | }; |
| 426 | diff --git a/src/expr/range.c b/src/expr/range.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 427 | index f76843a..73a1930 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 428 | --- a/src/expr/range.c |
| 429 | +++ b/src/expr/range.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 430 | @@ -213,5 +213,5 @@ struct expr_ops expr_ops_range = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 431 | .get = nftnl_expr_range_get, |
| 432 | .parse = nftnl_expr_range_parse, |
| 433 | .build = nftnl_expr_range_build, |
| 434 | - .snprintf = nftnl_expr_range_snprintf, |
| 435 | + .snprintf_ = nftnl_expr_range_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 436 | }; |
| 437 | diff --git a/src/expr/redir.c b/src/expr/redir.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 438 | index 4f56cb4..51ec71c 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 439 | --- a/src/expr/redir.c |
| 440 | +++ b/src/expr/redir.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 441 | @@ -167,5 +167,5 @@ struct expr_ops expr_ops_redir = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 442 | .get = nftnl_expr_redir_get, |
| 443 | .parse = nftnl_expr_redir_parse, |
| 444 | .build = nftnl_expr_redir_build, |
| 445 | - .snprintf = nftnl_expr_redir_snprintf, |
| 446 | + .snprintf_ = nftnl_expr_redir_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 447 | }; |
| 448 | diff --git a/src/expr/reject.c b/src/expr/reject.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 449 | index 716d25c..acf32c2 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 450 | --- a/src/expr/reject.c |
| 451 | +++ b/src/expr/reject.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 452 | @@ -134,5 +134,5 @@ struct expr_ops expr_ops_reject = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 453 | .get = nftnl_expr_reject_get, |
| 454 | .parse = nftnl_expr_reject_parse, |
| 455 | .build = nftnl_expr_reject_build, |
| 456 | - .snprintf = nftnl_expr_reject_snprintf, |
| 457 | + .snprintf_ = nftnl_expr_reject_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 458 | }; |
| 459 | diff --git a/src/expr/rt.c b/src/expr/rt.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 460 | index 1ad9b2a..9f2fdf3 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 461 | --- a/src/expr/rt.c |
| 462 | +++ b/src/expr/rt.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 463 | @@ -162,5 +162,5 @@ struct expr_ops expr_ops_rt = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 464 | .get = nftnl_expr_rt_get, |
| 465 | .parse = nftnl_expr_rt_parse, |
| 466 | .build = nftnl_expr_rt_build, |
| 467 | - .snprintf = nftnl_expr_rt_snprintf, |
| 468 | + .snprintf_ = nftnl_expr_rt_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 469 | }; |
| 470 | diff --git a/src/expr/socket.c b/src/expr/socket.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 471 | index 02d86f8..49a126b 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 472 | --- a/src/expr/socket.c |
| 473 | +++ b/src/expr/socket.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 474 | @@ -165,5 +165,5 @@ struct expr_ops expr_ops_socket = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 475 | .get = nftnl_expr_socket_get, |
| 476 | .parse = nftnl_expr_socket_parse, |
| 477 | .build = nftnl_expr_socket_build, |
| 478 | - .snprintf = nftnl_expr_socket_snprintf, |
| 479 | + .snprintf_ = nftnl_expr_socket_snprintf, |
| 480 | }; |
Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame] | 481 | diff --git a/src/expr/synproxy.c b/src/expr/synproxy.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 482 | index 630f3f4..b22ad2f 100644 |
Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame] | 483 | --- a/src/expr/synproxy.c |
| 484 | +++ b/src/expr/synproxy.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 485 | @@ -152,5 +152,5 @@ struct expr_ops expr_ops_synproxy = { |
Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame] | 486 | .get = nftnl_expr_synproxy_get, |
| 487 | .parse = nftnl_expr_synproxy_parse, |
| 488 | .build = nftnl_expr_synproxy_build, |
| 489 | - .snprintf = nftnl_expr_synproxy_snprintf, |
| 490 | + .snprintf_ = nftnl_expr_synproxy_snprintf, |
| 491 | }; |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 492 | diff --git a/src/expr/target.c b/src/expr/target.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 493 | index b7c595a..31a039c 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 494 | --- a/src/expr/target.c |
| 495 | +++ b/src/expr/target.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 496 | @@ -189,5 +189,5 @@ struct expr_ops expr_ops_target = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 497 | .get = nftnl_expr_target_get, |
| 498 | .parse = nftnl_expr_target_parse, |
| 499 | .build = nftnl_expr_target_build, |
| 500 | - .snprintf = nftnl_expr_target_snprintf, |
| 501 | + .snprintf_ = nftnl_expr_target_snprintf, |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 502 | }; |
| 503 | diff --git a/src/expr/tproxy.c b/src/expr/tproxy.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 504 | index d3ee8f8..1b01591 100644 |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 505 | --- a/src/expr/tproxy.c |
| 506 | +++ b/src/expr/tproxy.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 507 | @@ -170,5 +170,5 @@ struct expr_ops expr_ops_tproxy = { |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 508 | .get = nftnl_expr_tproxy_get, |
| 509 | .parse = nftnl_expr_tproxy_parse, |
| 510 | .build = nftnl_expr_tproxy_build, |
| 511 | - .snprintf = nftnl_expr_tproxy_snprintf, |
| 512 | + .snprintf_ = nftnl_expr_tproxy_snprintf, |
| 513 | }; |
| 514 | diff --git a/src/expr/tunnel.c b/src/expr/tunnel.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 515 | index 1460fd2..6c2f653 100644 |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 516 | --- a/src/expr/tunnel.c |
| 517 | +++ b/src/expr/tunnel.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 518 | @@ -145,5 +145,5 @@ struct expr_ops expr_ops_tunnel = { |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 519 | .get = nftnl_expr_tunnel_get, |
| 520 | .parse = nftnl_expr_tunnel_parse, |
| 521 | .build = nftnl_expr_tunnel_build, |
| 522 | - .snprintf = nftnl_expr_tunnel_snprintf, |
| 523 | + .snprintf_ = nftnl_expr_tunnel_snprintf, |
| 524 | }; |
| 525 | diff --git a/src/expr/xfrm.c b/src/expr/xfrm.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 526 | index c81d14d..e648ee5 100644 |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 527 | --- a/src/expr/xfrm.c |
| 528 | +++ b/src/expr/xfrm.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 529 | @@ -196,5 +196,5 @@ struct expr_ops expr_ops_xfrm = { |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 530 | .get = nftnl_expr_xfrm_get, |
| 531 | .parse = nftnl_expr_xfrm_parse, |
| 532 | .build = nftnl_expr_xfrm_build, |
| 533 | - .snprintf = nftnl_expr_xfrm_snprintf, |
| 534 | + .snprintf_ = nftnl_expr_xfrm_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 535 | }; |
| 536 | diff --git a/src/obj/counter.c b/src/obj/counter.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 537 | index ef0cd20..0c199f7 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 538 | --- a/src/obj/counter.c |
| 539 | +++ b/src/obj/counter.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 540 | @@ -127,5 +127,5 @@ struct obj_ops obj_ops_counter = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 541 | .get = nftnl_obj_counter_get, |
| 542 | .parse = nftnl_obj_counter_parse, |
| 543 | .build = nftnl_obj_counter_build, |
| 544 | - .snprintf = nftnl_obj_counter_snprintf, |
| 545 | + .snprintf_ = nftnl_obj_counter_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 546 | }; |
Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame] | 547 | diff --git a/src/obj/ct_expect.c b/src/obj/ct_expect.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 548 | index 8136ad9..b3e1d70 100644 |
Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame] | 549 | --- a/src/obj/ct_expect.c |
| 550 | +++ b/src/obj/ct_expect.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 551 | @@ -196,5 +196,5 @@ struct obj_ops obj_ops_ct_expect = { |
Brad Bishop | 665fd02 | 2019-08-26 01:32:28 -0400 | [diff] [blame] | 552 | .get = nftnl_obj_ct_expect_get, |
| 553 | .parse = nftnl_obj_ct_expect_parse, |
| 554 | .build = nftnl_obj_ct_expect_build, |
| 555 | - .snprintf = nftnl_obj_ct_expect_snprintf, |
| 556 | + .snprintf_ = nftnl_obj_ct_expect_snprintf, |
| 557 | }; |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 558 | diff --git a/src/obj/ct_helper.c b/src/obj/ct_helper.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 559 | index c52032a..12b783c 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 560 | --- a/src/obj/ct_helper.c |
| 561 | +++ b/src/obj/ct_helper.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 562 | @@ -150,5 +150,5 @@ struct obj_ops obj_ops_ct_helper = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 563 | .get = nftnl_obj_ct_helper_get, |
| 564 | .parse = nftnl_obj_ct_helper_parse, |
| 565 | .build = nftnl_obj_ct_helper_build, |
| 566 | - .snprintf = nftnl_obj_ct_helper_snprintf, |
| 567 | + .snprintf_ = nftnl_obj_ct_helper_snprintf, |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 568 | }; |
| 569 | diff --git a/src/obj/ct_timeout.c b/src/obj/ct_timeout.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 570 | index 1d4f8fb..0a12883 100644 |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 571 | --- a/src/obj/ct_timeout.c |
| 572 | +++ b/src/obj/ct_timeout.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 573 | @@ -316,5 +316,5 @@ struct obj_ops obj_ops_ct_timeout = { |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 574 | .get = nftnl_obj_ct_timeout_get, |
| 575 | .parse = nftnl_obj_ct_timeout_parse, |
| 576 | .build = nftnl_obj_ct_timeout_build, |
| 577 | - .snprintf = nftnl_obj_ct_timeout_snprintf, |
| 578 | + .snprintf_ = nftnl_obj_ct_timeout_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 579 | }; |
| 580 | diff --git a/src/obj/limit.c b/src/obj/limit.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 581 | index 8b40f9d..2f049b8 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 582 | --- a/src/obj/limit.c |
| 583 | +++ b/src/obj/limit.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 584 | @@ -168,5 +168,5 @@ struct obj_ops obj_ops_limit = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 585 | .get = nftnl_obj_limit_get, |
| 586 | .parse = nftnl_obj_limit_parse, |
| 587 | .build = nftnl_obj_limit_build, |
| 588 | - .snprintf = nftnl_obj_limit_snprintf, |
| 589 | + .snprintf_ = nftnl_obj_limit_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 590 | }; |
| 591 | diff --git a/src/obj/quota.c b/src/obj/quota.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 592 | index 8ab3300..8666334 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 593 | --- a/src/obj/quota.c |
| 594 | +++ b/src/obj/quota.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 595 | @@ -144,5 +144,5 @@ struct obj_ops obj_ops_quota = { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 596 | .get = nftnl_obj_quota_get, |
| 597 | .parse = nftnl_obj_quota_parse, |
| 598 | .build = nftnl_obj_quota_build, |
| 599 | - .snprintf = nftnl_obj_quota_snprintf, |
| 600 | + .snprintf_ = nftnl_obj_quota_snprintf, |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 601 | }; |
| 602 | diff --git a/src/obj/secmark.c b/src/obj/secmark.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 603 | index 2ccc803..e96e06f 100644 |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 604 | --- a/src/obj/secmark.c |
| 605 | +++ b/src/obj/secmark.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 606 | @@ -116,5 +116,5 @@ struct obj_ops obj_ops_secmark = { |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 607 | .get = nftnl_obj_secmark_get, |
| 608 | .parse = nftnl_obj_secmark_parse, |
| 609 | .build = nftnl_obj_secmark_build, |
| 610 | - .snprintf = nftnl_obj_secmark_snprintf, |
| 611 | + .snprintf_ = nftnl_obj_secmark_snprintf, |
| 612 | }; |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 613 | diff --git a/src/obj/synproxy.c b/src/obj/synproxy.c |
| 614 | index d689fee..d06cb6d 100644 |
| 615 | --- a/src/obj/synproxy.c |
| 616 | +++ b/src/obj/synproxy.c |
| 617 | @@ -143,5 +143,5 @@ struct obj_ops obj_ops_synproxy = { |
| 618 | .get = nftnl_obj_synproxy_get, |
| 619 | .parse = nftnl_obj_synproxy_parse, |
| 620 | .build = nftnl_obj_synproxy_build, |
| 621 | - .snprintf = nftnl_obj_synproxy_snprintf, |
| 622 | + .snprintf_ = nftnl_obj_synproxy_snprintf, |
| 623 | }; |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 624 | diff --git a/src/obj/tunnel.c b/src/obj/tunnel.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 625 | index 5ede6bd..d3743ff 100644 |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 626 | --- a/src/obj/tunnel.c |
| 627 | +++ b/src/obj/tunnel.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 628 | @@ -547,5 +547,5 @@ struct obj_ops obj_ops_tunnel = { |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 629 | .get = nftnl_obj_tunnel_get, |
| 630 | .parse = nftnl_obj_tunnel_parse, |
| 631 | .build = nftnl_obj_tunnel_build, |
| 632 | - .snprintf = nftnl_obj_tunnel_snprintf, |
| 633 | + .snprintf_ = nftnl_obj_tunnel_snprintf, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 634 | }; |
| 635 | diff --git a/src/object.c b/src/object.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 636 | index 46e208b..d321c50 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 637 | --- a/src/object.c |
| 638 | +++ b/src/object.c |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 639 | @@ -396,7 +396,7 @@ static int nftnl_obj_snprintf_dflt(char *buf, size_t remain, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 640 | SNPRINTF_BUFFER_SIZE(ret, remain, offset); |
| 641 | |
| 642 | if (obj->ops) { |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 643 | - ret = obj->ops->snprintf(buf + offset, remain, flags, obj); |
| 644 | + ret = obj->ops->snprintf_(buf + offset, remain, flags, obj); |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 645 | SNPRINTF_BUFFER_SIZE(ret, remain, offset); |
| 646 | } |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 647 | ret = snprintf(buf + offset, remain, "]"); |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 648 | -- |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 649 | 2.33.1 |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 650 | |