summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2021-09-08 11:32:40 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2021-09-24 21:46:36 +0900
commitb87e96e2f2fa6673020d048a4fc6e3b83e635eb8 (patch)
tree0a4e1d9ae825e0c53c5fe75e0c7526b4e9c37f1a /src
parent3b6a3bdebfb555754fdc6ee507e3f6964de7b61c (diff)
downloadsystemd-b87e96e2f2fa6673020d048a4fc6e3b83e635eb8.tar.gz
network: address_equal() is not used anymore, hence move it to test-network.c
Diffstat (limited to 'src')
-rw-r--r--src/network/networkd-address.c10
-rw-r--r--src/network/networkd-address.h1
-rw-r--r--src/network/test-network.c10
3 files changed, 10 insertions, 11 deletions
diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index 4dd4f3691d..37c5c3cc6c 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -316,16 +316,6 @@ int address_compare_func(const Address *a1, const Address *a2) {
DEFINE_HASH_OPS_WITH_KEY_DESTRUCTOR(address_hash_ops, Address, address_hash_func, address_compare_func, address_free);
-bool address_equal(const Address *a1, const Address *a2) {
- if (a1 == a2)
- return true;
-
- if (!a1 || !a2)
- return false;
-
- return address_compare_func(a1, a2) == 0;
-}
-
int address_dup(const Address *src, Address **ret) {
_cleanup_(address_freep) Address *dest = NULL;
int r;
diff --git a/src/network/networkd-address.h b/src/network/networkd-address.h
index 0f291ba7f6..67b7580be6 100644
--- a/src/network/networkd-address.h
+++ b/src/network/networkd-address.h
@@ -63,7 +63,6 @@ Address* address_free(Address *address);
int address_get(Link *link, const Address *in, Address **ret);
int address_configure_handler_internal(sd_netlink *rtnl, sd_netlink_message *m, Link *link, const char *error_msg);
int address_remove(Address *address);
-bool address_equal(const Address *a1, const Address *a2);
int address_dup(const Address *src, Address **ret);
bool address_is_ready(const Address *a);
void address_set_broadcast(Address *a);
diff --git a/src/network/test-network.c b/src/network/test-network.c
index 49a332a7f9..8eb59b1ced 100644
--- a/src/network/test-network.c
+++ b/src/network/test-network.c
@@ -170,6 +170,16 @@ static int test_load_config(Manager *manager) {
return 0;
}
+static bool address_equal(const Address *a1, const Address *a2) {
+ if (a1 == a2)
+ return true;
+
+ if (!a1 || !a2)
+ return false;
+
+ return address_compare_func(a1, a2) == 0;
+}
+
static void test_address_equality(void) {
_cleanup_(address_freep) Address *a1 = NULL, *a2 = NULL;