Skip to content

Commit 853602d

Browse files
mdouchametan-ucw
authored andcommitted
Unify error handling in moved functions
- Properly format caller file:line location - Pedantically check invalid syscall return values Signed-off-by: Martin Doucha <[email protected]> Reviewed-by: Cyril Hrubis <[email protected]>
1 parent 70e99a2 commit 853602d

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

lib/tst_safe_macros.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -403,9 +403,13 @@ int safe_dup(const char *file, const int lineno, int oldfd)
403403
int rval;
404404

405405
rval = dup(oldfd);
406+
406407
if (rval == -1) {
407408
tst_brk_(file, lineno, TBROK | TERRNO,
408-
"dup(%i) failed", oldfd);
409+
"dup(%i) failed", oldfd);
410+
} else if (rval < 0) {
411+
tst_brk_(file, lineno, TBROK | TERRNO,
412+
"Invalid dup(%i) return value %d", oldfd, rval);
409413
}
410414

411415
return rval;
@@ -437,7 +441,6 @@ void safe_cmd(const char *file, const int lineno, const char *const argv[],
437441
case 0:
438442
break;
439443
default:
440-
tst_brk(TBROK, "%s:%d: %s failed (%d)", file, lineno, argv[0],
441-
rval);
444+
tst_brk_(file, lineno, TBROK, "%s failed (%d)", argv[0], rval);
442445
}
443446
}

0 commit comments

Comments
 (0)