Hi Holger,
On Tue, 25 Jan 2011, Jozsef Kadlecsik wrote:
> On Mon, 24 Jan 2011, Holger Eitzenberger wrote:
>
> > Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
> >
> > Index: ipset/src/ipset.c
> > ===================================================================
> > --- ipset.orig/src/ipset.c
> > +++ ipset/src/ipset.c
> > @@ -208,7 +208,6 @@ call_parser(int *argc, char *argv[], con
> > {
> > int i = 1, ret = 0;
> > const struct ipset_arg *arg;
> > - const char *optstr;
> >
> > /* Currently CREATE and ADT may have got additional arguments */
> > if (!args)
> > @@ -221,7 +220,6 @@ call_parser(int *argc, char *argv[], con
> > i++;
> > continue;
> > }
> > - optstr = argv[i];
> > /* Shift off matched option */
> > D("match %s", arg->name[0]);
> > ipset_shift_argv(argc, argv, i);
> > @@ -236,10 +234,7 @@ call_parser(int *argc, char *argv[], con
> > /* Fall through */
> > case IPSET_OPTIONAL_ARG:
> > if (i + 1 <= *argc) {
> > - ret = ipset_call_parser(session,
> > - arg->parse,
> > - optstr, arg->opt,
> > - argv[i]);
> > + ret = ipset_call_parser(session, arg, argv[i]);
> > if (ret < 0)
> > return ret;
> > ipset_shift_argv(argc, argv, i);
> > @@ -247,10 +242,7 @@ call_parser(int *argc, char *argv[], con
> > }
> > /* Fall through */
> > default:
> > - ret = ipset_call_parser(session,
> > - arg->parse,
> > - optstr, arg->opt,
> > - optstr);
> > + ret = ipset_call_parser(session, arg, argv[1]);
>
> We can't do this, because then the flag-style options (no arg) cannot be
> parsed. So I cannot apply this patch and the next two ones based on it.
If optstr is kept, then that can be passed to the parser in the default
branch. Could you rewrite your patch that way and resend to me (and the
dependent ones too)?
Best regards,
Jozsef
-
E-mail : kadlec@xxxxxxxxxxxxxxxxx, kadlec@xxxxxxxxxxxx
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : KFKI Research Institute for Particle and Nuclear Physics
H-1525 Budapest 114, POB. 49, Hungary
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
