From 2f738d580544208189b0e31619bd915d34a92577 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Fri, 3 Oct 2014 10:15:18 +0200
Subject: [PATCH] util: fix sockaddr function naming

---
 client.c   | 2 +-
 cmdmon.c   | 4 ++--
 nameserv.c | 2 +-
 ntp_io.c   | 8 ++++----
 util.c     | 4 ++--
 util.h     | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/client.c b/client.c
index e86781e..d0df889 100644
--- a/client.c
+++ b/client.c
@@ -137,7 +137,7 @@ open_io(const char *hostname, int port)
       assert(0);
   }
 
-  his_addr_len = UTI_IPAndPort2Sockaddr(&ip, port, &his_addr.u);
+  his_addr_len = UTI_IPAndPortToSockaddr(&ip, port, &his_addr.u);
 
   if (sock_fd < 0) {
     perror("Can't create socket");
diff --git a/cmdmon.c b/cmdmon.c
index e9d96c2..e74006c 100644
--- a/cmdmon.c
+++ b/cmdmon.c
@@ -706,7 +706,7 @@ transmit_reply(CMD_Reply *msg, union sockaddr_in46 *where_to, int auth_len)
     unsigned short port;
     IPAddr ip;
 
-    UTI_Sockaddr2IPAndPort(&where_to->u, &ip, &port);
+    UTI_SockaddrToIPAndPort(&where_to->u, &ip, &port);
     DEBUG_LOG(LOGF_CmdMon, "Could not send response to %s:%hu", UTI_IPToString(&ip), port);
   }
 }
@@ -1637,7 +1637,7 @@ read_from_cmd_socket(void *anything)
   LCL_ReadRawTime(&now);
   LCL_CookTime(&now, &cooked_now, NULL);
 
-  UTI_Sockaddr2IPAndPort(&where_from.u, &remote_ip, &remote_port);
+  UTI_SockaddrToIPAndPort(&where_from.u, &remote_ip, &remote_port);
 
   switch (remote_ip.family) {
     case IPADDR_INET4:
diff --git a/nameserv.c b/nameserv.c
index f977bd6..f55ea3c 100644
--- a/nameserv.c
+++ b/nameserv.c
@@ -120,7 +120,7 @@ DNS_IPAddress2Name(IPAddr *ip_addr, char *name, int len)
   socklen_t slen;
   char hbuf[NI_MAXHOST];
 
-  slen = UTI_IPAndPort2Sockaddr(ip_addr, 0, (struct sockaddr *)&in6);
+  slen = UTI_IPAndPortToSockaddr(ip_addr, 0, (struct sockaddr *)&in6);
   if (!getnameinfo((struct sockaddr *)&in6, slen, hbuf, sizeof (hbuf), NULL, 0, 0))
     result = hbuf;
 #else
diff --git a/ntp_io.c b/ntp_io.c
index 7dc20de..e90f58f 100644
--- a/ntp_io.c
+++ b/ntp_io.c
@@ -243,7 +243,7 @@ connect_socket(int sock_fd, NTP_Remote_Address *remote_addr)
   union sockaddr_in46 addr;
   socklen_t addr_len;
 
-  addr_len = UTI_IPAndPort2Sockaddr(&remote_addr->ip_addr, remote_addr->port, &addr.u);
+  addr_len = UTI_IPAndPortToSockaddr(&remote_addr->ip_addr, remote_addr->port, &addr.u);
 
   assert(addr_len);
 
@@ -466,7 +466,7 @@ read_from_socket(void *anything)
     if (msg.msg_namelen > sizeof (where_from))
       LOG_FATAL(LOGF_NtpIO, "Truncated source address");
 
-    UTI_Sockaddr2IPAndPort(&where_from.u, &remote_addr.ip_addr, &remote_addr.port);
+    UTI_SockaddrToIPAndPort(&where_from.u, &remote_addr.ip_addr, &remote_addr.port);
 
     local_addr.ip_addr.family = IPADDR_UNSPEC;
     local_addr.sock_fd = sock_fd;
@@ -550,8 +550,8 @@ send_packet(void *packet, int packetlen, NTP_Remote_Address *remote_addr, NTP_Lo
       local_addr->sock_fd == server_sock_fd6 ||
 #endif
       !separate_client_sockets) {
-    addrlen = UTI_IPAndPort2Sockaddr(&remote_addr->ip_addr, remote_addr->port,
-                                     &remote.u);
+    addrlen = UTI_IPAndPortToSockaddr(&remote_addr->ip_addr, remote_addr->port,
+                                      &remote.u);
     if (!addrlen)
       return 0;
   }
diff --git a/util.c b/util.c
index cc2318c..adc6ca5 100644
--- a/util.c
+++ b/util.c
@@ -427,7 +427,7 @@ UTI_CompareIPs(IPAddr *a, IPAddr *b, IPAddr *mask)
 /* ================================================== */
 
 void
-UTI_Sockaddr2IPAndPort(struct sockaddr *sa, IPAddr *ip, unsigned short *port)
+UTI_SockaddrToIPAndPort(struct sockaddr *sa, IPAddr *ip, unsigned short *port)
 {
   switch (sa->sa_family) {
     case AF_INET:
@@ -452,7 +452,7 @@ UTI_Sockaddr2IPAndPort(struct sockaddr *sa, IPAddr *ip, unsigned short *port)
 /* ================================================== */
 
 int
-UTI_IPAndPort2Sockaddr(IPAddr *ip, unsigned short port, struct sockaddr *sa)
+UTI_IPAndPortToSockaddr(IPAddr *ip, unsigned short port, struct sockaddr *sa)
 {
   switch (ip->family) {
     case IPADDR_INET4:
diff --git a/util.h b/util.h
index 8202254..81fdd7d 100644
--- a/util.h
+++ b/util.h
@@ -86,8 +86,8 @@ extern void UTI_IPHostToNetwork(IPAddr *src, IPAddr *dest);
 extern void UTI_IPNetworkToHost(IPAddr *src, IPAddr *dest);
 extern int UTI_CompareIPs(IPAddr *a, IPAddr *b, IPAddr *mask);
 
-extern void UTI_Sockaddr2IPAndPort(struct sockaddr *sa, IPAddr *ip, unsigned short *port);
-extern int UTI_IPAndPort2Sockaddr(IPAddr *ip, unsigned short port, struct sockaddr *sa);
+extern void UTI_SockaddrToIPAndPort(struct sockaddr *sa, IPAddr *ip, unsigned short *port);
+extern int UTI_IPAndPortToSockaddr(IPAddr *ip, unsigned short port, struct sockaddr *sa);
 
 extern char *UTI_TimeToLogForm(time_t t);