From 211cb9170c192a4b7e628aada6281522f4351490 Mon Sep 17 00:00:00 2001 From: Amir Goldstein Date: Wed, 30 Aug 2017 17:51:37 +0300 Subject: [PATCH] fsx: fix compile warnings [eguan: fix conflicts with patch "fsx: Fix -Wformat-security warnings"] Signed-off-by: Amir Goldstein Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- ltp/fsx.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/ltp/fsx.c b/ltp/fsx.c index cc0a8978..ea00ff74 100644 --- a/ltp/fsx.c +++ b/ltp/fsx.c @@ -569,14 +569,20 @@ check_trunc_hack(void) { struct stat statbuf; - ftruncate(fd, (off_t)0); - ftruncate(fd, (off_t)100000); + if (ftruncate(fd, (off_t)0)) + goto ftruncate_err; + if (ftruncate(fd, (off_t)100000)) + goto ftruncate_err; fstat(fd, &statbuf); if (statbuf.st_size != (off_t)100000) { prt("no extend on truncate! not posix!\n"); exit(130); } - ftruncate(fd, 0); + if (ftruncate(fd, 0)) { +ftruncate_err: + prterr("check_trunc_hack: ftruncate"); + exit(131); + } } void @@ -1742,7 +1748,10 @@ __test_fallocate(int mode, const char *mode_str) mode_str); } else { ret = 1; - ftruncate(fd, 0); + if (ftruncate(fd, 0)) { + warn("main: ftruncate"); + exit(132); + } } } return ret; -- 2.30.2