Commit 2ade9170 authored by Dmitry Antipov's avatar Dmitry Antipov Committed by Paolo Abeni
Browse files

tipc: adjust tipc_nodeid2string() to return string length 



Since the value returned by 'tipc_nodeid2string()' is not used, the
function may be adjusted to return the length of the result, which
is helpful to drop a few calls to 'strlen()' in 'tipc_link_create()'
and 'tipc_link_bc_create()'. Compile tested only.

Signed-off-by: default avatarDmitry Antipov <dmantipov@yandex.ru>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250926074113.914399-1-dmantipov@yandex.ru


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 38b04ed7

net/tipc/addr.c

+3 −3
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ void tipc_set_node_addr(struct net *net, u32 addr) 
	pr_info("Node number set to %u\n", addr);

}



char *tipc_nodeid2string(char *str, u8 *id)

int tipc_nodeid2string(char *str, u8 *id)

{

	int i;

	u8 c;
@@ -109,7 +109,7 @@ char *tipc_nodeid2string(char *str, u8 *id) 
	if (i == NODE_ID_LEN) {

		memcpy(str, id, NODE_ID_LEN);

		str[NODE_ID_LEN] = 0;

		return str;

		return i;

	}



	/* Translate to hex string */
@@ -120,5 +120,5 @@ char *tipc_nodeid2string(char *str, u8 *id) 
	for (i = NODE_ID_STR_LEN - 2; str[i] == '0'; i--)

		str[i] = 0;



	return str;

	return i + 1;

}

net/tipc/addr.h

+1 −1
Original line number Diff line number Diff line
@@ -130,6 +130,6 @@ static inline int in_own_node(struct net *net, u32 addr) 
bool tipc_in_scope(bool legacy_format, u32 domain, u32 addr);

void tipc_set_node_id(struct net *net, u8 *id);

void tipc_set_node_addr(struct net *net, u32 addr);

char *tipc_nodeid2string(char *str, u8 *id);

int tipc_nodeid2string(char *str, u8 *id);



#endif

net/tipc/link.c

+3 −6
Original line number Diff line number Diff line
@@ -495,11 +495,9 @@ bool tipc_link_create(struct net *net, char *if_name, int bearer_id, 


	/* Set link name for unicast links only */

	if (peer_id) {

		tipc_nodeid2string(self_str, tipc_own_id(net));

		if (strlen(self_str) > 16)

		if (tipc_nodeid2string(self_str, tipc_own_id(net)) > NODE_ID_LEN)

			sprintf(self_str, "%x", self);

		tipc_nodeid2string(peer_str, peer_id);

		if (strlen(peer_str) > 16)

		if (tipc_nodeid2string(peer_str, peer_id) > NODE_ID_LEN)

			sprintf(peer_str, "%x", peer);

	}

	/* Peer i/f name will be completed by reset/activate message */
@@ -570,8 +568,7 @@ bool tipc_link_bc_create(struct net *net, u32 ownnode, u32 peer, u8 *peer_id, 
	if (peer_id) {

		char peer_str[NODE_ID_STR_LEN] = {0,};



		tipc_nodeid2string(peer_str, peer_id);

		if (strlen(peer_str) > 16)

		if (tipc_nodeid2string(peer_str, peer_id) > NODE_ID_LEN)

			sprintf(peer_str, "%x", peer);

		/* Broadcast receiver link name: "broadcast-link:<peer>" */

		snprintf(l->name, sizeof(l->name), "%s:%s", tipc_bclink_name,