syscalls: Fix tst_res() format string for 64-bit offset
PATCH v2 1/1 syscalls: Fix tst_res() format string for 64-bit offset
From: Randolph <[email protected]>
When compiling format string contains off_t type, to print off_t correctly is cast it to (long long int) type and change the format string to %lli.
Fix format string for type block_size.
--- testcases/kernel/syscalls/lseek/lseek01.c | 17 +++++++++-------- testcases/kernel/syscalls/lseek/lseek07.c | 17 +++++++++-------- testcases/kernel/syscalls/lseek/lseek11.c | 11 ++++++----- testcases/kernel/syscalls/sendfile/sendfile05.c | 3 ++- 4 files changed, 26 insertions(+), 22 deletions(-)
testcases/kernel/syscalls/lseek/lseek01.c +9 -8
@@ -46,25 +46,26 @@ static void verify_lseek(unsigned int n)TEST (lseek (fd, tc->off, tc->whence));if (TST_RET == (off_t) -1 ) { -tst_res (TFAIL |TTERRNO ,"lseek(%s, %ld, %s) failed" ,TFILE , - tc->off, tc->wname); +tst_res (TFAIL |TTERRNO ,"lseek(%s, %lli, %s) failed" ,TFILE , + (long long int )tc->off, tc->wname);return ; }if (TST_RET != tc->exp_off) { -tst_res (TFAIL ,"lseek(%s, %ld, %s) returned %ld, expected %ld" , -TFILE , tc->off, tc->wname,TST_RET , tc->exp_off); +tst_res (TFAIL ,"lseek(%s, %lli, %s) returned %ld, expected %lli" , +TFILE , (long long int )tc->off, tc->wname,TST_RET , + (long long int )tc->exp_off);return ; }SAFE_READ (1 , fd, read_buf, tc->exp_size);if (tc->exp_data &&strcmp (read_buf, tc->exp_data)) { -tst_res (TFAIL ,"lseek(%s, %ld, %s) read incorrect data" , -TFILE , tc->off, tc->wname); +tst_res (TFAIL ,"lseek(%s, %lli, %s) read incorrect data" , +TFILE , (long long int )tc->off, tc->wname); }else { -tst_res (TPASS ,"lseek(%s, %ld, %s) read correct data" , -TFILE , tc->off, tc->wname); +tst_res (TPASS ,"lseek(%s, %lli, %s) read correct data" , +TFILE , (long long int )tc->off, tc->wname); } }
testcases/kernel/syscalls/lseek/lseek07.c +9 -8
@@ -43,14 +43,15 @@ static void verify_lseek(unsigned int n)TEST (lseek (*tc->fd, tc->off,SEEK_SET ));if (TST_RET == (off_t) -1 ) { -tst_res (TFAIL |TTERRNO ,"lseek(%s, %ld, SEEK_SET) failed" , - tc->fname, tc->off); +tst_res (TFAIL |TTERRNO ,"lseek(%s, %lli, SEEK_SET) failed" , + tc->fname, (long long int )tc->off);return ; }if (TST_RET != tc->exp_off) { -tst_res (TFAIL ,"lseek(%s, %ld, SEEK_SET) returned %ld, expected %ld" , - tc->fname, tc->off,TST_RET , tc->exp_off); +tst_res (TFAIL ,"lseek(%s, %lli, SEEK_SET) returned %ld, expected %lli" , + tc->fname, (long long int )tc->off,TST_RET , + (long long int )tc->exp_off);return ; }
@@ -63,11 +64,11 @@ static void verify_lseek(unsigned int n)SAFE_READ (1 , *tc->fd, read_buf, tc->exp_size);if (strcmp (read_buf, tc->exp_data)) { -tst_res (TFAIL ,"lseek(%s, %ld, SEEK_SET) wrote incorrect data %s" , - tc->fname, tc->off, read_buf); +tst_res (TFAIL ,"lseek(%s, %lli, SEEK_SET) wrote incorrect data %s" , + tc->fname, (long long int )tc->off, read_buf); }else { -tst_res (TPASS ,"lseek(%s, %ld, SEEK_SET) wrote correct data %s" , - tc->fname, tc->off, read_buf); +tst_res (TPASS ,"lseek(%s, %lli, SEEK_SET) wrote correct data %s" , + tc->fname, (long long int )tc->off, read_buf); } }
testcases/kernel/syscalls/lseek/lseek11.c +6 -5
@@ -159,7 +159,7 @@ static void setup(void) fd =SAFE_OPEN (fname,O_RDWR |O_CREAT ,0666 );get_blocksize (); -tst_res (TINFO ,"The block size is %lu" , block_size); +tst_res (TINFO ,"The block size is %d" , block_size);/* * truncate to the expected file size directly, to keep away the effect
@@ -202,14 +202,15 @@ static void test_lseek(unsigned int n)if (rc !=0 ) {tst_res (TFAIL , -"The %uth test failed: %s from startblock %ld offset %ld, expect \'%s\' return \'%s\'" , +"The %uth test failed: %s from startblock %lli offset %lli, expect \'%s\' return \'%s\'" , n, (tp->whence ==SEEK_DATA ) ?"SEEK_DATA" :"SEEK_HOLE" , - tp->startblock, tp->offset, tp->data ? tp->data :"" , buf); + (long long int )tp->startblock, (long long int )tp->offset, + tp->data ? tp->data :"" , buf); }else {tst_res (TPASS , -"The %uth test passed: %s from startblock %ld offset %ld" , +"The %uth test passed: %s from startblock %lli offset %lli" , n, (tp->whence ==SEEK_DATA ) ?"SEEK_DATA" :"SEEK_HOLE" , - tp->startblock, tp->offset); + (long long int )tp->startblock, (long long int )tp->offset); } }
testcases/kernel/syscalls/sendfile/sendfile05.c +2 -1
@@ -39,7 +39,8 @@ static void run(void)off_t offset =-1 ;TST_EXP_FAIL (sendfile (out_fd, in_fd, &offset,1 ),EINVAL , -"sendfile(out, in, &offset, ..) with offset=%ld" , offset); +"sendfile(out, in, &offset, ..) with offset=%lli" , + (long long int )offset); }static struct tst_test test = {
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Randolph,
Quoted 3 lines
When compiling format string contains
off_ttype, to printoff_tcorrectly is cast it to (long long int) type and change the format string to %lli.
LGTM, I'd just use %lld instead of %lli (it's exactly the same, but %lld is IMHO more common.
Kind regards,
Petr
...
testcases/kernel/syscalls/lseek/lseek11.c static void setup(void) · line 162
Quoted 7 lines
+++
b/testcases/kernel/syscalls/lseek/lseek11.ctestcases/kernel/syscalls/lseek/lseek11.c +1
-1@@ -159,7 +159,7 @@ static void setup(void) fd =SAFE_OPEN (fname,O_RDWR |O_CREAT ,0666 );get_blocksize (); -tst_res (TINFO ,"The block size is %lu" , block_size); +tst_res (TINFO ,"The block size is %d" , block_size);
This is wrong. While blksize_t is on aarch64 and riscv64 int, on most archs is long, thus this needs to have the same approach as the rest (%lld and (long long int) cast.
with these 2 changes:
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp