tipc: fix non-const printf format arguments
Subsystems (3)
PATCH 1/1 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 Stephen Hemminger <[email protected]>
--- net/tipc/bcast.c | 4 ++-- net/tipc/bcast.h | 2 +- net/tipc/dbg.c | 2 +- net/tipc/node.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
net/tipc/bcast.c +2 -2
@@ -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
@@ -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
@@ -258,7 +258,7 @@ void tipc_printf(struct print_buf *pb, c }if (pb->echo) -printk (print_string); +printk ("%s" , print_string);spin_unlock_bh (&print_lock); }
net/tipc/node.c +1 -1
@@ -703,7 +703,7 @@ struct sk_buff *tipc_node_get_links(cons 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 */
From: Stephen Hemminger <[email protected]>
Date: Tue, 17 Mar 2009 11:28:32 -0700
Quoted 4 lines
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 Stephen Hemminger <[email protected]>
Applied to net-next-2.6, thanks.