Add argument to tprint_iov() specifying whether to decode each iovec

[strace] / sock.c

diff --git a/sock.c b/sock.c
index e7c72b55caa3c535dd8583c3f9935caa29dc9aa0..bbbdd5b9908352e3eb1df3fb5ba08b8d8a08fa3e 100644 (file)
--- a/sock.c
+++ b/sock.c
@@ -68,10 +68,7 @@ static const struct xlat iffflags[] = {
 
 
 static void
-print_addr(tcp, addr, ifr)
-struct tcb *tcp;
-long addr;
-struct ifreq *ifr;
+print_addr(struct tcb *tcp, long addr, struct ifreq *ifr)
 {
        if (ifr->ifr_addr.sa_family == AF_INET) {
                struct sockaddr_in *sinp;
@@ -193,7 +190,7 @@ sock_ioctl(struct tcb *tcp, long code, long arg)
                                          "AF_???");
                                tprintf(", ");
                                print_addr(tcp, ((long) tcp->u_arg[2]
-                                                + offsetof (struct ifreq,
+                                                + offsetof(struct ifreq,
                                                             ifr_addr.sa_data)),
                                           &ifr);
                                tprintf("}");
@@ -276,7 +273,7 @@ sock_ioctl(struct tcb *tcp, long code, long arg)
                                                  "AF_???");
                                        tprintf(", ");
                                        print_addr(tcp, ((long) tcp->u_arg[2]
-                                                        + offsetof (struct ifreq,
+                                                        + offsetof(struct ifreq,
                                                                     ifr_addr.sa_data)
                                                         + ((char *) &ifra[i]
                                                            - (char *) &ifra[0])),