access.c: make use of RVAL_DECODED

ldv-alt · ldv-alt · commit 0b2eabeed439 · 2015-07-20T22:03:07.000Z
* access.c (decode_access, sys_faccessat): Update for RVAL_DECODED.
diff --git a/access.c b/access.c
@@ -7,12 +7,11 @@
 static int
 decode_access(struct tcb *tcp, int offset)
 {
-	if (entering(tcp)) {
-		printpath(tcp, tcp->u_arg[offset]);
-		tprints(", ");
-		printflags(access_flags, tcp->u_arg[offset + 1], "?_OK");
-	}
-	return 0;
+	printpath(tcp, tcp->u_arg[offset]);
+	tprints(", ");
+	printflags(access_flags, tcp->u_arg[offset + 1], "?_OK");
+
+	return RVAL_DECODED;
 }
 
 SYS_FUNC(access)
@@ -22,7 +21,6 @@ SYS_FUNC(access)
 
 SYS_FUNC(faccessat)
 {
-	if (entering(tcp))
-		print_dirfd(tcp, tcp->u_arg[0]);
+	print_dirfd(tcp, tcp->u_arg[0]);
 	return decode_access(tcp, 1);
 }

Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,11 @@`
`7`	`7`	`static int`
`8`	`8`	`decode_access(struct tcb *tcp, int offset)`
`9`	`9`	`{`
`10`		`- if (entering(tcp)) {`
`11`		`- printpath(tcp, tcp->u_arg[offset]);`
`12`		`- tprints(", ");`
`13`		`- printflags(access_flags, tcp->u_arg[offset + 1], "?_OK");`
`14`		`- }`
`15`		`- return 0;`
	`10`	`+ printpath(tcp, tcp->u_arg[offset]);`
	`11`	`+ tprints(", ");`
	`12`	`+ printflags(access_flags, tcp->u_arg[offset + 1], "?_OK");`
	`13`	`+`
	`14`	`+ return RVAL_DECODED;`
`16`	`15`	`}`
`17`	`16`
`18`	`17`	`SYS_FUNC(access)`
`@@ -22,7 +21,6 @@ SYS_FUNC(access)`
`22`	`21`
`23`	`22`	`SYS_FUNC(faccessat)`
`24`	`23`	`{`
`25`		`- if (entering(tcp))`
`26`		`- print_dirfd(tcp, tcp->u_arg[0]);`
	`24`	`+ print_dirfd(tcp, tcp->u_arg[0]);`
`27`	`25`	`return decode_access(tcp, 1);`
`28`	`26`	`}`