print_sockaddr: remove "struct tcb *" argument

print_sockaddr does not use its first argument, remove it.

* defs.h (print_sockaddr): Remove argument.
* sockaddr.c (print_sockaddr): Remove argument.  All callers updated.
* sock.c (PRINT_IFREQ_ADDR): Likewise.

diff --git a/defs.h b/defs.h
index f23bca11e828b6155b891cc924a1257c4e7251c7..c6de8c1e79afc45d61702abf39c91e6f316a0b86 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -611,7 +611,7 @@ printpath(struct tcb *, kernel_ulong_t addr);
 #define TIMESPEC_TEXT_BUFSIZE \
                (sizeof(long long) * 3 * 2 + sizeof("{tv_sec=-, tv_nsec=}"))
 extern void printfd(struct tcb *, int);
-extern void print_sockaddr(struct tcb *, const void *sa, int len);
+extern void print_sockaddr(const void *sa, int len);
 extern bool
 print_inet_addr(int af, const void *addr, unsigned int len, const char *var_name);
 extern const char *get_sockaddr_by_inode(struct tcb *, int fd, unsigned long inode);

diff --git a/msghdr.c b/msghdr.c
index 9fcb1051d3141f59f1cc34941112040cce058033..72c1cbee4d4835ed2ba42c436823dc6600d95385 100644 (file)
--- a/msghdr.c
+++ b/msghdr.c
@@ -188,7 +188,7 @@ print_cmsg_ip_recverr(struct tcb *tcp, const void *cmsg_data,
                ", ee_info=%u, ee_data=%u, offender=",
                err->ee_errno, err->ee_origin, err->ee_type,
                err->ee_code, err->ee_info, err->ee_data);
-       print_sockaddr(tcp, &err->offender, sizeof(err->offender));
+       print_sockaddr(&err->offender, sizeof(err->offender));
        tprints("}");
 }
 
@@ -200,7 +200,7 @@ print_cmsg_ip_origdstaddr(struct tcb *tcp, const void *cmsg_data,
                data_len > sizeof(struct sockaddr_storage)
                ? sizeof(struct sockaddr_storage) : data_len;
 
-       print_sockaddr(tcp, cmsg_data, addr_len);
+       print_sockaddr(cmsg_data, addr_len);
 }
 
 typedef void (* const cmsg_printer)(struct tcb *, const void *, unsigned int);

diff --git a/net.c b/net.c
index 60051d3209050c055169ac1e73daadd03419cc0f..6b63fb184c456f2145181c78312eb184e49640eb 100644 (file)
--- a/net.c
+++ b/net.c
@@ -704,7 +704,7 @@ print_group_req(struct tcb *const tcp, const kernel_ulong_t addr, const int len)
 
        PRINT_FIELD_IFINDEX("{", greq, gr_interface);
        tprints(", gr_group=");
-       print_sockaddr(tcp, &greq.gr_group, sizeof(greq.gr_group));
+       print_sockaddr(&greq.gr_group, sizeof(greq.gr_group));
        tprints("}");
 
 }

diff --git a/sock.c b/sock.c
index 2da323d4f23c73377b207fb788cbc95030b0a144..08b0c1f1a888eb5bbb77f02ec98de78adcbf5d74 100644 (file)
--- a/sock.c
+++ b/sock.c
@@ -46,10 +46,10 @@ typedef struct ifreq struct_ifreq;
 
 #include "xlat/iffflags.h"
 
-#define PRINT_IFREQ_ADDR(tcp, ifr, sockaddr)                                   \
+#define PRINT_IFREQ_ADDR(ifr, sockaddr)                                        \
        do {                                                                    \
                tprints(#sockaddr "=");                                         \
-               print_sockaddr(tcp, &((ifr)->sockaddr),                         \
+               print_sockaddr(&((ifr)->sockaddr),                              \
                               sizeof((ifr)->sockaddr));                        \
        } while (0)
 
@@ -66,19 +66,19 @@ print_ifreq(struct tcb *const tcp, const unsigned int code,
        switch (code) {
        case SIOCSIFADDR:
        case SIOCGIFADDR:
-               PRINT_IFREQ_ADDR(tcp, ifr, ifr_addr);
+               PRINT_IFREQ_ADDR(ifr, ifr_addr);
                break;
        case SIOCSIFDSTADDR:
        case SIOCGIFDSTADDR:
-               PRINT_IFREQ_ADDR(tcp, ifr, ifr_dstaddr);
+               PRINT_IFREQ_ADDR(ifr, ifr_dstaddr);
                break;
        case SIOCSIFBRDADDR:
        case SIOCGIFBRDADDR:
-               PRINT_IFREQ_ADDR(tcp, ifr, ifr_broadaddr);
+               PRINT_IFREQ_ADDR(ifr, ifr_broadaddr);
                break;
        case SIOCSIFNETMASK:
        case SIOCGIFNETMASK:
-               PRINT_IFREQ_ADDR(tcp, ifr, ifr_netmask);
+               PRINT_IFREQ_ADDR(ifr, ifr_netmask);
                break;
        case SIOCSIFHWADDR:
        case SIOCGIFHWADDR: {
@@ -150,7 +150,7 @@ print_ifconf_ifreq(struct tcb *tcp, void *elem_buf, size_t elem_size,
        tprints("{ifr_name=");
        print_ifname(ifr->ifr_name);
        tprints(", ");
-       PRINT_IFREQ_ADDR(tcp, ifr, ifr_addr);
+       PRINT_IFREQ_ADDR(ifr, ifr_addr);
        tprints("}");
 
        return true;

diff --git a/sockaddr.c b/sockaddr.c
index 8f1945da005e2f701c4ffca466ca5fe5092e6432..b5fa35ca93657979ea6f727d56ab426d6884f08f 100644 (file)
--- a/sockaddr.c
+++ b/sockaddr.c
@@ -279,7 +279,7 @@ static const struct {
 };
 
 void
-print_sockaddr(struct tcb *tcp, const void *const buf, const int addrlen)
+print_sockaddr(const void *const buf, const int addrlen)
 {
        const struct sockaddr *const sa = buf;
 
@@ -323,7 +323,7 @@ decode_sockaddr(struct tcb *const tcp, const kernel_ulong_t addr, int addrlen)
 
        memset(&addrbuf.pad[addrlen], 0, sizeof(addrbuf.pad) - addrlen);
 
-       print_sockaddr(tcp, &addrbuf, addrlen);
+       print_sockaddr(&addrbuf, addrlen);
 
        return addrbuf.sa.sa_family;
 }