do_adjtimex: parametrize print_timex

This is going to be used to implement a parser of clock_adjtime64
syscall.

* time.c (do_adjtimex): Add print_tx argument, invoke it
instead of print_timex.
(SYS_FUNC(adjtimex), SYS_FUNC(clock_adjtime)): Pass print_timex
to do_adjtimex.

diff --git a/time.c b/time.c
index f3dc1a8855cf8abb1ddb674a5443e08e4d086660..3ddc1e42bb2ae156819eaabd3c7c0c998cfe6572 100644 (file)
--- a/time.c
+++ b/time.c
@@ -152,9 +152,10 @@ SYS_FUNC(osf_setitimer)
 #include "xlat/adjtimex_state.h"
 
 static int
-do_adjtimex(struct tcb *const tcp, const kernel_ulong_t addr)
+do_adjtimex(struct tcb *const tcp, const print_obj_by_addr_fn print_tx,
+           const kernel_ulong_t addr)
 {
-       if (print_timex(tcp, addr))
+       if (print_tx(tcp, addr))
                return 0;
        tcp->auxstr = xlat_idx(adjtimex_state, ARRAY_SIZE(adjtimex_state) - 1,
                               (kernel_ulong_t) tcp->u_rval);
@@ -164,7 +165,7 @@ do_adjtimex(struct tcb *const tcp, const kernel_ulong_t addr)
 SYS_FUNC(adjtimex)
 {
        if (exiting(tcp))
-               return do_adjtimex(tcp, tcp->u_arg[0]);
+               return do_adjtimex(tcp, print_timex, tcp->u_arg[0]);
        return 0;
 }
 
@@ -256,7 +257,7 @@ SYS_FUNC(clock_nanosleep)
 SYS_FUNC(clock_adjtime)
 {
        if (exiting(tcp))
-               return do_adjtimex(tcp, tcp->u_arg[1]);
+               return do_adjtimex(tcp, print_timex, tcp->u_arg[1]);
        printclockname(tcp->u_arg[0]);
        tprints(", ");
        return 0;