From c68c5ce5639ecba483f7e8c55011a03b841d4182 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Wed, 11 May 2016 12:40:18 -0400
Subject: [PATCH] common/address_helper: drop entity_addr_from_sockaddr

entity_addr_t::set_sockaddr() does this.

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/common/address_helper.cc | 31 -------------------------------
 src/common/address_helper.h  |  2 --
 2 files changed, 33 deletions(-)

diff --git a/src/common/address_helper.cc b/src/common/address_helper.cc
index 4431cb6dd94..4637935ebc7 100644
--- a/src/common/address_helper.cc
+++ b/src/common/address_helper.cc
@@ -51,34 +51,3 @@ int entity_addr_from_url(entity_addr_t *addr /* out */, const char *url)
 	return 1;
 }
 
-int entity_addr_from_sockaddr(entity_addr_t *addr /* out */,
-			      const struct sockaddr *sa)
-{
-    struct sockaddr_in *sin;
-    struct sockaddr_in6 *sin6;
-
-    if (! sa)
-	return 0;
-
-    addr->addr.ss_family = sa->sa_family;
-    switch(sa->sa_family) {
-    case AF_INET:
-	sin = (struct sockaddr_in *) sa;
-	memcpy(&addr->addr4.sin_addr, &sin->sin_addr,
-	       sizeof(sin->sin_addr));
-	addr->addr4.sin_port = sin->sin_port;
-	break;
-    case AF_INET6:
-	sin6 = (struct sockaddr_in6 *) sa;
-	memcpy(&addr->addr6.sin6_addr, &sin6->sin6_addr,
-	       sizeof(sin6->sin6_addr));
-	addr->addr6.sin6_port = sin6->sin6_port;
-	break;
-    default:
-	break;
-    };
-
-    return 1;
-}
-
-
diff --git a/src/common/address_helper.h b/src/common/address_helper.h
index cdb60612c7f..047bd0a0b63 100644
--- a/src/common/address_helper.h
+++ b/src/common/address_helper.h
@@ -18,7 +18,5 @@
 #include "msg/msg_types.h"
 
 int entity_addr_from_url(entity_addr_t *addr /* out */, const char *url);
-int entity_addr_from_sockaddr(entity_addr_t *addr /* out */,
-			      const struct sockaddr *sa);
 
 #endif /* ADDRESS_HELPER_H_ */
-- 
2.47.3