]> granicus.if.org Git - strace/commitdiff
bjm.c: make use of RVAL_DECODED
authorDmitry V. Levin <ldv@altlinux.org>
Mon, 20 Jul 2015 19:35:42 +0000 (19:35 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Mon, 20 Jul 2015 22:03:07 +0000 (22:03 +0000)
* bjm.c (sys_create_module, sys_delete_module, sys_init_module,
sys_finit_module): Update for RVAL_DECODED.

bjm.c

diff --git a/bjm.c b/bjm.c
index 31720530bc21d4dd2d131ae5aec18f4cd3d192c9..a607d169c9cd61502b6e39275311ca77cadce8cc 100644 (file)
--- a/bjm.c
+++ b/bjm.c
@@ -164,30 +164,27 @@ SYS_FUNC(query_module)
 
 SYS_FUNC(create_module)
 {
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprintf(", %lu", tcp->u_arg[1]);
-       }
-       return RVAL_HEX;
+       printpath(tcp, tcp->u_arg[0]);
+       tprintf(", %lu", tcp->u_arg[1]);
+
+       return RVAL_DECODED | RVAL_HEX;
 }
 
 SYS_FUNC(delete_module)
 {
-       if (entering(tcp)) {
-               printstr(tcp, tcp->u_arg[0], -1);
-               tprints(", ");
-               printflags(delete_module_flags, tcp->u_arg[1], "O_???");
-       }
-       return 0;
+       printstr(tcp, tcp->u_arg[0], -1);
+       tprints(", ");
+       printflags(delete_module_flags, tcp->u_arg[1], "O_???");
+
+       return RVAL_DECODED;
 }
 
 SYS_FUNC(init_module)
 {
-       if (entering(tcp)) {
-               tprintf("%#lx, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
-               printstr(tcp, tcp->u_arg[2], -1);
-       }
-       return 0;
+       tprintf("%#lx, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
+       printstr(tcp, tcp->u_arg[2], -1);
+
+       return RVAL_DECODED;
 }
 
 #define MODULE_INIT_IGNORE_MODVERSIONS  1
@@ -197,9 +194,6 @@ SYS_FUNC(init_module)
 
 SYS_FUNC(finit_module)
 {
-       if (exiting(tcp))
-               return 0;
-
        /* file descriptor */
        printfd(tcp, tcp->u_arg[0]);
        tprints(", ");
@@ -209,5 +203,5 @@ SYS_FUNC(finit_module)
        /* flags */
        printflags(module_init_flags, tcp->u_arg[2], "MODULE_INIT_???");
 
-       return 0;
+       return RVAL_DECODED;
 }