Attachment #757132 for bug #807766

Lines 114-120 struct obj_ops obj_ops_secmark = { Link Here

(-)./src/obj/secmark.c.old (-1 / +1 lines)
114	.max_attr = NFTA_SECMARK_MAX,	114	.max_attr = NFTA_SECMARK_MAX,
115	.set = nftnl_obj_secmark_set,	115	.set = nftnl_obj_secmark_set,
116	.get = nftnl_obj_secmark_get,	116	.get = nftnl_obj_secmark_get,
117	.parse = nftnl_obj_secmark_parse,	117	.parse = nftnl_obj_secmark_parse,
118	.build = nftnl_obj_secmark_build,	118	.build = nftnl_obj_secmark_build,
119	.snprintf = nftnl_obj_secmark_snprintf,	119	._snprintf = nftnl_obj_secmark_snprintf,
120	};	120	};

Lines 141-147 struct obj_ops obj_ops_synproxy = { Link Here

(-)./src/obj/synproxy.c.old (-1 / +1 lines)
141	.max_attr = NFTA_SYNPROXY_MAX,	141	.max_attr = NFTA_SYNPROXY_MAX,
142	.set = nftnl_obj_synproxy_set,	142	.set = nftnl_obj_synproxy_set,
143	.get = nftnl_obj_synproxy_get,	143	.get = nftnl_obj_synproxy_get,
144	.parse = nftnl_obj_synproxy_parse,	144	.parse = nftnl_obj_synproxy_parse,
145	.build = nftnl_obj_synproxy_build,	145	.build = nftnl_obj_synproxy_build,
146	.snprintf = nftnl_obj_synproxy_snprintf,	146	._snprintf = nftnl_obj_synproxy_snprintf,
147	};	147	};

Lines 125-131 struct obj_ops obj_ops_counter = { Link Here

(-)./src/obj/counter.c.old (-1 / +1 lines)
125	.max_attr = NFTA_COUNTER_MAX,	125	.max_attr = NFTA_COUNTER_MAX,
126	.set = nftnl_obj_counter_set,	126	.set = nftnl_obj_counter_set,
127	.get = nftnl_obj_counter_get,	127	.get = nftnl_obj_counter_get,
128	.parse = nftnl_obj_counter_parse,	128	.parse = nftnl_obj_counter_parse,
129	.build = nftnl_obj_counter_build,	129	.build = nftnl_obj_counter_build,
130	.snprintf = nftnl_obj_counter_snprintf,	130	._snprintf = nftnl_obj_counter_snprintf,
131	};	131	};

Lines 142-148 struct obj_ops obj_ops_quota = { Link Here

(-)./src/obj/quota.c.old (-1 / +1 lines)
142	.max_attr = NFTA_QUOTA_MAX,	142	.max_attr = NFTA_QUOTA_MAX,
143	.set = nftnl_obj_quota_set,	143	.set = nftnl_obj_quota_set,
144	.get = nftnl_obj_quota_get,	144	.get = nftnl_obj_quota_get,
145	.parse = nftnl_obj_quota_parse,	145	.parse = nftnl_obj_quota_parse,
146	.build = nftnl_obj_quota_build,	146	.build = nftnl_obj_quota_build,
147	.snprintf = nftnl_obj_quota_snprintf,	147	._snprintf = nftnl_obj_quota_snprintf,
148	};	148	};

Lines 166-172 struct obj_ops obj_ops_limit = { Link Here

(-)./src/obj/limit.c.old (-1 / +1 lines)
166	.max_attr = NFTA_LIMIT_MAX,	166	.max_attr = NFTA_LIMIT_MAX,
167	.set = nftnl_obj_limit_set,	167	.set = nftnl_obj_limit_set,
168	.get = nftnl_obj_limit_get,	168	.get = nftnl_obj_limit_get,
169	.parse = nftnl_obj_limit_parse,	169	.parse = nftnl_obj_limit_parse,
170	.build = nftnl_obj_limit_build,	170	.build = nftnl_obj_limit_build,
171	.snprintf = nftnl_obj_limit_snprintf,	171	._snprintf = nftnl_obj_limit_snprintf,
172	};	172	};

Lines 545-551 struct obj_ops obj_ops_tunnel = { Link Here

(-)./src/obj/tunnel.c.old (-1 / +1 lines)
545	.max_attr = NFTA_TUNNEL_KEY_MAX,	545	.max_attr = NFTA_TUNNEL_KEY_MAX,
546	.set = nftnl_obj_tunnel_set,	546	.set = nftnl_obj_tunnel_set,
547	.get = nftnl_obj_tunnel_get,	547	.get = nftnl_obj_tunnel_get,
548	.parse = nftnl_obj_tunnel_parse,	548	.parse = nftnl_obj_tunnel_parse,
549	.build = nftnl_obj_tunnel_build,	549	.build = nftnl_obj_tunnel_build,
550	.snprintf = nftnl_obj_tunnel_snprintf,	550	._snprintf = nftnl_obj_tunnel_snprintf,
551	};	551	};

Lines 148-154 struct obj_ops obj_ops_ct_helper = { Link Here

(-)./src/obj/ct_helper.c.old (-1 / +1 lines)
148	.max_attr = NFTA_CT_HELPER_MAX,	148	.max_attr = NFTA_CT_HELPER_MAX,
149	.set = nftnl_obj_ct_helper_set,	149	.set = nftnl_obj_ct_helper_set,
150	.get = nftnl_obj_ct_helper_get,	150	.get = nftnl_obj_ct_helper_get,
151	.parse = nftnl_obj_ct_helper_parse,	151	.parse = nftnl_obj_ct_helper_parse,
152	.build = nftnl_obj_ct_helper_build,	152	.build = nftnl_obj_ct_helper_build,
153	.snprintf = nftnl_obj_ct_helper_snprintf,	153	._snprintf = nftnl_obj_ct_helper_snprintf,
154	};	154	};

