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

Commit 4b704d59 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

tipc: fix non-const printf format arguments 



Fix warnings from current gcc about using non-const strings as printf
args in TIPC. Compile tested only (not a TIPC user).

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent beedad92

net/tipc/bcast.c

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static struct bclink *bclink = NULL; 
static struct link *bcl = NULL;

static DEFINE_SPINLOCK(bc_lock);



char tipc_bclink_name[] = "multicast-link";

const char tipc_bclink_name[] = "multicast-link";





static u32 buf_seqno(struct sk_buff *buf)
@@ -800,7 +800,7 @@ int tipc_bclink_init(void) 
	tipc_link_set_queue_limits(bcl, BCLINK_WIN_DEFAULT);

	bcl->b_ptr = &bcbearer->bearer;

	bcl->state = WORKING_WORKING;

	sprintf(bcl->name, tipc_bclink_name);

	strlcpy(bcl->name, tipc_bclink_name, TIPC_MAX_LINK_NAME);



	if (BCLINK_LOG_BUF_SIZE) {

		char *pb = kmalloc(BCLINK_LOG_BUF_SIZE, GFP_ATOMIC);

net/tipc/bcast.h

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ struct port_list { 


struct tipc_node;



extern char tipc_bclink_name[];

extern const char tipc_bclink_name[];





/**

net/tipc/dbg.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ void tipc_printf(struct print_buf *pb, const char *fmt, ...) 
	}



	if (pb->echo)

		printk(print_string);

		printk("%s", print_string);



	spin_unlock_bh(&print_lock);

}

net/tipc/node.c

+1 −1
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space) 


	link_info.dest = htonl(tipc_own_addr & 0xfffff00);

	link_info.up = htonl(1);

	sprintf(link_info.str, tipc_bclink_name);

	strlcpy(link_info.str, tipc_bclink_name, TIPC_MAX_LINK_NAME);

	tipc_cfg_append_tlv(buf, TIPC_TLV_LINK_INFO, &link_info, sizeof(link_info));



	/* Add TLVs for any other links in scope */