From b8f6899f4048d7945c5eed6acceba08fadf5a5b0 Mon Sep 17 00:00:00 2001
From: Denis Kenzior <denkenz@gmail.com>
Date: Sun, 19 May 2019 13:01:22 -0500
Subject: [PATCH] blacklist: Convert to use IWD_MODULE

---
 src/blacklist.c | 11 ++++++++---
 src/blacklist.h |  3 ---
 src/main.c      |  4 ----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/blacklist.c b/src/blacklist.c
index 2da276f7..b17154d9 100644
--- a/src/blacklist.c
+++ b/src/blacklist.c
@@ -152,7 +152,7 @@ void blacklist_remove_bss(const uint8_t *addr)
 	l_free(entry);
 }
 
-void blacklist_init(void)
+static int blacklist_init(void)
 {
 	const struct l_settings *config = iwd_get_config();
 
@@ -168,16 +168,21 @@ void blacklist_init(void)
 					&blacklist_multiplier))
 		blacklist_multiplier = BLACKLIST_DEFAULT_MULTIPLIER;
 
-	if (!l_settings_get_uint64(config, "Blacklist", "bss_blacklist_max_time",
+	if (!l_settings_get_uint64(config, "Blacklist",
+					"bss_blacklist_max_time",
 					&blacklist_max_timeout))
 		blacklist_max_timeout = BLACKLIST_DEFAULT_MAX_TIMEOUT;
 
 	blacklist_max_timeout *= 1000000;
 
 	blacklist = l_queue_new();
+
+	return 0;
 }
 
-void blacklist_exit(void)
+static void blacklist_exit(void)
 {
 	l_queue_destroy(blacklist, l_free);
 }
+
+IWD_MODULE(blacklist, blacklist_init, blacklist_exit)
diff --git a/src/blacklist.h b/src/blacklist.h
index 8161f4ed..56260e20 100644
--- a/src/blacklist.h
+++ b/src/blacklist.h
@@ -23,6 +23,3 @@
 void blacklist_add_bss(const uint8_t *addr);
 bool blacklist_contains_bss(const uint8_t *addr);
 void blacklist_remove_bss(const uint8_t *addr);
-
-void blacklist_init(void);
-void blacklist_exit(void);
diff --git a/src/main.c b/src/main.c
index 2522e322..6b8b5d40 100644
--- a/src/main.c
+++ b/src/main.c
@@ -44,7 +44,6 @@
 #include "src/plugin.h"
 #include "src/simauth.h"
 #include "src/adhoc.h"
-#include "src/blacklist.h"
 #include "src/storage.h"
 
 #include "src/backtrace.h"
@@ -531,8 +530,6 @@ int main(int argc, char *argv[])
 	network_init();
 	known_networks_init();
 	sim_auth_init();
-	blacklist_init();
-
 	if (iwd_modules_init() < 0)
 		goto fail_modules;
 
@@ -543,7 +540,6 @@ int main(int argc, char *argv[])
 
 fail_modules:
 	iwd_modules_exit();
-	blacklist_exit();
 	sim_auth_exit();
 	known_networks_exit();
 	network_exit();