Lines 314-320 struct obj_ops obj_ops_ct_timeout = { Link Here

(-)./src/obj/ct_timeout.c.old (-1 / +1 lines)
314	.max_attr = NFTA_CT_TIMEOUT_MAX,	314	.max_attr = NFTA_CT_TIMEOUT_MAX,
315	.set = nftnl_obj_ct_timeout_set,	315	.set = nftnl_obj_ct_timeout_set,
316	.get = nftnl_obj_ct_timeout_get,	316	.get = nftnl_obj_ct_timeout_get,
317	.parse = nftnl_obj_ct_timeout_parse,	317	.parse = nftnl_obj_ct_timeout_parse,
318	.build = nftnl_obj_ct_timeout_build,	318	.build = nftnl_obj_ct_timeout_build,
319	.snprintf = nftnl_obj_ct_timeout_snprintf,	319	._snprintf = nftnl_obj_ct_timeout_snprintf,
320	};	320	};

Lines 194-200 struct obj_ops obj_ops_ct_expect = { Link Here

(-)./src/obj/ct_expect.c.old (-1 / +1 lines)
194	.max_attr = NFTA_CT_EXPECT_MAX,	194	.max_attr = NFTA_CT_EXPECT_MAX,
195	.set = nftnl_obj_ct_expect_set,	195	.set = nftnl_obj_ct_expect_set,
196	.get = nftnl_obj_ct_expect_get,	196	.get = nftnl_obj_ct_expect_get,
197	.parse = nftnl_obj_ct_expect_parse,	197	.parse = nftnl_obj_ct_expect_parse,
198	.build = nftnl_obj_ct_expect_build,	198	.build = nftnl_obj_ct_expect_build,
199	.snprintf = nftnl_obj_ct_expect_snprintf,	199	._snprintf = nftnl_obj_ct_expect_snprintf,
200	};	200	};

Lines 178-184 struct expr_ops expr_ops_ng = { Link Here

(-)./src/expr/numgen.c.old (-1 / +1 lines)
178	.max_attr = NFTA_NG_MAX,	178	.max_attr = NFTA_NG_MAX,
179	.set = nftnl_expr_ng_set,	179	.set = nftnl_expr_ng_set,
180	.get = nftnl_expr_ng_get,	180	.get = nftnl_expr_ng_get,
181	.parse = nftnl_expr_ng_parse,	181	.parse = nftnl_expr_ng_parse,
182	.build = nftnl_expr_ng_build,	182	.build = nftnl_expr_ng_build,
183	.snprintf = nftnl_expr_ng_snprintf,	183	._snprintf = nftnl_expr_ng_snprintf,
184	};	184	};

Lines 156-162 struct expr_ops expr_ops_fwd = { Link Here

(-)./src/expr/fwd.c.old (-1 / +1 lines)
156	.max_attr = NFTA_FWD_MAX,	156	.max_attr = NFTA_FWD_MAX,
157	.set = nftnl_expr_fwd_set,	157	.set = nftnl_expr_fwd_set,
158	.get = nftnl_expr_fwd_get,	158	.get = nftnl_expr_fwd_get,
159	.parse = nftnl_expr_fwd_parse,	159	.parse = nftnl_expr_fwd_parse,
160	.build = nftnl_expr_fwd_build,	160	.build = nftnl_expr_fwd_build,
161	.snprintf = nftnl_expr_fwd_snprintf,	161	._snprintf = nftnl_expr_fwd_snprintf,
162	};	162	};

Lines 165-171 struct expr_ops expr_ops_redir = { Link Here

(-)./src/expr/redir.c.old (-1 / +1 lines)
165	.max_attr = NFTA_REDIR_MAX,	165	.max_attr = NFTA_REDIR_MAX,
166	.set = nftnl_expr_redir_set,	166	.set = nftnl_expr_redir_set,
167	.get = nftnl_expr_redir_get,	167	.get = nftnl_expr_redir_get,
168	.parse = nftnl_expr_redir_parse,	168	.parse = nftnl_expr_redir_parse,
169	.build = nftnl_expr_redir_build,	169	.build = nftnl_expr_redir_build,
170	.snprintf = nftnl_expr_redir_snprintf,	170	._snprintf = nftnl_expr_redir_snprintf,
171	};	171	};

Lines 257-263 struct expr_ops expr_ops_payload = { Link Here

(-)./src/expr/payload.c.old (-1 / +1 lines)
257	.max_attr = NFTA_PAYLOAD_MAX,	257	.max_attr = NFTA_PAYLOAD_MAX,
258	.set = nftnl_expr_payload_set,	258	.set = nftnl_expr_payload_set,
259	.get = nftnl_expr_payload_get,	259	.get = nftnl_expr_payload_get,
260	.parse = nftnl_expr_payload_parse,	260	.parse = nftnl_expr_payload_parse,
261	.build = nftnl_expr_payload_build,	261	.build = nftnl_expr_payload_build,
262	.snprintf = nftnl_expr_payload_snprintf,	262	._snprintf = nftnl_expr_payload_snprintf,
263	};	263	};

