summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2012-01-28 02:16:06 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2012-01-28 02:16:06 +0100
commitea051f75331ee4c7a44d5449a2d136288314879a (patch)
treefdb0fd14c0dad58eb4da2fc2c48da3efdd099f81
parent3af224c5cd8a64a6af3f875549ff821e2b5cb211 (diff)
downloadstrace-ea051f75331ee4c7a44d5449a2d136288314879a.tar.gz
Fix nanosleep decoding: second argument was not shown after success
* time.c (sys_nanosleep): Fix bug - inverted is_restart_error() check. * syscall.c (is_restart_error): Remove redundant check. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--syscall.c2
-rw-r--r--time.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/syscall.c b/syscall.c
index 88c976629..257531751 100644
--- a/syscall.c
+++ b/syscall.c
@@ -716,8 +716,6 @@ int
is_restart_error(struct tcb *tcp)
{
#ifdef LINUX
- if (!syserror(tcp))
- return 0;
switch (tcp->u_error) {
case ERESTARTSYS:
case ERESTARTNOINTR:
diff --git a/time.c b/time.c
index 875d2246d..497be75f7 100644
--- a/time.c
+++ b/time.c
@@ -271,7 +271,7 @@ sys_nanosleep(struct tcb *tcp)
print_timespec(tcp, tcp->u_arg[0]);
tprints(", ");
} else {
- if (!tcp->u_arg[1] || is_restart_error(tcp))
+ if (!tcp->u_arg[1] || !is_restart_error(tcp))
print_timespec(tcp, tcp->u_arg[1]);
else
tprintf("%#lx", tcp->u_arg[1]);