From a1d9c07f2f98e0ce07ec760c53089b76fbff9851 Mon Sep 17 00:00:00 2001
From: Denis Kenzior <denkenz@gmail.com>
Date: Sun, 19 May 2019 12:58:12 -0500
Subject: [PATCH] erp: Convert to using IWD_MODULE

---
 src/erp.c  | 9 +++++++--
 src/erp.h  | 3 ---
 src/main.c | 3 ---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/erp.c b/src/erp.c
index 030198a5..22938c32 100644
--- a/src/erp.c
+++ b/src/erp.c
@@ -31,6 +31,7 @@
 #include <ell/ell.h>
 
 #include "src/missing.h"
+#include "src/iwd.h"
 #include "src/eap-private.h"
 #include "src/erp.h"
 #include "src/crypto.h"
@@ -525,12 +526,16 @@ const void *erp_get_rmsk(struct erp_state *erp, size_t *rmsk_len)
 	return erp->rmsk;
 }
 
-void erp_init(void)
+static int erp_init(void)
 {
 	key_cache = l_queue_new();
+
+	return 0;
 }
 
-void erp_exit(void)
+static void erp_exit(void)
 {
 	l_queue_destroy(key_cache, erp_cache_entry_destroy);
 }
+
+IWD_MODULE(erp, erp_init, erp_exit)
diff --git a/src/erp.h b/src/erp.h
index 657b1b7b..d2c9da96 100644
--- a/src/erp.h
+++ b/src/erp.h
@@ -51,6 +51,3 @@ struct erp_cache_entry *erp_cache_get(const char *ssid);
 void erp_cache_put(struct erp_cache_entry *cache);
 
 const char *erp_cache_entry_get_identity(struct erp_cache_entry *cache);
-
-void erp_init(void);
-void erp_exit(void);
diff --git a/src/main.c b/src/main.c
index e6625850..2522e322 100644
--- a/src/main.c
+++ b/src/main.c
@@ -46,7 +46,6 @@
 #include "src/adhoc.h"
 #include "src/blacklist.h"
 #include "src/storage.h"
-#include "src/erp.h"
 
 #include "src/backtrace.h"
 
@@ -533,7 +532,6 @@ int main(int argc, char *argv[])
 	known_networks_init();
 	sim_auth_init();
 	blacklist_init();
-	erp_init();
 
 	if (iwd_modules_init() < 0)
 		goto fail_modules;
@@ -545,7 +543,6 @@ int main(int argc, char *argv[])
 
 fail_modules:
 	iwd_modules_exit();
-	erp_exit();
 	blacklist_exit();
 	sim_auth_exit();
 	known_networks_exit();