Lines 204-210 struct expr_ops expr_ops_lookup = { Link Here

(-)./src/expr/lookup.c.old (-1 / +1 lines)
204	.free = nftnl_expr_lookup_free,	204	.free = nftnl_expr_lookup_free,
205	.set = nftnl_expr_lookup_set,	205	.set = nftnl_expr_lookup_set,
206	.get = nftnl_expr_lookup_get,	206	.get = nftnl_expr_lookup_get,
207	.parse = nftnl_expr_lookup_parse,	207	.parse = nftnl_expr_lookup_parse,
208	.build = nftnl_expr_lookup_build,	208	.build = nftnl_expr_lookup_build,
209	.snprintf = nftnl_expr_lookup_snprintf,	209	._snprintf = nftnl_expr_lookup_snprintf,
210	};	210	};

Lines 218-224 struct expr_ops expr_ops_byteorder = { Link Here

(-)./src/expr/byteorder.c.old (-1 / +1 lines)
218	.max_attr = NFTA_BYTEORDER_MAX,	218	.max_attr = NFTA_BYTEORDER_MAX,
219	.set = nftnl_expr_byteorder_set,	219	.set = nftnl_expr_byteorder_set,
220	.get = nftnl_expr_byteorder_get,	220	.get = nftnl_expr_byteorder_get,
221	.parse = nftnl_expr_byteorder_parse,	221	.parse = nftnl_expr_byteorder_parse,
222	.build = nftnl_expr_byteorder_build,	222	.build = nftnl_expr_byteorder_build,
223	.snprintf = nftnl_expr_byteorder_snprintf,	223	._snprintf = nftnl_expr_byteorder_snprintf,
224	};	224	};

Lines 227-233 struct expr_ops expr_ops_immediate = { Link Here

(-)./src/expr/immediate.c.old (-1 / +1 lines)
227	.free = nftnl_expr_immediate_free,	227	.free = nftnl_expr_immediate_free,
228	.set = nftnl_expr_immediate_set,	228	.set = nftnl_expr_immediate_set,
229	.get = nftnl_expr_immediate_get,	229	.get = nftnl_expr_immediate_get,
230	.parse = nftnl_expr_immediate_parse,	230	.parse = nftnl_expr_immediate_parse,
231	.build = nftnl_expr_immediate_build,	231	.build = nftnl_expr_immediate_build,
232	.snprintf = nftnl_expr_immediate_snprintf,	232	._snprintf = nftnl_expr_immediate_snprintf,
233	};	233	};

Lines 256-262 struct expr_ops expr_ops_ct = { Link Here

(-)./src/expr/ct.c.old (-1 / +1 lines)
256	.max_attr = NFTA_CT_MAX,	256	.max_attr = NFTA_CT_MAX,
257	.set = nftnl_expr_ct_set,	257	.set = nftnl_expr_ct_set,
258	.get = nftnl_expr_ct_get,	258	.get = nftnl_expr_ct_get,
259	.parse = nftnl_expr_ct_parse,	259	.parse = nftnl_expr_ct_parse,
260	.build = nftnl_expr_ct_build,	260	.build = nftnl_expr_ct_build,
261	.snprintf = nftnl_expr_ct_snprintf,	261	._snprintf = nftnl_expr_ct_snprintf,
262	};	262	};

Lines 280-286 struct expr_ops expr_ops_bitwise = { Link Here

(-)./src/expr/bitwise.c.old (-1 / +1 lines)
280	.max_attr = NFTA_BITWISE_MAX,	280	.max_attr = NFTA_BITWISE_MAX,
281	.set = nftnl_expr_bitwise_set,	281	.set = nftnl_expr_bitwise_set,
282	.get = nftnl_expr_bitwise_get,	282	.get = nftnl_expr_bitwise_get,
283	.parse = nftnl_expr_bitwise_parse,	283	.parse = nftnl_expr_bitwise_parse,
284	.build = nftnl_expr_bitwise_build,	284	.build = nftnl_expr_bitwise_build,
285	.snprintf = nftnl_expr_bitwise_snprintf,	285	._snprintf = nftnl_expr_bitwise_snprintf,
286	};	286	};

Lines 150-156 struct expr_ops expr_ops_synproxy = { Link Here

(-)./src/expr/synproxy.c.old (-1 / +1 lines)
150	.max_attr = NFTA_SYNPROXY_MAX,	150	.max_attr = NFTA_SYNPROXY_MAX,
151	.set = nftnl_expr_synproxy_set,	151	.set = nftnl_expr_synproxy_set,
152	.get = nftnl_expr_synproxy_get,	152	.get = nftnl_expr_synproxy_get,
153	.parse = nftnl_expr_synproxy_parse,	153	.parse = nftnl_expr_synproxy_parse,
154	.build = nftnl_expr_synproxy_build,	154	.build = nftnl_expr_synproxy_build,
155	.snprintf = nftnl_expr_synproxy_snprintf,	155	._snprintf = nftnl_expr_synproxy_snprintf,
156	};	156	};

Lines 163-169 struct expr_ops expr_ops_socket = { Link Here

(-)./src/expr/socket.c.old (-1 / +1 lines)
163	.max_attr = NFTA_SOCKET_MAX,	163	.max_attr = NFTA_SOCKET_MAX,
164	.set = nftnl_expr_socket_set,	164	.set = nftnl_expr_socket_set,
165	.get = nftnl_expr_socket_get,	165	.get = nftnl_expr_socket_get,
166	.parse = nftnl_expr_socket_parse,	166	.parse = nftnl_expr_socket_parse,
167	.build = nftnl_expr_socket_build,	167	.build = nftnl_expr_socket_build,
168	.snprintf = nftnl_expr_socket_snprintf,	168	._snprintf = nftnl_expr_socket_snprintf,
169	};	169	};

