ctdb-common: Make parse_ip() and parse_ipv4() static

parse_ip() has interface checking for IPv6 that is still used
indirectly by the IP takeover code via parse_ip_mask().  This will be
removed eventually.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Thu Oct  5 09:19:31 CEST 2017 on sn-devel-144

diff --git a/ctdb/common/system.h b/ctdb/common/system.h
index fad449bb951577d8fdf71afa4379949f1af2c9ff..ae01c58cfed62fe6a5ff38c83ba40a5e26cff188 100644 (file)
--- a/ctdb/common/system.h
+++ b/ctdb/common/system.h
@@ -48,9 +48,6 @@ int ctdb_get_peer_pid(const int fd, pid_t *peer_pid);
 bool set_scheduler(void);
 void reset_scheduler(void);
 
-bool parse_ipv4(const char *s, unsigned port, struct sockaddr_in *sin);
-bool parse_ip(const char *addr, const char *ifaces, unsigned port,
-             ctdb_sock_addr *saddr);
 bool parse_ip_mask(const char *str, const char *ifaces, ctdb_sock_addr *addr,
                   unsigned *mask);
 

diff --git a/ctdb/common/system_util.c b/ctdb/common/system_util.c
index 2641140d170137eeb8d391eb05fefed2c787608e..63dcd53795b1256280cdb4352353245ca1b636d7 100644 (file)
--- a/ctdb/common/system_util.c
+++ b/ctdb/common/system_util.c
@@ -114,7 +114,7 @@ void reset_scheduler(void)
 #endif
 }
 
-bool parse_ipv4(const char *s, unsigned port, struct sockaddr_in *sin)
+static bool parse_ipv4(const char *s, unsigned port, struct sockaddr_in *sin)
 {
        sin->sin_family = AF_INET;
        sin->sin_port   = htons(port);
@@ -161,7 +161,8 @@ static bool parse_ipv6(const char *s, const char *ifaces, unsigned port, ctdb_so
 /*
   parse an ip
  */
-bool parse_ip(const char *addr, const char *ifaces, unsigned port, ctdb_sock_addr *saddr)
+static bool parse_ip(const char *addr, const char *ifaces, unsigned port,
+                    ctdb_sock_addr *saddr)
 {
        char *p;
        bool ret;