From 0d7f591d4f7cd85b6bc586a5c5542de073ba5055 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Fri, 9 Aug 2019 02:33:50 -0500 Subject: [PATCH] network: Move network_info_free to knownnetworks.c --- src/knownnetworks.c | 9 +++++++++ src/network.c | 9 --------- src/network.h | 1 - 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/knownnetworks.c b/src/knownnetworks.c index 2c436080..061ccee3 100644 --- a/src/knownnetworks.c +++ b/src/knownnetworks.c @@ -46,6 +46,15 @@ static struct l_queue *known_networks; static size_t num_known_hidden_networks; static struct l_dir_watch *storage_dir_watch; +static void network_info_free(void *data) +{ + struct network_info *network = data; + + l_queue_destroy(network->known_frequencies, l_free); + + l_free(network); +} + static int connected_time_compare(const void *a, const void *b, void *user_data) { const struct network_info *ni_a = a; diff --git a/src/network.c b/src/network.c index a39c5195..cab6e452 100644 --- a/src/network.c +++ b/src/network.c @@ -247,15 +247,6 @@ bool network_rankmod(const struct network *network, double *rankmod) return true; } -void network_info_free(void *data) -{ - struct network_info *network = data; - - l_queue_destroy(network->known_frequencies, l_free); - - l_free(network); -} - struct network *network_create(struct station *station, const char *ssid, enum security security) { diff --git a/src/network.h b/src/network.h index ac5ca993..ece5520b 100644 --- a/src/network.h +++ b/src/network.h @@ -90,4 +90,3 @@ 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); -void network_info_free(void *data);