Lines 224-230 struct expr_ops expr_ops_hash = { Link Here

(-)./src/expr/hash.c.old (-1 / +1 lines)
224	.max_attr = NFTA_HASH_MAX,	224	.max_attr = NFTA_HASH_MAX,
225	.set = nftnl_expr_hash_set,	225	.set = nftnl_expr_hash_set,
226	.get = nftnl_expr_hash_get,	226	.get = nftnl_expr_hash_get,
227	.parse = nftnl_expr_hash_parse,	227	.parse = nftnl_expr_hash_parse,
228	.build = nftnl_expr_hash_build,	228	.build = nftnl_expr_hash_build,
229	.snprintf = nftnl_expr_hash_snprintf,	229	._snprintf = nftnl_expr_hash_snprintf,
230	};	230	};

Lines 272-278 struct expr_ops expr_ops_nat = { Link Here

(-)./src/expr/nat.c.old (-1 / +1 lines)
272	.max_attr = NFTA_NAT_MAX,	272	.max_attr = NFTA_NAT_MAX,
273	.set = nftnl_expr_nat_set,	273	.set = nftnl_expr_nat_set,
274	.get = nftnl_expr_nat_get,	274	.get = nftnl_expr_nat_get,
275	.parse = nftnl_expr_nat_parse,	275	.parse = nftnl_expr_nat_parse,
276	.build = nftnl_expr_nat_build,	276	.build = nftnl_expr_nat_build,
277	.snprintf = nftnl_expr_nat_snprintf,	277	._snprintf = nftnl_expr_nat_snprintf,
278	};	278	};

Lines 131-137 struct expr_ops expr_ops_counter = { Link Here

(-)./src/expr/counter.c.old (-1 / +1 lines)
131	.max_attr = NFTA_COUNTER_MAX,	131	.max_attr = NFTA_COUNTER_MAX,
132	.set = nftnl_expr_counter_set,	132	.set = nftnl_expr_counter_set,
133	.get = nftnl_expr_counter_get,	133	.get = nftnl_expr_counter_get,
134	.parse = nftnl_expr_counter_parse,	134	.parse = nftnl_expr_counter_parse,
135	.build = nftnl_expr_counter_build,	135	.build = nftnl_expr_counter_build,
136	.snprintf = nftnl_expr_counter_snprintf,	136	._snprintf = nftnl_expr_counter_snprintf,
137	};	137	};

Lines 371-377 struct expr_ops expr_ops_dynset = { Link Here

(-)./src/expr/dynset.c.old (-1 / +1 lines)
371	.free = nftnl_expr_dynset_free,	371	.free = nftnl_expr_dynset_free,
372	.set = nftnl_expr_dynset_set,	372	.set = nftnl_expr_dynset_set,
373	.get = nftnl_expr_dynset_get,	373	.get = nftnl_expr_dynset_get,
374	.parse = nftnl_expr_dynset_parse,	374	.parse = nftnl_expr_dynset_parse,
375	.build = nftnl_expr_dynset_build,	375	.build = nftnl_expr_dynset_build,
376	.snprintf = nftnl_expr_dynset_snprintf,	376	._snprintf = nftnl_expr_dynset_snprintf,
377	};	377	};

Lines 214-220 struct expr_ops expr_ops_meta = { Link Here

(-)./src/expr/meta.c.old (-1 / +1 lines)
214	.max_attr = NFTA_META_MAX,	214	.max_attr = NFTA_META_MAX,
215	.set = nftnl_expr_meta_set,	215	.set = nftnl_expr_meta_set,
216	.get = nftnl_expr_meta_get,	216	.get = nftnl_expr_meta_get,
217	.parse = nftnl_expr_meta_parse,	217	.parse = nftnl_expr_meta_parse,
218	.build = nftnl_expr_meta_build,	218	.build = nftnl_expr_meta_build,
219	.snprintf = nftnl_expr_meta_snprintf,	219	._snprintf = nftnl_expr_meta_snprintf,
220	};	220	};

Lines 196-202 struct expr_ops expr_ops_fib = { Link Here

(-)./src/expr/fib.c.old (-1 / +1 lines)
196	.max_attr = NFTA_FIB_MAX,	196	.max_attr = NFTA_FIB_MAX,
197	.set = nftnl_expr_fib_set,	197	.set = nftnl_expr_fib_set,
198	.get = nftnl_expr_fib_get,	198	.get = nftnl_expr_fib_get,
199	.parse = nftnl_expr_fib_parse,	199	.parse = nftnl_expr_fib_parse,
200	.build = nftnl_expr_fib_build,	200	.build = nftnl_expr_fib_build,
201	.snprintf = nftnl_expr_fib_snprintf,	201	._snprintf = nftnl_expr_fib_snprintf,
202	};	202	};

