dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

decnet: fix sparse warnings: symbol shadows an earlier one 

Impact: Remove redundant variable declarations, resp. rename
inner scope variable.

Fix this sparse warnings:
  net/decnet/af_decnet.c:1252:40: warning: symbol 'skb' shadows an earlier one
  net/decnet/af_decnet.c:1223:24: originally declared here
  net/decnet/af_decnet.c:1582:29: warning: symbol 'val' shadows an earlier one
  net/decnet/af_decnet.c:1527:22: originally declared here
  net/decnet/dn_dev.c:687:21: warning: symbol 'err' shadows an earlier one
  net/decnet/dn_dev.c:670:13: originally declared here
  net/decnet/sysctl_net_decnet.c:182:21: warning: symbol 'len' shadows an earlier one
  net/decnet/sysctl_net_decnet.c:173:16: originally declared here

Signed-off-by: Hannes Eder <hannes@hanneseder.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Hannes Eder 2009-02-25 10:32:39 +00:00 committed by David S. Miller
parent 8521c27ee7
commit e57c624be8
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
net/decnet/af_decnet.c
View File

@ -1246,11 +1246,12 @@ static int dn_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
case TIOCINQ:
lock_sock(sk);
if ((skb = skb_peek(&scp->other_receive_queue)) != NULL) {
skb = skb_peek(&scp->other_receive_queue);
if (skb) {
amount = skb->len;
} else {
struct sk_buff *skb = sk->sk_receive_queue.next;
for(;;) {
skb = sk->sk_receive_queue.next;
for (;;) {
if (skb ==
(struct sk_buff *)&sk->sk_receive_queue)
break;
@ -1579,16 +1580,16 @@ static int __dn_getsockopt(struct socket *sock, int level,int optname, char __us
default:
#ifdef CONFIG_NETFILTER
{
int val, len;
int ret, len;
if(get_user(len, optlen))
return -EFAULT;
val = nf_getsockopt(sk, PF_DECnet, optname,
ret = nf_getsockopt(sk, PF_DECnet, optname,
optval, &len);
if (val >= 0)
val = put_user(len, optlen);
return val;
if (ret >= 0)
ret = put_user(len, optlen);
return ret;
}
#endif
case DSO_STREAM:

1
net/decnet/dn_dev.c
View File

@ -684,7 +684,6 @@ static int dn_nl_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
return -ENODEV;
if ((dn_db = dev->dn_ptr) == NULL) {
int err;
dn_db = dn_dev_create(dev, &err);
if (!dn_db)
return err;

2
net/decnet/sysctl_net_decnet.c
View File

@ -179,7 +179,7 @@ static int dn_node_address_handler(ctl_table *table, int write,
}
if (write) {
int len = (*lenp < DN_ASCBUF_LEN) ? *lenp : (DN_ASCBUF_LEN-1);
len = (*lenp < DN_ASCBUF_LEN) ? *lenp : (DN_ASCBUF_LEN-1);
if (copy_from_user(addr, buffer, len))
return -EFAULT;