Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d788d805 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

[TIPC]: Fix two minor sparse warnings. 



fix two warnings generated by sparse:

link.c:2386 symbol 'msgcount' shadows an earlier one
node.c:244 symbol 'addr_string' shadows an earlier one

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 248bbf38

net/tipc/link.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2383,10 +2383,10 @@ void tipc_link_changeover(struct link *l_ptr) 
		struct tipc_msg *msg = buf_msg(crs);

		struct tipc_msg *msg = buf_msg(crs);





		if ((msg_user(msg) == MSG_BUNDLER) && split_bundles) {

		if ((msg_user(msg) == MSG_BUNDLER) && split_bundles) {

			u32 msgcount = msg_msgcnt(msg);

			struct tipc_msg *m = msg_get_wrapped(msg);

			struct tipc_msg *m = msg_get_wrapped(msg);

			unchar* pos = (unchar*)m;

			unchar* pos = (unchar*)m;





			msgcount = msg_msgcnt(msg);

			while (msgcount--) {

			while (msgcount--) {

				msg_set_seqno(m,msg_seqno(msg));

				msg_set_seqno(m,msg_seqno(msg));

				tipc_link_tunnel(l_ptr, &tunnel_hdr, m,

				tipc_link_tunnel(l_ptr, &tunnel_hdr, m,

net/tipc/node.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -241,8 +241,6 @@ struct node *tipc_node_attach_link(struct link *l_ptr) 
		char addr_string[16];

		char addr_string[16];





		if (n_ptr->link_cnt >= 2) {

		if (n_ptr->link_cnt >= 2) {

			char addr_string[16];



			err("Attempt to create third link to %s\n",

			err("Attempt to create third link to %s\n",

			    addr_string_fill(addr_string, n_ptr->addr));

			    addr_string_fill(addr_string, n_ptr->addr));

			return NULL;

			return NULL;