openharmony/third_party_f2fs-tools
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_f2fs-tools synced 2024-11-23 10:10:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

f2fs-tools: Fix various compilation warnings

Browse Source 
Avoid various compilation warnings due to strncpy:

libf2fs.c:590:33: warning: ‘snprintf’ output may be truncated before
the last format character [-Wformat-truncation=]
  snprintf(rootdev, ret, "/dev/%s", buf);

../include/f2fs_fs.h:1384:2: warning: ‘strncpy’ specified bound
depends on the length of the source argument [-Wstringop-overflow=]
  strncpy(buf, features, strlen(features) + 1);

f2fstat.c:243:3: warning: ‘strncpy’ output truncated before
terminating nul copying as many bytes from a string as its length
[-Wstringop-truncation]
   strncpy(ptr_buf, name[i], strlen(name[i]));

This patch does not change any functionality.

Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Damien Le Moal 2019-03-18 15:39:55 +09:00 committed by Jaegeuk Kim
parent 50e22bd947
commit 8f80581f0d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/f2fs_fs.h
View File

@ -1381,9 +1381,9 @@ static inline int parse_feature(struct feature *table, const char *features)
{
char *buf, *sub, *next;
buf = calloc(strlen(features) + 1, sizeof(char));
ASSERT(buf);
strncpy(buf, features, strlen(features) + 1);
buf = strdup(features);
if (!buf)
return -1;
for (sub = buf; sub && *sub; sub = next ? next + 1 : NULL) {
/* Skip the beginning blanks */

2
lib/libf2fs.c
View File

@ -587,7 +587,7 @@ char *get_rootdev()
return NULL;
rootdev[ret] = '\0';
snprintf(rootdev, ret, "/dev/%s", buf);
snprintf(rootdev, ret + 1, "/dev/%s", buf);
return rootdev;
#endif
}

2
tools/f2fstat.c
View File

@ -240,7 +240,7 @@ void print_head(char *res)
for (i = 0; i < 20; i++) {
ptr = (i == 0) ? strtok(res, " ") : strtok(NULL, " ");
strncpy(ptr_buf, name[i], strlen(name[i]));
strcpy(ptr_buf, name[i]);
if (i == 1) {
prev_index = ptr_buf - buf - 1;
} else if (i == 7) {