Lines 133-139 struct expr_ops expr_ops_connlimit = { Link Here

(-)./src/expr/connlimit.c.old (-1 / +1 lines)
133	.max_attr = NFTA_CONNLIMIT_MAX,	133	.max_attr = NFTA_CONNLIMIT_MAX,
134	.set = nftnl_expr_connlimit_set,	134	.set = nftnl_expr_connlimit_set,
135	.get = nftnl_expr_connlimit_get,	135	.get = nftnl_expr_connlimit_get,
136	.parse = nftnl_expr_connlimit_parse,	136	.parse = nftnl_expr_connlimit_parse,
137	.build = nftnl_expr_connlimit_build,	137	.build = nftnl_expr_connlimit_build,
138	.snprintf = nftnl_expr_connlimit_snprintf,	138	._snprintf = nftnl_expr_connlimit_snprintf,
139	};	139	};

Lines 211-217 struct expr_ops expr_ops_range = { Link Here

(-)./src/expr/range.c.old (-1 / +1 lines)
211	.max_attr = NFTA_RANGE_MAX,	211	.max_attr = NFTA_RANGE_MAX,
212	.set = nftnl_expr_range_set,	212	.set = nftnl_expr_range_set,
213	.get = nftnl_expr_range_get,	213	.get = nftnl_expr_range_get,
214	.parse = nftnl_expr_range_parse,	214	.parse = nftnl_expr_range_parse,
215	.build = nftnl_expr_range_build,	215	.build = nftnl_expr_range_build,
216	.snprintf = nftnl_expr_range_snprintf,	216	._snprintf = nftnl_expr_range_snprintf,
217	};	217	};

Lines 168-174 struct expr_ops expr_ops_tproxy = { Link Here

(-)./src/expr/tproxy.c.old (-1 / +1 lines)
168	.max_attr = NFTA_TPROXY_MAX,	168	.max_attr = NFTA_TPROXY_MAX,
169	.set = nftnl_expr_tproxy_set,	169	.set = nftnl_expr_tproxy_set,
170	.get = nftnl_expr_tproxy_get,	170	.get = nftnl_expr_tproxy_get,
171	.parse = nftnl_expr_tproxy_parse,	171	.parse = nftnl_expr_tproxy_parse,
172	.build = nftnl_expr_tproxy_build,	172	.build = nftnl_expr_tproxy_build,
173	.snprintf = nftnl_expr_tproxy_snprintf,	173	._snprintf = nftnl_expr_tproxy_snprintf,
174	};	174	};

Lines 187-193 struct expr_ops expr_ops_match = { Link Here

(-)./src/expr/match.c.old (-1 / +1 lines)
187	.free = nftnl_expr_match_free,	187	.free = nftnl_expr_match_free,
188	.set = nftnl_expr_match_set,	188	.set = nftnl_expr_match_set,
189	.get = nftnl_expr_match_get,	189	.get = nftnl_expr_match_get,
190	.parse = nftnl_expr_match_parse,	190	.parse = nftnl_expr_match_parse,
191	.build = nftnl_expr_match_build,	191	.build = nftnl_expr_match_build,
192	.snprintf = nftnl_expr_match_snprintf,	192	._snprintf = nftnl_expr_match_snprintf,
193	};	193	};

Lines 191-197 struct expr_ops expr_ops_queue = { Link Here

(-)./src/expr/queue.c.old (-1 / +1 lines)
191	.max_attr = NFTA_QUEUE_MAX,	191	.max_attr = NFTA_QUEUE_MAX,
192	.set = nftnl_expr_queue_set,	192	.set = nftnl_expr_queue_set,
193	.get = nftnl_expr_queue_get,	193	.get = nftnl_expr_queue_get,
194	.parse = nftnl_expr_queue_parse,	194	.parse = nftnl_expr_queue_parse,
195	.build = nftnl_expr_queue_build,	195	.build = nftnl_expr_queue_build,
196	.snprintf = nftnl_expr_queue_snprintf,	196	._snprintf = nftnl_expr_queue_snprintf,
197	};	197	};

Lines 145-151 struct expr_ops expr_ops_quota = { Link Here

(-)./src/expr/quota.c.old (-1 / +1 lines)
145	.max_attr = NFTA_QUOTA_MAX,	145	.max_attr = NFTA_QUOTA_MAX,
146	.set = nftnl_expr_quota_set,	146	.set = nftnl_expr_quota_set,
147	.get = nftnl_expr_quota_get,	147	.get = nftnl_expr_quota_get,
148	.parse = nftnl_expr_quota_parse,	148	.parse = nftnl_expr_quota_parse,
149	.build = nftnl_expr_quota_build,	149	.build = nftnl_expr_quota_build,
150	.snprintf = nftnl_expr_quota_snprintf,	150	._snprintf = nftnl_expr_quota_snprintf,
151	};	151	};

Lines 118-124 struct expr_ops expr_ops_flow = { Link Here

(-)./src/expr/flow_offload.c.old (-1 / +1 lines)
118	.free = nftnl_expr_flow_free,	118	.free = nftnl_expr_flow_free,
119	.set = nftnl_expr_flow_set,	119	.set = nftnl_expr_flow_set,
120	.get = nftnl_expr_flow_get,	120	.get = nftnl_expr_flow_get,
121	.parse = nftnl_expr_flow_parse,	121	.parse = nftnl_expr_flow_parse,
122	.build = nftnl_expr_flow_build,	122	.build = nftnl_expr_flow_build,
123	.snprintf = nftnl_expr_flow_snprintf,	123	._snprintf = nftnl_expr_flow_snprintf,
124	};	124	};

