Convert has_address into a macro.

diff --git a/if.c b/if.c
index 9448dd13c2c3ed80ed561e279b1e5e7ec97ca735..57c6f531321acc6aafe49b3a30c485ad0f0bcbcd 100644 (file)
--- a/if.c
+++ b/if.c
@@ -493,14 +493,3 @@ get_address(const char *ifname)
                logger(LOG_ERR, "do_interface: %s", strerror(errno));
        return retval;
 }
-
-int
-has_address(const char *ifname, struct in_addr address)
-{
-       int retval;
-
-       retval = do_interface(ifname, NULL, NULL, &address, false, false);
-       if (retval == -1)
-               logger(LOG_ERR, "do_interface: %s", strerror(errno));
-       return retval;
-}

diff --git a/if.h b/if.h
index 3e436cf8113888e37e5bbde488737196ddee4129..8f3db08166fe622ecb710b4fadf4b7cdaacfe716 100644 (file)
--- a/if.h
+++ b/if.h
@@ -137,7 +137,8 @@ int flush_addresses(const char *);
 #define flush_addresses(ifname) \
        do_interface(ifname, NULL, NULL, NULL, true, false)
 in_addr_t get_address(const char *);
-int has_address(const char *, struct in_addr);
+#define has_address(ifname, addr) \
+       do_interface(ifname, NULL, NULL, (struct in_addr *)&(addr), false, false)
 
 int add_route(const char *, struct in_addr, struct in_addr, struct in_addr,
              int);