Remove HAVE_STRUCT_TCB_EXT_ARG, ext_arg, and u_lrval

[strace] / term.c

diff --git a/term.c b/term.c
index c913a468042c46659a609327a16c118cc63a0999..dcac3ccd36b32998e63c28a5b770d6aee1ed780b 100644 (file)
--- a/term.c
+++ b/term.c
@@ -38,7 +38,7 @@
 #include "xlat/modem_flags.h"
 
 static void
-decode_termios(struct tcb *tcp, const long addr)
+decode_termios(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        struct termios tios;
        int i;
@@ -67,14 +67,14 @@ decode_termios(struct tcb *tcp, const long addr)
        if (!(tios.c_lflag & ICANON))
                tprintf("c_cc[VMIN]=%d, c_cc[VTIME]=%d, ",
                        tios.c_cc[VMIN], tios.c_cc[VTIME]);
-       tprintf("c_cc=\"");
+       tprints("c_cc=\"");
        for (i = 0; i < NCCS; i++)
                tprintf("\\x%02x", tios.c_cc[i]);
-       tprintf("\"}");
+       tprints("\"}");
 }
 
 static void
-decode_termio(struct tcb *tcp, const long addr)
+decode_termio(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        struct termio tio;
        int i;
@@ -109,14 +109,14 @@ decode_termio(struct tcb *tcp, const long addr)
                tprintf("c_cc[VMIN]=%d, c_cc[VTIME]=%d, ",
                        tio.c_cc[VMIN], tio.c_cc[VTIME]);
 #endif /* !_VMIN */
-       tprintf("c_cc=\"");
+       tprints("c_cc=\"");
        for (i = 0; i < NCC; i++)
                tprintf("\\x%02x", tio.c_cc[i]);
-       tprintf("\"}");
+       tprints("\"}");
 }
 
 static void
-decode_winsize(struct tcb *tcp, const long addr)
+decode_winsize(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        struct winsize ws;
 
@@ -132,7 +132,7 @@ decode_winsize(struct tcb *tcp, const long addr)
 
 #ifdef TIOCGSIZE
 static void
-decode_ttysize(struct tcb *tcp, const long addr)
+decode_ttysize(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        struct ttysize ts;
 
@@ -148,7 +148,7 @@ decode_ttysize(struct tcb *tcp, const long addr)
 #endif
 
 static void
-decode_modem_flags(struct tcb *tcp, const long addr)
+decode_modem_flags(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        int i;
 
@@ -164,7 +164,8 @@ decode_modem_flags(struct tcb *tcp, const long addr)
 }
 
 int
-term_ioctl(struct tcb *tcp, const unsigned int code, const long arg)
+term_ioctl(struct tcb *const tcp, const unsigned int code,
+          const kernel_ulong_t arg)
 {
        switch (code) {
        /* struct termios */
@@ -222,11 +223,11 @@ term_ioctl(struct tcb *tcp, const unsigned int code, const long arg)
        /* ioctls with a direct decodable arg */
        case TCXONC:
                tprints(", ");
-               printxval(tcxonc_options, arg, "TC???");
+               printxval64(tcxonc_options, arg, "TC???");
                break;
        case TCFLSH:
                tprints(", ");
-               printxval(tcflsh_options, arg, "TC???");
+               printxval64(tcflsh_options, arg, "TC???");
                break;
        case TCSBRK:
        case TCSBRKP:
@@ -274,7 +275,7 @@ term_ioctl(struct tcb *tcp, const unsigned int code, const long arg)
        /* ioctls with an indirect parameter displayed as a char */
        case TIOCSTI:
                tprints(", ");
-               printstr(tcp, arg, 1);
+               printstrn(tcp, arg, 1);
                break;
 
        /* ioctls with no parameters */