Lines 145-151 struct expr_ops expr_ops_osf = { Link Here

(-)./src/expr/osf.c.old (-1 / +1 lines)
145	.max_attr = NFTA_OSF_MAX,	145	.max_attr = NFTA_OSF_MAX,
146	.set = nftnl_expr_osf_set,	146	.set = nftnl_expr_osf_set,
147	.get = nftnl_expr_osf_get,	147	.get = nftnl_expr_osf_get,
148	.parse = nftnl_expr_osf_parse,	148	.parse = nftnl_expr_osf_parse,
149	.build = nftnl_expr_osf_build,	149	.build = nftnl_expr_osf_build,
150	.snprintf = nftnl_expr_osf_snprintf,	150	._snprintf = nftnl_expr_osf_snprintf,
151	};	151	};

Lines 136-142 struct expr_ops expr_ops_dup = { Link Here

(-)./src/expr/dup.c.old (-1 / +1 lines)
136	.max_attr = NFTA_DUP_MAX,	136	.max_attr = NFTA_DUP_MAX,
137	.set = nftnl_expr_dup_set,	137	.set = nftnl_expr_dup_set,
138	.get = nftnl_expr_dup_get,	138	.get = nftnl_expr_dup_get,
139	.parse = nftnl_expr_dup_parse,	139	.parse = nftnl_expr_dup_parse,
140	.build = nftnl_expr_dup_build,	140	.build = nftnl_expr_dup_build,
141	.snprintf = nftnl_expr_dup_snprintf,	141	._snprintf = nftnl_expr_dup_snprintf,
142	};	142	};

Lines 200-206 struct expr_ops expr_ops_cmp = { Link Here

(-)./src/expr/cmp.c.old (-1 / +1 lines)
200	.max_attr = NFTA_CMP_MAX,	200	.max_attr = NFTA_CMP_MAX,
201	.set = nftnl_expr_cmp_set,	201	.set = nftnl_expr_cmp_set,
202	.get = nftnl_expr_cmp_get,	202	.get = nftnl_expr_cmp_get,
203	.parse = nftnl_expr_cmp_parse,	203	.parse = nftnl_expr_cmp_parse,
204	.build = nftnl_expr_cmp_build,	204	.build = nftnl_expr_cmp_build,
205	.snprintf = nftnl_expr_cmp_snprintf,	205	._snprintf = nftnl_expr_cmp_snprintf,
206	};	206	};

Lines 200-206 struct expr_ops expr_ops_limit = { Link Here

(-)./src/expr/limit.c.old (-1 / +1 lines)
200	.max_attr = NFTA_LIMIT_MAX,	200	.max_attr = NFTA_LIMIT_MAX,
201	.set = nftnl_expr_limit_set,	201	.set = nftnl_expr_limit_set,
202	.get = nftnl_expr_limit_get,	202	.get = nftnl_expr_limit_get,
203	.parse = nftnl_expr_limit_parse,	203	.parse = nftnl_expr_limit_parse,
204	.build = nftnl_expr_limit_build,	204	.build = nftnl_expr_limit_build,
205	.snprintf = nftnl_expr_limit_snprintf,	205	._snprintf = nftnl_expr_limit_snprintf,
206	};	206	};

Lines 132-138 struct expr_ops expr_ops_reject = { Link Here

(-)./src/expr/reject.c.old (-1 / +1 lines)
132	.max_attr = NFTA_REJECT_MAX,	132	.max_attr = NFTA_REJECT_MAX,
133	.set = nftnl_expr_reject_set,	133	.set = nftnl_expr_reject_set,
134	.get = nftnl_expr_reject_get,	134	.get = nftnl_expr_reject_get,
135	.parse = nftnl_expr_reject_parse,	135	.parse = nftnl_expr_reject_parse,
136	.build = nftnl_expr_reject_build,	136	.build = nftnl_expr_reject_build,
137	.snprintf = nftnl_expr_reject_snprintf,	137	._snprintf = nftnl_expr_reject_snprintf,
138	};	138	};

Lines 143-149 struct expr_ops expr_ops_tunnel = { Link Here

(-)./src/expr/tunnel.c.old (-1 / +1 lines)
143	.max_attr = NFTA_TUNNEL_MAX,	143	.max_attr = NFTA_TUNNEL_MAX,
144	.set = nftnl_expr_tunnel_set,	144	.set = nftnl_expr_tunnel_set,
145	.get = nftnl_expr_tunnel_get,	145	.get = nftnl_expr_tunnel_get,
146	.parse = nftnl_expr_tunnel_parse,	146	.parse = nftnl_expr_tunnel_parse,
147	.build = nftnl_expr_tunnel_build,	147	.build = nftnl_expr_tunnel_build,
148	.snprintf = nftnl_expr_tunnel_snprintf,	148	._snprintf = nftnl_expr_tunnel_snprintf,
149	};	149	};

Lines 251-257 struct expr_ops expr_ops_log = { Link Here

(-)./src/expr/log.c.old (-1 / +1 lines)
251	.free = nftnl_expr_log_free,	251	.free = nftnl_expr_log_free,
252	.set = nftnl_expr_log_set,	252	.set = nftnl_expr_log_set,
253	.get = nftnl_expr_log_get,	253	.get = nftnl_expr_log_get,
254	.parse = nftnl_expr_log_parse,	254	.parse = nftnl_expr_log_parse,
255	.build = nftnl_expr_log_build,	255	.build = nftnl_expr_log_build,
256	.snprintf = nftnl_expr_log_snprintf,	256	._snprintf = nftnl_expr_log_snprintf,
257	};	257	};

