From: Dmitry V. Levin <ldv@altlinux.org>
Date: Mon, 7 Jan 2019 23:30:52 +0000 (+0000)
Subject: Remove PRINT_FIELD_INET4_ADDR
X-Git-Tag: v5.0~77
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b9a262af786c8a163a56eb9da2ba8fd7ebfec8e5;p=strace

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 54bf63b4..09c2419a 100644
--- 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 65e78494..2d2355c7 100644
--- 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 bcab1b73..9185ba74 100644
--- 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 3a37f448..b4a8c3be 100644
--- 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)