Remove PRINT_FIELD_INET4_ADDR

Reduce code duplication by removing PRINT_FIELD_INET4_ADDR
and using PRINT_FIELD_INET_ADDR instead.

* print_fields.h (PRINT_FIELD_INET4_ADDR): Remove.
* msghdr.c (print_cmsg_ip_pktinfo): Use PRINT_FIELD_INET_ADDR
instead of PRINT_FIELD_INET4_ADDR.
* net.c (print_mreq): Likewise.
* sockaddr.c (print_sockaddr_data_in): Likewise.

diff --git a/msghdr.c b/msghdr.c
index 54bf63b40b36f82ffc607ccdc195bab6ba5825ec..09c2419a302891f19cd8672f3a0667b65407f570 100644 (file)
--- a/msghdr.c
+++ b/msghdr.c
@@ -107,8 +107,8 @@ print_cmsg_ip_pktinfo(struct tcb *tcp, const void *cmsg_data,
        const struct in_pktinfo *info = cmsg_data;
 
        PRINT_FIELD_IFINDEX("{", *info, ipi_ifindex);
-       PRINT_FIELD_INET4_ADDR(", ", *info, ipi_spec_dst);
-       PRINT_FIELD_INET4_ADDR(", ", *info, ipi_addr);
+       PRINT_FIELD_INET_ADDR(", ", *info, ipi_spec_dst, AF_INET);
+       PRINT_FIELD_INET_ADDR(", ", *info, ipi_addr, AF_INET);
        tprints("}");
 }
 

diff --git a/net.c b/net.c
index 65e78494173cb1aab13412a8203a4f537f25fa33..2d2355c7883e5d403689c763f59fa7cf2099ad17 100644 (file)
--- a/net.c
+++ b/net.c
@@ -898,8 +898,8 @@ print_mreq(struct tcb *const tcp, const kernel_ulong_t addr,
        if (len < (int) sizeof(mreq)) {
                printaddr(addr);
        } else if (!umove_or_printaddr(tcp, addr, &mreq)) {
-               PRINT_FIELD_INET4_ADDR("{", mreq, imr_multiaddr);
-               PRINT_FIELD_INET4_ADDR(", ", mreq, imr_interface);
+               PRINT_FIELD_INET_ADDR("{", mreq, imr_multiaddr, AF_INET);
+               PRINT_FIELD_INET_ADDR(", ", mreq, imr_interface, AF_INET);
                tprints("}");
        }
 }

diff --git a/print_fields.h b/print_fields.h
index bcab1b733754250a9bf74c0c8f91debaa982cb5b..9185ba74497e1a2c396a43078474227cc3af9f54 100644 (file)
--- a/print_fields.h
+++ b/print_fields.h
@@ -159,10 +159,6 @@
                                sizeof((where_).field_), #field_);      \
        } while (0)
 
-# define PRINT_FIELD_INET4_ADDR(prefix_, where_, field_)                       \
-       STRACE_PRINTF("%s%s=inet_addr(\"%s\")", (prefix_), #field_,     \
-                     inet_ntoa((where_).field_))
-
 # define PRINT_FIELD_AX25_ADDR(prefix_, where_, field_)                        \
        do {                                                            \
                STRACE_PRINTF("%s%s=", (prefix_), #field_);             \

diff --git a/sockaddr.c b/sockaddr.c
index 3a37f448770f74b5992106e66c65489e2d972ccd..b4a8c3be148fbb8c74412314ee2f0ea29a8ea485 100644 (file)
--- a/sockaddr.c
+++ b/sockaddr.c
@@ -146,7 +146,7 @@ print_sockaddr_data_in(const void *const buf, const int addrlen)
        const struct sockaddr_in *const sa_in = buf;
 
        PRINT_FIELD_NET_PORT("", *sa_in, sin_port);
-       PRINT_FIELD_INET4_ADDR(", ", *sa_in, sin_addr);
+       PRINT_FIELD_INET_ADDR(", ", *sa_in, sin_addr, AF_INET);
 }
 
 #define SIN6_MIN_LEN offsetof(struct sockaddr_in6, sin6_scope_id)