Lines 160-166 struct expr_ops expr_ops_rt = { Link Here

(-)./src/expr/rt.c.old (-1 / +1 lines)
160	.max_attr = NFTA_RT_MAX,	160	.max_attr = NFTA_RT_MAX,
161	.set = nftnl_expr_rt_set,	161	.set = nftnl_expr_rt_set,
162	.get = nftnl_expr_rt_get,	162	.get = nftnl_expr_rt_get,
163	.parse = nftnl_expr_rt_parse,	163	.parse = nftnl_expr_rt_parse,
164	.build = nftnl_expr_rt_build,	164	.build = nftnl_expr_rt_build,
165	.snprintf = nftnl_expr_rt_snprintf,	165	._snprintf = nftnl_expr_rt_snprintf,
166	};	166	};

Lines 260-266 struct expr_ops expr_ops_exthdr = { Link Here

(-)./src/expr/exthdr.c.old (-1 / +1 lines)
260	.max_attr = NFTA_EXTHDR_MAX,	260	.max_attr = NFTA_EXTHDR_MAX,
261	.set = nftnl_expr_exthdr_set,	261	.set = nftnl_expr_exthdr_set,
262	.get = nftnl_expr_exthdr_get,	262	.get = nftnl_expr_exthdr_get,
263	.parse = nftnl_expr_exthdr_parse,	263	.parse = nftnl_expr_exthdr_parse,
264	.build = nftnl_expr_exthdr_build,	264	.build = nftnl_expr_exthdr_build,
265	.snprintf = nftnl_expr_exthdr_snprintf,	265	._snprintf = nftnl_expr_exthdr_snprintf,
266	};	266	};

Lines 203-209 struct expr_ops expr_ops_objref = { Link Here

(-)./src/expr/objref.c.old (-1 / +1 lines)
203	.free = nftnl_expr_objref_free,	203	.free = nftnl_expr_objref_free,
204	.set = nftnl_expr_objref_set,	204	.set = nftnl_expr_objref_set,
205	.get = nftnl_expr_objref_get,	205	.get = nftnl_expr_objref_get,
206	.parse = nftnl_expr_objref_parse,	206	.parse = nftnl_expr_objref_parse,
207	.build = nftnl_expr_objref_build,	207	.build = nftnl_expr_objref_build,
208	.snprintf = nftnl_expr_objref_snprintf,	208	._snprintf = nftnl_expr_objref_snprintf,
209	};	209	};

Lines 132-138 struct expr_ops expr_ops_last = { Link Here

(-)./src/expr/last.c.old (-1 / +1 lines)
132	.max_attr = NFTA_LAST_MAX,	132	.max_attr = NFTA_LAST_MAX,
133	.set = nftnl_expr_last_set,	133	.set = nftnl_expr_last_set,
134	.get = nftnl_expr_last_get,	134	.get = nftnl_expr_last_get,
135	.parse = nftnl_expr_last_parse,	135	.parse = nftnl_expr_last_parse,
136	.build = nftnl_expr_last_build,	136	.build = nftnl_expr_last_build,
137	.snprintf = nftnl_expr_last_snprintf,	137	._snprintf = nftnl_expr_last_snprintf,
138	};	138	};

Lines 194-200 struct expr_ops expr_ops_xfrm = { Link Here

(-)./src/expr/xfrm.c.old (-1 / +1 lines)
194	.max_attr = NFTA_XFRM_MAX,	194	.max_attr = NFTA_XFRM_MAX,
195	.set = nftnl_expr_xfrm_set,	195	.set = nftnl_expr_xfrm_set,
196	.get = nftnl_expr_xfrm_get,	196	.get = nftnl_expr_xfrm_get,
197	.parse = nftnl_expr_xfrm_parse,	197	.parse = nftnl_expr_xfrm_parse,
198	.build = nftnl_expr_xfrm_build,	198	.build = nftnl_expr_xfrm_build,
199	.snprintf = nftnl_expr_xfrm_snprintf,	199	._snprintf = nftnl_expr_xfrm_snprintf,
200	};	200	};

Lines 161-167 struct expr_ops expr_ops_masq = { Link Here

(-)./src/expr/masq.c.old (-1 / +1 lines)
161	.max_attr = NFTA_MASQ_MAX,	161	.max_attr = NFTA_MASQ_MAX,
162	.set = nftnl_expr_masq_set,	162	.set = nftnl_expr_masq_set,
163	.get = nftnl_expr_masq_get,	163	.get = nftnl_expr_masq_get,
164	.parse = nftnl_expr_masq_parse,	164	.parse = nftnl_expr_masq_parse,
165	.build = nftnl_expr_masq_build,	165	.build = nftnl_expr_masq_build,
166	.snprintf = nftnl_expr_masq_snprintf,	166	._snprintf = nftnl_expr_masq_snprintf,
167	};	167	};

Lines 187-193 struct expr_ops expr_ops_target = { Link Here

(-)./src/expr/target.c.old (-1 / +1 lines)
187	.free = nftnl_expr_target_free,	187	.free = nftnl_expr_target_free,
188	.set = nftnl_expr_target_set,	188	.set = nftnl_expr_target_set,
189	.get = nftnl_expr_target_get,	189	.get = nftnl_expr_target_get,
190	.parse = nftnl_expr_target_parse,	190	.parse = nftnl_expr_target_parse,
191	.build = nftnl_expr_target_build,	191	.build = nftnl_expr_target_build,
192	.snprintf = nftnl_expr_target_snprintf,	192	._snprintf = nftnl_expr_target_snprintf,
193	};	193	};




	unsigned int offset = 0;

	if (remain)
		buf[0] = '\0';

	if (!expr->ops->_snprintf || type != NFTNL_OUTPUT_DEFAULT)
		return 0;

	ret = expr->ops->_snprintf(buf + offset, remain, flags, expr);
	SNPRINTF_BUFFER_SIZE(ret, remain, offset);

	return offset;
}


