]> granicus.if.org Git - strace/commitdiff
Move printargs* functions to util.c
authorElvira Khabirova <lineprinter0@gmail.com>
Sun, 12 Jun 2016 13:39:02 +0000 (16:39 +0300)
committerDmitry V. Levin <ldv@altlinux.org>
Tue, 14 Jun 2016 15:48:32 +0000 (15:48 +0000)
* syscall.c (printargs, printargs_u, printargs_d): Move ...
* util.c: ... here.

syscall.c
util.c

index d71ead340e80fcdd1a0854a72beb085a0995c595..e422d87ecf99e46d2d06be3665417060cf8ce588 100644 (file)
--- a/syscall.c
+++ b/syscall.c
@@ -630,40 +630,6 @@ decode_mips_subcall(struct tcb *tcp)
 }
 #endif
 
-int
-printargs(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               int i;
-               int n = tcp->s_ent->nargs;
-               for (i = 0; i < n; i++)
-                       tprintf("%s%#lx", i ? ", " : "", tcp->u_arg[i]);
-       }
-       return 0;
-}
-
-int
-printargs_u(struct tcb *tcp)
-{
-       const int n = tcp->s_ent->nargs;
-       int i;
-       for (i = 0; i < n; ++i)
-               tprintf("%s%u", i ? ", " : "",
-                       (unsigned int) tcp->u_arg[i]);
-       return RVAL_DECODED;
-}
-
-int
-printargs_d(struct tcb *tcp)
-{
-       const int n = tcp->s_ent->nargs;
-       int i;
-       for (i = 0; i < n; ++i)
-               tprintf("%s%d", i ? ", " : "",
-                       (int) tcp->u_arg[i]);
-       return RVAL_DECODED;
-}
-
 static void
 dumpio(struct tcb *tcp)
 {
diff --git a/util.c b/util.c
index de881f41b73405f7e4b789e3fddf2cf9c0b221cf..ea2e8699beb5cd120ba74ffb4b2dc8ff0f0a92de 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1400,3 +1400,37 @@ print_array(struct tcb *tcp,
 
        return cur >= end_addr;
 }
+
+int
+printargs(struct tcb *tcp)
+{
+       if (entering(tcp)) {
+               int i;
+               int n = tcp->s_ent->nargs;
+               for (i = 0; i < n; i++)
+                       tprintf("%s%#lx", i ? ", " : "", tcp->u_arg[i]);
+       }
+       return 0;
+}
+
+int
+printargs_u(struct tcb *tcp)
+{
+       const int n = tcp->s_ent->nargs;
+       int i;
+       for (i = 0; i < n; ++i)
+               tprintf("%s%u", i ? ", " : "",
+                       (unsigned int) tcp->u_arg[i]);
+       return RVAL_DECODED;
+}
+
+int
+printargs_d(struct tcb *tcp)
+{
+       const int n = tcp->s_ent->nargs;
+       int i;
+       for (i = 0; i < n; ++i)
+               tprintf("%s%d", i ? ", " : "",
+                       (int) tcp->u_arg[i]);
+       return RVAL_DECODED;
+}