Remove HAVE_STRUCT_TCB_EXT_ARG, ext_arg, and u_lrval

[strace] / sock.c

diff --git a/sock.c b/sock.c
index dcc3e41ea670ab9826da4ef7f780940aca920a7e..48f843fadc1eb5879fb10f697684d77a3d151a69 100644 (file)
--- a/sock.c
+++ b/sock.c
@@ -51,7 +51,7 @@ print_ifname(const char *ifname)
 
 static void
 print_ifreq(struct tcb *const tcp, const unsigned int code,
-           const kernel_ureg_t arg, const struct ifreq *const ifr)
+           const kernel_ulong_t arg, const struct ifreq *const ifr)
 {
        switch (code) {
        case SIOCSIFADDR:
@@ -132,7 +132,7 @@ print_ifc_len(int len)
 }
 
 static int
-decode_ifconf(struct tcb *const tcp, const kernel_ureg_t addr)
+decode_ifconf(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        struct ifconf ifc;
 
@@ -171,7 +171,7 @@ decode_ifconf(struct tcb *const tcp, const kernel_ureg_t addr)
 
        struct ifreq ifra[nifra > max_strlen ? max_strlen : nifra];
        tprints(", ");
-       if (umove_or_printaddr(tcp, (kernel_ureg_t) ifc.ifc_buf, &ifra)) {
+       if (umove_or_printaddr(tcp, ptr_to_kulong(ifc.ifc_buf), &ifra)) {
                tprints("}");
                return RVAL_DECODED | 1;
        }
@@ -195,7 +195,7 @@ decode_ifconf(struct tcb *const tcp, const kernel_ureg_t addr)
 }
 
 int
-sock_ioctl(struct tcb *const tcp, const unsigned int code, const kernel_ureg_t arg)
+sock_ioctl(struct tcb *const tcp, const unsigned int code, const kernel_ulong_t arg)
 {
        struct ifreq ifr;
 
@@ -207,7 +207,7 @@ sock_ioctl(struct tcb *const tcp, const unsigned int code, const kernel_ureg_t a
        case SIOCBRADDBR:
        case SIOCBRDELBR:
                tprints(", ");
-               printstr(tcp, arg, -1);
+               printstr(tcp, arg);
                break;
 #endif