]> granicus.if.org Git - strace/commitdiff
Remove scno_good logic in syscall exit
authorDenys Vlasenko <dvlasenk@redhat.com>
Wed, 24 Aug 2011 22:29:56 +0000 (00:29 +0200)
committerDenys Vlasenko <dvlasenk@redhat.com>
Wed, 24 Aug 2011 22:29:56 +0000 (00:29 +0200)
* syscall.c (trace_syscall_exiting): Remove scno_good logic,
it can't trigger in syscall exit.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
syscall.c

index b9b5d4aaab93af0da779047611dbe73a715ed0a2..5a09b31549cdcce81c1d53cbe1c0bc20a74fcb03 100644 (file)
--- a/syscall.c
+++ b/syscall.c
@@ -2290,14 +2290,14 @@ trace_syscall_exiting(struct tcb *tcp)
 {
        int sys_res;
        struct timeval tv;
-       int res, scno_good;
+       int res;
        long u_error;
 
        /* Measure the exit time as early as possible to avoid errors. */
        if (dtime || cflag)
                gettimeofday(&tv, NULL);
 
-       scno_good = res = get_syscall_result(tcp);
+       res = get_syscall_result(tcp);
        if (res == 0)
                return res;
        if (res == 1)
@@ -2317,14 +2317,10 @@ trace_syscall_exiting(struct tcb *tcp)
 
        if (tcp->flags & TCB_REPRINT) {
                printleader(tcp);
-               tprintf("<... ");
-               if (scno_good != 1)
-                       tprintf("????");
-               else if (tcp->scno >= nsyscalls || tcp->scno < 0)
-                       tprintf("syscall_%lu", tcp->scno);
+               if (tcp->scno >= nsyscalls || tcp->scno < 0)
+                       tprintf("<... syscall_%lu resumed> ", tcp->scno);
                else
-                       tprintf("%s", sysent[tcp->scno].sys_name);
-               tprintf(" resumed> ");
+                       tprintf("<... %s resumed> ", sysent[tcp->scno].sys_name);
        }
 
        if (cflag) {