Fixed coding style issue relating to indentation in
net/appletalk/ddp.c found by checkpatch.pl tool
Signed-off-by: Jeffrin Jose <[email protected]>
---
net/appletalk/ddp.c | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index 4023fca..2cf1054 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -1797,39 +1797,39 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
switch (cmd) {
/* Protocol layer */
case TIOCOUTQ: {
- long amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk);
+ long amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk);
- if (amount < 0)
- amount = 0;
- rc = put_user(amount, (int __user *)argp);
- break;
+ if (amount < 0)
+ amount = 0;
+ rc = put_user(amount, (int __user *)argp);
+ break;
}
case TIOCINQ: {
/*
* These two are safe on a single CPU system as only
* user tasks fiddle here
*/
- struct sk_buff *skb = skb_peek(&sk->sk_receive_queue);
- long amount = 0;
+ struct sk_buff *skb = skb_peek(&sk->sk_receive_queue);
+ long amount = 0;
- if (skb)
- amount = skb->len - sizeof(struct ddpehdr);
+ if (skb)
+ amount = skb->len - sizeof(struct ddpehdr);
rc = put_user(amount, (int __user *)argp);
break;
}
case SIOCGSTAMP:
- rc = sock_get_timestamp(sk, argp);
- break;
+ rc = sock_get_timestamp(sk, argp);
+ break;
case SIOCGSTAMPNS:
- rc = sock_get_timestampns(sk, argp);
- break;
+ rc = sock_get_timestampns(sk, argp);
+ break;
/* Routing */
case SIOCADDRT:
case SIOCDELRT:
- rc = -EPERM;
- if (capable(CAP_NET_ADMIN))
- rc = atrtr_ioctl(cmd, argp);
- break;
+ rc = -EPERM;
+ if (capable(CAP_NET_ADMIN))
+ rc = atrtr_ioctl(cmd, argp);
+ break;
/* Interface */
case SIOCGIFADDR:
case SIOCSIFADDR:
@@ -1838,10 +1838,10 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
case SIOCDIFADDR:
case SIOCSARP: /* proxy AARP */
case SIOCDARP: /* proxy AARP */
- rtnl_lock();
- rc = atif_ioctl(cmd, argp);
- rtnl_unlock();
- break;
+ rtnl_lock();
+ rc = atif_ioctl(cmd, argp);
+ rtnl_unlock();
+ break;
}
return rc;
--
1.7.10
Jeffrin Jose <[email protected]> writes:
> case TIOCINQ: {
> /*
> * These two are safe on a single CPU system as only
> * user tasks fiddle here
> */
> - struct sk_buff *skb = skb_peek(&sk->sk_receive_queue);
> - long amount = 0;
> + struct sk_buff *skb = skb_peek(&sk->sk_receive_queue);
> + long amount = 0;
>
> - if (skb)
> - amount = skb->len - sizeof(struct ddpehdr);
> + if (skb)
> + amount = skb->len - sizeof(struct ddpehdr);
> rc = put_user(amount, (int __user *)argp);
> break;
> }
Is putting "rc = put_user(amount, (int __user *)argp);" on the same
indentation level as "amount = skb->len - sizeof(struct ddpehdr);"
really what you want to do?
Eric
/ Is putting "rc = put_user(amount, (int __user *)argp);" on the same
/ indentation level as "amount = skb->len - sizeof(struct ddpehdr);"
/ really what you want to do?
No. I was trying to place those lines at one
indentation back from their current position.
Thanks
/Jeffrin.
--
software engineer
Bohr Lab
department of computer science
Rajagiri school of engineering and technology.
On Tue, 2012-08-07 at 20:27 +0530, Jeffrin Jose wrote:
> / Is putting "rc = put_user(amount, (int __user *)argp);" on the same
> / indentation level as "amount = skb->len - sizeof(struct ddpehdr);"
> / really what you want to do?
> No. I was trying to place those lines at one
> indentation back from their current position.
If you are using checkpatch as a guide, run
"./scripts/checkpatch.pl -f --strict net/appletalk/ddp.c"
after you patch it and also correct any problems found in
the area you want to update too.
A second option is to use emacs with the proper linux
style indentation.
(See: Documentation/CodingStyle, Chapter 9: You've made a mess of it)
Another option is not to patch the file at all.
Also, don't submit multiple patches, resubmit 1 single patch
with all the appropriate corrections.
From: Jeffrin Jose <[email protected]>
Date: Tue, 7 Aug 2012 19:30:20 +0530
> Fixed coding style issue relating to indentation in
> net/appletalk/ddp.c found by checkpatch.pl tool
>
> Signed-off-by: Jeffrin Jose <[email protected]>
Please just stop trying to fix this code up, it's noise and you
keep making mistakes.
> case TIOCOUTQ: {
> - long amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk);
> + long amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk);
>
> - if (amount < 0)
> - amount = 0;
> - rc = put_user(amount, (int __user *)argp);
> - break;
> + if (amount < 0)
> + amount = 0;
> + rc = put_user(amount, (int __user *)argp);
> + break;
> }
This time you didn't adjust the closing brace, as needed.
I'm not applying this and I seriously discourage you from pursing this
further, it's better you spend your time learning how the kernel works
rather than suffering through this coding style cleanup business.
Thanks.