From 76906af9d70fc784de728a70e3dbda62dece5e10 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLE" Date: Fri, 9 Nov 2018 11:27:11 -0500 Subject: core: fix strncpy warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since gcc-8.2.x (fedora-28 or so) gcc has been emitting warnings about buggy use of strncpy. e.g. warning: ‘strncpy’ output truncated before terminating nul copying as many bytes from a string as its length and warning: ‘strncpy’ specified bound depends on the length of the source argument Since we're copying string fragments and explicitly null terminating use memcpy to silence the warning Change-Id: I413d84b5f4157f15c99e9af3e154ce594d5bcdc1 updates: bz#1193929 Signed-off-by: Kaleb S. KEITHLEY --- xlators/mgmt/glusterd/src/glusterd-utils.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xlators/mgmt/glusterd/src') diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index a38dfe43908..e633d6ebc4d 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -11481,7 +11481,7 @@ _heal_volume_add_shd_rsp(dict_t *this, char *key, data_t *value, void *data) rxl_end_len = strlen(rxl_end); int_len = strlen(key) - rxl_end_len; - strncpy(int_str, key, int_len); + (void)memcpy(int_str, key, int_len); int_str[int_len] = '\0'; ret = gf_string2int(int_str, &rxl_id); @@ -11489,7 +11489,7 @@ _heal_volume_add_shd_rsp(dict_t *this, char *key, data_t *value, void *data) goto out; int_len = rxl_end_len - strlen(rxl_child_end) - 1; - strncpy(int_str, rxl_end + 1, int_len); + (void)memcpy(int_str, rxl_end + 1, int_len); int_str[int_len] = '\0'; ret = gf_string2int(int_str, &rxl_child_id); @@ -11553,19 +11553,19 @@ _heal_volume_add_shd_rsp_of_statistics(dict_t *this, char *key, data_t *value, key_begin_strlen = strlen(key_begin_str); int_len = strlen(key) - key_begin_strlen; - strncpy(key_begin_string, key, int_len); + (void)memcpy(key_begin_string, key, int_len); key_begin_string[int_len] = '\0'; rxl_end_len = strlen(rxl_end); int_len = key_begin_strlen - rxl_end_len - 1; - strncpy(int_str, key_begin_str + 1, int_len); + (void)memcpy(int_str, key_begin_str + 1, int_len); int_str[int_len] = '\0'; ret = gf_string2int(int_str, &rxl_id); if (ret) goto out; int_len = rxl_end_len - strlen(rxl_child_end) - 1; - strncpy(int_str, rxl_end + 1, int_len); + (void)memcpy(int_str, rxl_end + 1, int_len); int_str[int_len] = '\0'; ret = gf_string2int(int_str, &rxl_child_id); if (ret) -- cgit