2014-07-24 20:17:27

by Himangi Saraogi

Subject: [PATCH] netfilter: nf_conntrack: remove exceptional & on function name

In this file, function names are otherwise used as pointers without &.

A simplified version of the Coccinelle semantic patch that makes this
change is as follows:

// <smpl>
@r@
identifier f;
@@

f(...) { ... }

@@
identifier r.f;
@@

- &f
+ f
// </smpl>

Signed-off-by: Himangi Saraogi <[email protected]>
Acked-by: Julia Lawall <[email protected]>
---
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
index 8127dc8..41744cd 100644
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
@@ -358,7 +358,7 @@ static struct nf_sockopt_ops so_getorigdst = {
.pf = PF_INET,
.get_optmin = SO_ORIGINAL_DST,
.get_optmax = SO_ORIGINAL_DST+1,
- .get = &getorigdst,
+ .get = getorigdst,
.owner = THIS_MODULE,
};

--
1.9.1

2014-07-25 13:00:48

by Pablo Neira Ayuso

Subject: Re: [PATCH] netfilter: nf_conntrack: remove exceptional & on function name

On Fri, Jul 25, 2014 at 01:47:16AM +0530, Himangi Saraogi wrote:
> In this file, function names are otherwise used as pointers without &.
>
> A simplified version of the Coccinelle semantic patch that makes this
> change is as follows:
>
> // <smpl>
> @r@
> identifier f;
> @@
>
> f(...) { ... }
>
> @@
> identifier r.f;
> @@
>
> - &f
> + f
> // </smpl>

Applied, thanks Himangi.