diff mbox

[09/12] netlink_delinearize: remove implied meta expressions

Message ID 20140109220106.GA11124@macbook.localnet
State Accepted
Headers show

Commit Message

Patrick McHardy Jan. 9, 2014, 10:01 p.m. UTC 
On Thu, Jan 09, 2014 at 10:48:41PM +0100, Arturo Borrero Gonzalez wrote:
> On 8 January 2014 14:09, Patrick McHardy <kaber@trash.net> wrote:
> >
> > -static void meta_match_postprocess(struct proto_ctx *ctx,
> > +static void meta_match_postprocess(struct rule_pp_ctx *ctx,
> > +                                  struct stmt *stmt,
> >                                    const struct expr *expr)
> 
> Hi Patrick,
> 
> I noticed something. When compiling here, I get:
> 
> $ make clean && make -j8
> [...]
> src/netlink_delinearize.c: In function ‘meta_match_postprocess’:
> src/netlink_delinearize.c:660:3: warning: passing argument 1 of
> ‘expr-><U 390>.<Ua8e8>.left->ops->pctx_update’ from incompatible
> pointer type [enabled by default]
> src/netlink_delinearize.c:660:3: note: expected ‘struct proto_ctx *’
> but argument is of type ‘struct rule_pp_ctx *’
> [...]
> 
> The last commit I have in my local tree is:
> 
> *   01cd6fa (HEAD, origin/next-3.14, next-3.14) Merge remote-tracking
> branch 'origin/master' into next-3.14

Thanks, for some reason gcc didn't warn me about this. I just pushed
this patch to fix this:

commit 488196551e5e34af3df5d92358f3efa5a08f5730
Author: Patrick McHardy <kaber@trash.net>
Date:   Thu Jan 9 21:59:29 2014 +0000

    netlink_delinearize: fix compiler warning
    
    src/netlink_delinearize.c: In function ‘meta_match_postprocess’:
    src/netlink_delinearize.c:660:3: warning: passing argument 1 of ‘expr->left->ops->pctx_update’ from incompatible pointer type [enabled by default]
    src/netlink_delinearize.c:660:3: note: expected ‘struct proto_ctx *’ but argument is of type ‘struct rule_pp_ctx *’
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c
index 5a6cbfa..8f6ee38 100644
--- a/src/netlink_delinearize.c
+++ b/src/netlink_delinearize.c
@@ -657,7 +657,7 @@  static void meta_match_postprocess(struct rule_pp_ctx *ctx,
 
 	switch (expr->op) {
 	case OP_EQ:
-		expr->left->ops->pctx_update(ctx, expr);
+		expr->left->ops->pctx_update(&ctx->pctx, expr);
 
 		if (ctx->pbase == PROTO_BASE_INVALID &&
 		    left->flags & EXPR_F_PROTOCOL)