ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

devices: vhost: simplify string copies for GCC-10

Browse Source 
GCC-10 increases string truncations warnings. Refactor string copies
confusing it.

Type: refactor

Change-Id: I9720a0539059de00ab212ff2fc73055f04f5af1d
Signed-off-by: Benoît Ganne <bganne@cisco.com>
This commit is contained in:
Benoît Ganne
2020-04-24 10:33:40 +02:00
committed by Neale Ranns
parent 28adbb3aef
commit 3a76dc3f4f
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vnet/devices/virtio/vhost_user.c
View File

@ -1819,7 +1819,6 @@ vhost_user_dump_ifs (vnet_main_t * vnm, vlib_main_t * vm,
vhost_user_intf_details_t *vuid = NULL;
u32 *hw_if_indices = 0;
vnet_hw_interface_t *hi;
u8 *s = NULL;
int i;
if (!out_vuids)
@ -1841,17 +1840,13 @@ vhost_user_dump_ifs (vnet_main_t * vnm, vlib_main_t * vm,
vuid->num_regions = vui->nregions;
vuid->is_server = vui->unix_server_index != ~0;
vuid->sock_errno = vui->sock_errno;
strncpy ((char *) vuid->sock_filename, (char *) vui->sock_filename,
sizeof (vuid->sock_filename));
vuid->sock_filename[ARRAY_LEN (vuid->sock_filename) - 1] = '\0';
s = format (s, "%v%c", hi->name, 0);
strncpy ((char *) vuid->if_name, (char *) s,
ARRAY_LEN (vuid->if_name) - 1);
_vec_len (s) = 0;
snprintf ((char *) vuid->sock_filename, sizeof (vuid->sock_filename),
"%s", vui->sock_filename);
memcpy_s (vuid->if_name, sizeof (vuid->if_name), hi->name,
clib_min (vec_len (hi->name), sizeof (vuid->if_name) - 1));
vuid->if_name[sizeof (vuid->if_name) - 1] = 0;
}
vec_free (s);
vec_free (hw_if_indices);
*out_vuids = r_vuids;