Hoist pr_addr() up, it's AF independent; no obj change.

Diff between ping and ping6 is easier to read if all identical
or as close as possible to being identical functions are in one place.

2 files changed, 40 insertions, 41 deletions

diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index 7dc7cce5851..5089072fd5c 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ping.c,v 1.170 2016/09/11 18:19:32 florian Exp $	*/
+/*	$OpenBSD: ping.c,v 1.171 2016/09/11 18:21:09 florian Exp $	*/
 /*	$NetBSD: ping.c,v 1.20 1995/08/11 22:37:58 cgd Exp $	*/
 
 /*
@@ -710,6 +710,25 @@ summary(void)
 }
 
 /*
+ * pr_addr --
+ *	Return address in numeric form or a host name
+ */
+const char *
+pr_addr(struct sockaddr *addr, socklen_t addrlen)
+{
+	static char buf[NI_MAXHOST];
+	int flag = 0;
+
+	if ((options & F_HOSTNAME) == 0)
+		flag |= NI_NUMERICHOST;
+
+	if (getnameinfo(addr, addrlen, buf, sizeof(buf), NULL, 0, flag) == 0)
+		return (buf);
+	else
+		return "?";
+}
+
+/*
  * retransmit --
  *	This routine transmits another ping.
  */
@@ -1324,25 +1343,6 @@ pr_iph(struct ip *ip)
 }
 
 /*
- * pr_addr --
- *	Return address in numeric form or a host name
- */
-const char *
-pr_addr(struct sockaddr *addr, socklen_t addrlen)
-{
-	static char buf[NI_MAXHOST];
-	int flag = 0;
-
-	if ((options & F_HOSTNAME) == 0)
-		flag |= NI_NUMERICHOST;
-
-	if (getnameinfo(addr, addrlen, buf, sizeof(buf), NULL, 0, flag) == 0)
-		return (buf);
-	else
-		return "?";
-}
-
-/*
  * pr_retip --
  *	Dump some info on a returned (via ICMP) IP packet.
  */
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index 18724e57267..2852d6e8604 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ping6.c,v 1.175 2016/09/11 18:19:32 florian Exp $	*/
+/*	$OpenBSD: ping6.c,v 1.176 2016/09/11 18:21:09 florian Exp $	*/
 /*	$KAME: ping6.c,v 1.163 2002/10/25 02:19:06 itojun Exp $	*/
 
 /*
@@ -814,6 +814,25 @@ summary(void)
 }
 
 /*
+ * pr_addr --
+ *	Return address in numeric form or a host name
+ */
+const char *
+pr_addr(struct sockaddr *addr, socklen_t addrlen)
+{
+	static char buf[NI_MAXHOST];
+	int flag = 0;
+
+	if ((options & F_HOSTNAME) == 0)
+		flag |= NI_NUMERICHOST;
+
+	if (getnameinfo(addr, addrlen, buf, sizeof(buf), NULL, 0, flag) == 0)
+		return (buf);
+	else
+		return "?";
+}
+
+/*
  * retransmit --
  *	This routine transmits another ping6.
  */
@@ -1439,26 +1458,6 @@ pr_iph(struct ip6_hdr *ip6)
 }
 
 /*
- * pr_addr --
- *	Return an ascii host address as a dotted quad and optionally with
- * a hostname.
- */
-const char *
-pr_addr(struct sockaddr *addr, socklen_t addrlen)
-{
-	static char buf[NI_MAXHOST];
-	int flag = 0;
-
-	if ((options & F_HOSTNAME) == 0)
-		flag |= NI_NUMERICHOST;
-
-	if (getnameinfo(addr, addrlen, buf, sizeof(buf), NULL, 0, flag) == 0)
-		return (buf);
-	else
-		return "?";
-}
-
-/*
  * pr_retip --
  *	Dump some info on a returned (via ICMPv6) IPv6 packet.
  */