Skip to content

Commit 490906b

Browse files
committed
Update xshared.c
1 parent 661db31 commit 490906b

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

ipthelper/xshared.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -724,14 +724,12 @@ void command_jump(struct iptables_command_state *cs)
724724
cs->target->t->u.user.revision = cs->target->revision;
725725
xs_init_target(cs->target);
726726

727-
{
728-
bool merged = false;
729-
size_t merge_start = xs_longopts_count(opts, NULL);
727+
size_t merge_start = xs_longopts_count(opts, NULL);
730728

731-
if (cs->target->x6_options != NULL) {
732-
opts = xtables_options_xfrm(xt_params->orig_opts, opts,
733-
cs->target->x6_options,
734-
&cs->target->option_offset);
729+
if (cs->target->x6_options != NULL) {
730+
opts = xtables_options_xfrm(xt_params->orig_opts, opts,
731+
cs->target->x6_options,
732+
&cs->target->option_offset);
735733
else if (cs->target->extra_opts != NULL)
736734
opts = xtables_merge_options(xt_params->orig_opts, opts,
737735
cs->target->extra_opts,

0 commit comments

Comments
 (0)