From 67eeb0386db1e09b53df97ac7001c17903ae17b2 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Fri, 9 Aug 2019 02:37:37 -0500 Subject: [PATCH] network: Move network_info_match to knownnetworks.c --- src/knownnetworks.c | 14 ++++++++++++++ src/network.c | 14 -------------- src/network.h | 1 - 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/knownnetworks.c b/src/knownnetworks.c index 061ccee3..51b62573 100644 --- a/src/knownnetworks.c +++ b/src/knownnetworks.c @@ -214,6 +214,20 @@ bool known_networks_has_hidden(void) return num_known_hidden_networks ? true : false; } +static bool network_info_match(const void *a, const void *b) +{ + const struct network_info *ni_a = a; + const struct network_info *ni_b = b; + + if (ni_a->type != ni_b->type) + return false; + + if (strcmp(ni_a->ssid, ni_b->ssid)) + return false; + + return true; +} + struct network_info *known_networks_find(const char *ssid, enum security security) { diff --git a/src/network.c b/src/network.c index cab6e452..62b9996e 100644 --- a/src/network.c +++ b/src/network.c @@ -131,20 +131,6 @@ static void network_settings_close(struct network *network) network->settings = NULL; } -bool network_info_match(const void *a, const void *b) -{ - const struct network_info *ni_a = a; - const struct network_info *ni_b = b; - - if (ni_a->type != ni_b->type) - return false; - - if (strcmp(ni_a->ssid, ni_b->ssid)) - return false; - - return true; -} - static bool network_secret_check_cacheable(void *data, void *user_data) { struct eap_secret_info *secret = data; diff --git a/src/network.h b/src/network.h index ece5520b..be1ed974 100644 --- a/src/network.h +++ b/src/network.h @@ -89,4 +89,3 @@ struct network_info { struct network_info *network_info_add_known(const char *ssid, enum security security); void network_info_forget_known(struct network_info *network); -bool network_info_match(const void *a, const void *b);