blob: 0453b1b496854db1826b239d587f1e01a2c2dbeb [file] [log] [blame]
Brad Bishop6e60e8b2018-02-01 10:27:11 -05001Taken from
2https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=755956
3
4--- ./src/expr_ops.h 2014-06-24 17:07:05.574784704 +0400
5+++ ../libnftnl-1.0.2-my/./src/expr_ops.h 2014-07-25 00:19:28.367694613 +0400
6@@ -28,7 +28,7 @@
7 const void *(*get)(const struct nft_rule_expr *e, uint16_t type, uint32_t *data_len);
8 int (*parse)(struct nft_rule_expr *e, struct nlattr *attr);
9 void (*build)(struct nlmsghdr *nlh, struct nft_rule_expr *e);
10- int (*snprintf)(char *buf, size_t len, uint32_t type, uint32_t flags, struct nft_rule_expr *e);
11+ int (*snprintf_)(char *buf, size_t len, uint32_t type, uint32_t flags, struct nft_rule_expr *e);
12 int (*xml_parse)(struct nft_rule_expr *e, mxml_node_t *tree,
13 struct nft_parse_err *err);
14 int (*json_parse)(struct nft_rule_expr *e, json_t *data,
15--- ./src/rule.c 2014-06-24 17:07:05.574784704 +0400
16+++ ../libnftnl-1.0.2-my/./src/rule.c 2014-07-25 00:19:28.355694880 +0400
17@@ -813,7 +813,7 @@
18 "{\"type\":\"%s\",", expr->ops->name);
19 SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
20
21- ret = expr->ops->snprintf(buf+offset, len, type, flags, expr);
22+ ret = expr->ops->snprintf_(buf+offset, len, type, flags, expr);
23 SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
24
25 /*
26--- ./src/expr.c 2014-06-24 17:07:05.574784704 +0400
27+++ ../libnftnl-1.0.2-my/./src/expr.c 2014-07-25 00:19:27.367716863 +0400
28@@ -227,7 +227,7 @@
29 int ret;
30 unsigned int offset = 0, len = size;
31
32- ret = expr->ops->snprintf(buf+offset, len, type, flags, expr);
33+ ret = expr->ops->snprintf_(buf+offset, len, type, flags, expr);
34 SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
35
36 return offset;
37--- ./src/expr/exthdr.c 2014-06-25 18:34:08.174284719 +0400
38+++ ../libnftnl-1.0.2-my/./src/expr/exthdr.c 2014-07-25 00:21:48.192583628 +0400
39@@ -362,7 +362,7 @@
40 .get = nft_rule_expr_exthdr_get,
41 .parse = nft_rule_expr_exthdr_parse,
42 .build = nft_rule_expr_exthdr_build,
43- .snprintf = nft_rule_expr_exthdr_snprintf,
44+ .snprintf_ = nft_rule_expr_exthdr_snprintf,
45 .xml_parse = nft_rule_expr_exthdr_xml_parse,
46 .json_parse = nft_rule_expr_exthdr_json_parse,
47 };
48--- ./src/expr/log.c 2014-06-25 18:34:08.178284810 +0400
49+++ ../libnftnl-1.0.2-my/./src/expr/log.c 2014-07-25 00:21:48.160584340 +0400
50@@ -332,7 +332,7 @@
51 .get = nft_rule_expr_log_get,
52 .parse = nft_rule_expr_log_parse,
53 .build = nft_rule_expr_log_build,
54- .snprintf = nft_rule_expr_log_snprintf,
55+ .snprintf_ = nft_rule_expr_log_snprintf,
56 .xml_parse = nft_rule_expr_log_xml_parse,
57 .json_parse = nft_rule_expr_log_json_parse,
58 };
59--- ./src/expr/limit.c 2014-06-25 18:34:08.178284810 +0400
60+++ ../libnftnl-1.0.2-my/./src/expr/limit.c 2014-07-25 00:21:48.108585496 +0400
61@@ -250,7 +250,7 @@
62 .get = nft_rule_expr_limit_get,
63 .parse = nft_rule_expr_limit_parse,
64 .build = nft_rule_expr_limit_build,
65- .snprintf = nft_rule_expr_limit_snprintf,
66+ .snprintf_ = nft_rule_expr_limit_snprintf,
67 .xml_parse = nft_rule_expr_limit_xml_parse,
68 .json_parse = nft_rule_expr_limit_json_parse,
69 };
70--- ./src/expr/cmp.c 2014-06-25 18:34:08.174284719 +0400
71+++ ../libnftnl-1.0.2-my/./src/expr/cmp.c 2014-07-25 00:21:48.172584073 +0400
72@@ -331,7 +331,7 @@
73 .get = nft_rule_expr_cmp_get,
74 .parse = nft_rule_expr_cmp_parse,
75 .build = nft_rule_expr_cmp_build,
76- .snprintf = nft_rule_expr_cmp_snprintf,
77+ .snprintf_ = nft_rule_expr_cmp_snprintf,
78 .xml_parse = nft_rule_expr_cmp_xml_parse,
79 .json_parse = nft_rule_expr_cmp_json_parse,
80 };
81--- ./src/expr/target.c 2014-06-25 18:34:08.182284901 +0400
82+++ ../libnftnl-1.0.2-my/./src/expr/target.c 2014-07-25 00:21:48.184583806 +0400
83@@ -274,7 +274,7 @@
84 .get = nft_rule_expr_target_get,
85 .parse = nft_rule_expr_target_parse,
86 .build = nft_rule_expr_target_build,
87- .snprintf = nft_rule_expr_target_snprintf,
88+ .snprintf_ = nft_rule_expr_target_snprintf,
89 .xml_parse = nft_rule_expr_target_xml_parse,
90 .json_parse = nft_rule_expr_target_json_parse,
91 };
92--- ./src/expr/byteorder.c 2014-06-25 18:34:08.158284356 +0400
93+++ ../libnftnl-1.0.2-my/./src/expr/byteorder.c 2014-07-25 00:21:48.148584607 +0400
94@@ -384,7 +384,7 @@
95 .get = nft_rule_expr_byteorder_get,
96 .parse = nft_rule_expr_byteorder_parse,
97 .build = nft_rule_expr_byteorder_build,
98- .snprintf = nft_rule_expr_byteorder_snprintf,
99+ .snprintf_ = nft_rule_expr_byteorder_snprintf,
100 .xml_parse = nft_rule_expr_byteorder_xml_parse,
101 .json_parse = nft_rule_expr_byteorder_json_parse,
102 };
103--- ./src/expr/lookup.c 2014-06-25 18:34:08.178284810 +0400
104+++ ../libnftnl-1.0.2-my/./src/expr/lookup.c 2014-07-25 00:21:48.136584874 +0400
105@@ -305,7 +305,7 @@
106 .get = nft_rule_expr_lookup_get,
107 .parse = nft_rule_expr_lookup_parse,
108 .build = nft_rule_expr_lookup_build,
109- .snprintf = nft_rule_expr_lookup_snprintf,
110+ .snprintf_ = nft_rule_expr_lookup_snprintf,
111 .xml_parse = nft_rule_expr_lookup_xml_parse,
112 .json_parse = nft_rule_expr_lookup_json_parse,
113 };
114--- ./src/expr/immediate.c 2014-06-25 18:34:08.178284810 +0400
115+++ ../libnftnl-1.0.2-my/./src/expr/immediate.c 2014-07-25 00:21:48.124585141 +0400
116@@ -365,7 +365,7 @@
117 .get = nft_rule_expr_immediate_get,
118 .parse = nft_rule_expr_immediate_parse,
119 .build = nft_rule_expr_immediate_build,
120- .snprintf = nft_rule_expr_immediate_snprintf,
121+ .snprintf_ = nft_rule_expr_immediate_snprintf,
122 .xml_parse = nft_rule_expr_immediate_xml_parse,
123 .json_parse = nft_rule_expr_immediate_json_parse,
124 };
125--- ./src/expr/meta.c 2014-06-25 18:34:08.178284810 +0400
126+++ ../libnftnl-1.0.2-my/./src/expr/meta.c 2014-07-25 00:21:48.040587008 +0400
127@@ -340,7 +340,7 @@
128 .get = nft_rule_expr_meta_get,
129 .parse = nft_rule_expr_meta_parse,
130 .build = nft_rule_expr_meta_build,
131- .snprintf = nft_rule_expr_meta_snprintf,
132+ .snprintf_ = nft_rule_expr_meta_snprintf,
133 .xml_parse = nft_rule_expr_meta_xml_parse,
134 .json_parse = nft_rule_expr_meta_json_parse,
135 };
136--- ./src/expr/queue.c 2014-06-25 18:34:08.182284901 +0400
137+++ ../libnftnl-1.0.2-my/./src/expr/queue.c 2014-07-25 00:21:48.208583272 +0400
138@@ -294,7 +294,7 @@
139 .get = nft_rule_expr_queue_get,
140 .parse = nft_rule_expr_queue_parse,
141 .build = nft_rule_expr_queue_build,
142- .snprintf = nft_rule_expr_queue_snprintf,
143+ .snprintf_ = nft_rule_expr_queue_snprintf,
144 .xml_parse = nft_rule_expr_queue_xml_parse,
145 .json_parse = nft_rule_expr_queue_json_parse,
146 };
147--- ./src/expr/nat.c 2014-06-25 18:34:08.182284901 +0400
148+++ ../libnftnl-1.0.2-my/./src/expr/nat.c 2014-07-25 00:21:48.084586030 +0400
149@@ -430,7 +430,7 @@
150 .get = nft_rule_expr_nat_get,
151 .parse = nft_rule_expr_nat_parse,
152 .build = nft_rule_expr_nat_build,
153- .snprintf = nft_rule_expr_nat_snprintf,
154+ .snprintf_ = nft_rule_expr_nat_snprintf,
155 .xml_parse = nft_rule_expr_nat_xml_parse,
156 .json_parse = nft_rule_expr_nat_json_parse,
157 };
158--- ./src/expr/payload.c 2014-06-25 18:34:08.182284901 +0400
159+++ ../libnftnl-1.0.2-my/./src/expr/payload.c 2014-07-25 00:21:48.200583450 +0400
160@@ -337,7 +337,7 @@
161 .get = nft_rule_expr_payload_get,
162 .parse = nft_rule_expr_payload_parse,
163 .build = nft_rule_expr_payload_build,
164- .snprintf = nft_rule_expr_payload_snprintf,
165+ .snprintf_ = nft_rule_expr_payload_snprintf,
166 .xml_parse = nft_rule_expr_payload_xml_parse,
167 .json_parse = nft_rule_expr_payload_json_parse,
168 };
169--- ./src/expr/reject.c 2014-06-25 18:34:08.182284901 +0400
170+++ ../libnftnl-1.0.2-my/./src/expr/reject.c 2014-07-25 00:21:48.096585762 +0400
171@@ -242,7 +242,7 @@
172 .get = nft_rule_expr_reject_get,
173 .parse = nft_rule_expr_reject_parse,
174 .build = nft_rule_expr_reject_build,
175- .snprintf = nft_rule_expr_reject_snprintf,
176+ .snprintf_ = nft_rule_expr_reject_snprintf,
177 .xml_parse = nft_rule_expr_reject_xml_parse,
178 .json_parse = nft_rule_expr_reject_json_parse,
179 };
180--- ./src/expr/counter.c 2014-06-25 18:34:08.174284719 +0400
181+++ ../libnftnl-1.0.2-my/./src/expr/counter.c 2014-07-25 00:21:48.056586652 +0400
182@@ -236,7 +236,7 @@
183 .get = nft_rule_expr_counter_get,
184 .parse = nft_rule_expr_counter_parse,
185 .build = nft_rule_expr_counter_build,
186- .snprintf = nft_rule_expr_counter_snprintf,
187+ .snprintf_ = nft_rule_expr_counter_snprintf,
188 .xml_parse = nft_rule_expr_counter_xml_parse,
189 .json_parse = nft_rule_expr_counter_json_parse,
190 };
191--- ./src/expr/ct.c 2014-06-25 18:34:08.174284719 +0400
192+++ ../libnftnl-1.0.2-my/./src/expr/ct.c 2014-07-25 00:21:48.068586385 +0400
193@@ -428,7 +428,7 @@
194 .get = nft_rule_expr_ct_get,
195 .parse = nft_rule_expr_ct_parse,
196 .build = nft_rule_expr_ct_build,
197- .snprintf = nft_rule_expr_ct_snprintf,
198+ .snprintf_ = nft_rule_expr_ct_snprintf,
199 .xml_parse = nft_rule_expr_ct_xml_parse,
200 .json_parse = nft_rule_expr_ct_json_parse,
201 };
202--- ./src/expr/bitwise.c 2014-06-25 18:34:08.158284356 +0400
203+++ ../libnftnl-1.0.2-my/./src/expr/bitwise.c 2014-07-25 00:21:49.272559599 +0400
204@@ -403,7 +403,7 @@
205 .get = nft_rule_expr_bitwise_get,
206 .parse = nft_rule_expr_bitwise_parse,
207 .build = nft_rule_expr_bitwise_build,
208- .snprintf = nft_rule_expr_bitwise_snprintf,
209+ .snprintf_ = nft_rule_expr_bitwise_snprintf,
210 .xml_parse = nft_rule_expr_bitwise_xml_parse,
211 .json_parse = nft_rule_expr_bitwise_json_parse,
212 };
213--- ./src/expr/match.c 2014-06-25 18:34:08.178284810 +0400
214+++ ../libnftnl-1.0.2-my/./src/expr/match.c 2014-07-25 00:21:48.032587186 +0400
215@@ -273,7 +273,7 @@
216 .get = nft_rule_expr_match_get,
217 .parse = nft_rule_expr_match_parse,
218 .build = nft_rule_expr_match_build,
219- .snprintf = nft_rule_expr_match_snprintf,
220+ .snprintf_ = nft_rule_expr_match_snprintf,
221 .xml_parse = nft_rule_expr_match_xml_parse,
222 .json_parse = nft_rule_expr_match_json_parse,
223 };
224