]> granicus.if.org Git - strace/commitdiff
chmod.c: make use of RVAL_DECODED
authorDmitry V. Levin <ldv@altlinux.org>
Mon, 20 Jul 2015 17:30:38 +0000 (17:30 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Mon, 20 Jul 2015 22:03:07 +0000 (22:03 +0000)
* chmod.c (decode_chmod): Change to return void.
(sys_chmod, sys_fchmodat): Update callers.  Update for RVAL_DECODED.
(sys_fchmod): Update for RVAL_DECODED.

chmod.c

diff --git a/chmod.c b/chmod.c
index 21ce11549f86a18a6938936d6cab31817aae29fe..83741c9e2abe9336a449b6d8c6027d8fba5a7e28 100644 (file)
--- a/chmod.c
+++ b/chmod.c
@@ -1,32 +1,31 @@
 #include "defs.h"
 
-static int
-decode_chmod(struct tcb *tcp, int offset)
+static void
+decode_chmod(struct tcb *tcp, const int offset)
 {
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[offset]);
-               tprintf(", %#lo", tcp->u_arg[offset + 1]);
-       }
-       return 0;
+       printpath(tcp, tcp->u_arg[offset]);
+       tprintf(", %#lo", tcp->u_arg[offset + 1]);
 }
 
 SYS_FUNC(chmod)
 {
-       return decode_chmod(tcp, 0);
+       decode_chmod(tcp, 0);
+
+       return RVAL_DECODED;
 }
 
 SYS_FUNC(fchmodat)
 {
-       if (entering(tcp))
-               print_dirfd(tcp, tcp->u_arg[0]);
-       return decode_chmod(tcp, 1);
+       print_dirfd(tcp, tcp->u_arg[0]);
+       decode_chmod(tcp, 1);
+
+       return RVAL_DECODED;
 }
 
 SYS_FUNC(fchmod)
 {
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprintf(", %#lo", tcp->u_arg[1]);
-       }
-       return 0;
+       printfd(tcp, tcp->u_arg[0]);
+       tprintf(", %#lo", tcp->u_arg[1]);
+
+       return RVAL_DECODED;
 }