Lines 394-404 static int nftnl_obj_snprintf_dflt(char Link Here

(-)./src/object.c.old (-1 / +1 lines)
394	ret = snprintf(buf, remain, "table %s name %s use %u [ %s ",	394	ret = snprintf(buf, remain, "table %s name %s use %u [ %s ",
395	obj->table, obj->name, obj->use, name);	395	obj->table, obj->name, obj->use, name);
396	SNPRINTF_BUFFER_SIZE(ret, remain, offset);	396	SNPRINTF_BUFFER_SIZE(ret, remain, offset);
397		397
398	if (obj->ops) {	398	if (obj->ops) {
399	ret = obj->ops->snprintf(buf + offset, remain, flags, obj);	399	ret = obj->ops->_snprintf(buf + offset, remain, flags, obj);
400	SNPRINTF_BUFFER_SIZE(ret, remain, offset);	400	SNPRINTF_BUFFER_SIZE(ret, remain, offset);
401	}	401	}
402	ret = snprintf(buf + offset, remain, "]");	402	ret = snprintf(buf + offset, remain, "]");
403	SNPRINTF_BUFFER_SIZE(ret, remain, offset);	403	SNPRINTF_BUFFER_SIZE(ret, remain, offset);
404		404

Lines 16-26 struct expr_ops { Link Here

(-)./include/expr_ops.h.old (-1 / +1 lines)
16	void (free)(const struct nftnl_expr e);	16	void (free)(const struct nftnl_expr e);
17	int (set)(struct nftnl_expr e, uint16_t type, const void *data, uint32_t data_len);	17	int (set)(struct nftnl_expr e, uint16_t type, const void *data, uint32_t data_len);
18	const void (get)(const struct nftnl_expr e, uint16_t type, uint32_t data_len);	18	const void (get)(const struct nftnl_expr e, uint16_t type, uint32_t data_len);
19	int (parse)(struct nftnl_expr e, struct nlattr *attr);	19	int (parse)(struct nftnl_expr e, struct nlattr *attr);
20	void (build)(struct nlmsghdr nlh, const struct nftnl_expr *e);	20	void (build)(struct nlmsghdr nlh, const struct nftnl_expr *e);
21	int (snprintf)(char buf, size_t len, uint32_t flags, const struct nftnl_expr *e);	21	int (_snprintf)(char buf, size_t len, uint32_t flags, const struct nftnl_expr *e);
22	};	22	};
23		23
24	struct expr_ops nftnl_expr_ops_lookup(const char name);	24	struct expr_ops nftnl_expr_ops_lookup(const char name);
25		25
26	#define nftnl_expr_data(ops) (void *)ops->data	26	#define nftnl_expr_data(ops) (void *)ops->data

Lines 107-117 struct obj_ops { Link Here

(-)./include/obj.h.old (-1 / +1 lines)
107	int max_attr;	107	int max_attr;
108	int (set)(struct nftnl_obj e, uint16_t type, const void *data, uint32_t data_len);	108	int (set)(struct nftnl_obj e, uint16_t type, const void *data, uint32_t data_len);
109	const void (get)(const struct nftnl_obj e, uint16_t type, uint32_t data_len);	109	const void (get)(const struct nftnl_obj e, uint16_t type, uint32_t data_len);
110	int (parse)(struct nftnl_obj e, struct nlattr *attr);	110	int (parse)(struct nftnl_obj e, struct nlattr *attr);
111	void (build)(struct nlmsghdr nlh, const struct nftnl_obj *e);	111	void (build)(struct nlmsghdr nlh, const struct nftnl_obj *e);
112	int (snprintf)(char buf, size_t len, uint32_t flags, const struct nftnl_obj *e);	112	int (_snprintf)(char buf, size_t len, uint32_t flags, const struct nftnl_obj *e);
113	};	113	};
114		114
115	extern struct obj_ops obj_ops_counter;	115	extern struct obj_ops obj_ops_counter;
116	extern struct obj_ops obj_ops_quota;	116	extern struct obj_ops obj_ops_quota;
117	extern struct obj_ops obj_ops_ct_helper;	117	extern struct obj_ops obj_ops_ct_helper;

Return to bug 807766

Lines 277-290 int nftnl_expr_snprintf(char *buf, size_ Link Here

(-)./src/expr.c.old (-2 / +2 lines)
277	unsigned int offset = 0;	277	unsigned int offset = 0;
278		278
279	if (remain)	279	if (remain)
280	buf[0] = '\0';	280	buf[0] = '\0';
281		281
282	if (!expr->ops->snprintf \|\| type != NFTNL_OUTPUT_DEFAULT)	282	if (!expr->ops->_snprintf \|\| type != NFTNL_OUTPUT_DEFAULT)
283	return 0;	283	return 0;
284		284
285	ret = expr->ops->snprintf(buf + offset, remain, flags, expr);	285	ret = expr->ops->_snprintf(buf + offset, remain, flags, expr);
286	SNPRINTF_BUFFER_SIZE(ret, remain, offset);	286	SNPRINTF_BUFFER_SIZE(ret, remain, offset);
287		287
288	return offset;	288	return offset;
289	}	289	}
290		290