From: Dmitry V. Levin <ldv@altlinux.org>
Date: Sun, 24 Dec 2017 16:07:18 +0000 (+0000)
Subject: syscall: simplify get_syscall_result
X-Git-Tag: v4.21~240
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c82165113b37f7ed9d01123501e786f5b03c51d8;p=strace

syscall: simplify get_syscall_result

* syscall.c [ptrace_getregset_or_getregs] (get_syscall_result_regs):
Define to get_regs.
(get_syscall_result): Use get_syscall_result_regs unconditionally.
---

diff --git a/syscall.c b/syscall.c
index 1b6482e8..d41b6b37 100644
--- a/syscall.c
+++ b/syscall.c
@@ -1224,7 +1224,9 @@ get_scno(struct tcb *tcp)
 	return 1;
 }
 
-#ifndef ptrace_getregset_or_getregs
+#ifdef ptrace_getregset_or_getregs
+# define get_syscall_result_regs get_regs
+#else
 static int get_syscall_result_regs(struct tcb *);
 #endif
 
@@ -1236,13 +1238,8 @@ static int get_syscall_result_regs(struct tcb *);
 static int
 get_syscall_result(struct tcb *tcp)
 {
-#ifdef ptrace_getregset_or_getregs
-	if (get_regs(tcp) < 0)
-		return -1;
-#else
-	if (get_syscall_result_regs(tcp))
+	if (get_syscall_result_regs(tcp) < 0)
 		return -1;
-#endif
 	tcp->u_error = 0;
 	get_error(tcp, !(tcp->s_ent->sys_flags & SYSCALL_NEVER_FAILS));