Skip to content

Commit 7e0c9ad

Browse files
mdouchametan-ucw
authored andcommitted
Unify error handling in include/tst_safe_prw.h
- Pedantically check syscall return values Signed-off-by: Martin Doucha <[email protected]> Reviewed-by: Cyril Hrubis <[email protected]>
1 parent 2932354 commit 7e0c9ad

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

include/tst_safe_prw.h

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,12 @@ static inline ssize_t safe_pread(const char *file, const int lineno,
1515

1616
if (rval == -1 || (len_strict && (size_t)rval != nbyte)) {
1717
tst_brk_(file, lineno, TBROK | TERRNO,
18-
"pread(%d,%p,%zu,%lld) failed",
19-
fildes, buf, nbyte, (long long)offset);
18+
"pread(%d,%p,%zu,%lld) failed",
19+
fildes, buf, nbyte, (long long)offset);
20+
} else if (rval < 0) {
21+
tst_brk_(file, lineno, TBROK | TERRNO,
22+
"Invalid pread(%d,%p,%zu,%lld) return value %zd",
23+
fildes, buf, nbyte, (long long)offset, rval);
2024
}
2125

2226
return rval;
@@ -34,8 +38,12 @@ static inline ssize_t safe_pwrite(const char *file, const int lineno,
3438
rval = pwrite(fildes, buf, nbyte, offset);
3539
if (rval == -1 || (len_strict && (size_t)rval != nbyte)) {
3640
tst_brk_(file, lineno, TBROK | TERRNO,
37-
"pwrite(%d,%p,%zu,%lld) failed",
38-
fildes, buf, nbyte, (long long)offset);
41+
"pwrite(%d,%p,%zu,%lld) failed",
42+
fildes, buf, nbyte, (long long)offset);
43+
} else if (rval < 0) {
44+
tst_brk_(file, lineno, TBROK | TERRNO,
45+
"Invalid pwrite(%d,%p,%zu,%lld) return value %zd",
46+
fildes, buf, nbyte, (long long)offset, rval);
3947
}
4048

4149
return rval;

0 commit comments

Comments
 (0)