diff --git a/plugins/alsa-utils.c b/plugins/alsa-utils.c index ddfaa284..a322d989 100644 --- a/plugins/alsa-utils.c +++ b/plugins/alsa-utils.c @@ -65,12 +65,12 @@ static plugin_t plugin = { .hook[HOOK_SHUTDOWN] = { .cb = save } }; -PLUGIN_INIT(plugin_init) +PLUGIN_INIT(__init) { plugin_register(&plugin); } -PLUGIN_EXIT(plugin_exit) +PLUGIN_EXIT(__exit) { plugin_unregister(&plugin); } diff --git a/plugins/bootmisc.c b/plugins/bootmisc.c index 1084e115..547fb527 100644 --- a/plugins/bootmisc.c +++ b/plugins/bootmisc.c @@ -177,12 +177,12 @@ static plugin_t plugin = { .depends = { "pidfile" }, }; -PLUGIN_INIT(plugin_init) +PLUGIN_INIT(__init) { plugin_register(&plugin); } -PLUGIN_EXIT(plugin_exit) +PLUGIN_EXIT(__exit) { plugin_unregister(&plugin); } diff --git a/plugins/dbus.c b/plugins/dbus.c index 84959441..9e8b1e4f 100644 --- a/plugins/dbus.c +++ b/plugins/dbus.c @@ -166,12 +166,12 @@ static plugin_t plugin = { .hook[HOOK_SVC_PLUGIN] = { .cb = setup }, }; -PLUGIN_INIT(plugin_init) +PLUGIN_INIT(__init) { plugin_register(&plugin); } -PLUGIN_EXIT(plugin_exit) +PLUGIN_EXIT(__exit) { plugin_unregister(&plugin); } diff --git a/plugins/hook-scripts.c b/plugins/hook-scripts.c index d67d25d0..9aa78173 100644 --- a/plugins/hook-scripts.c +++ b/plugins/hook-scripts.c @@ -99,12 +99,12 @@ static plugin_t plugin = { */ }; -PLUGIN_INIT(plugin_init) +PLUGIN_INIT(__init) { plugin_register(&plugin); } -PLUGIN_EXIT(plugin_exit) +PLUGIN_EXIT(__exit) { plugin_unregister(&plugin); } diff --git a/plugins/modprobe.c b/plugins/modprobe.c index f97ad116..3dcda26f 100644 --- a/plugins/modprobe.c +++ b/plugins/modprobe.c @@ -232,12 +232,12 @@ static plugin_t plugin = { .depends = { "bootmisc", } }; -PLUGIN_INIT(plugin_init) +PLUGIN_INIT(__init) { plugin_register(&plugin); } -PLUGIN_EXIT(plugin_exit) +PLUGIN_EXIT(__exit) { plugin_unregister(&plugin); } diff --git a/plugins/modules-load.c b/plugins/modules-load.c index 6168a6f9..ebacbe7e 100644 --- a/plugins/modules-load.c +++ b/plugins/modules-load.c @@ -216,12 +216,12 @@ static plugin_t plugin = { .hook[HOOK_SVC_PLUGIN] = { .cb = load }, }; -PLUGIN_INIT(plugin_init) +PLUGIN_INIT(__init) { plugin_register(&plugin); } -PLUGIN_EXIT(plugin_exit) +PLUGIN_EXIT(__exit) { plugin_unregister(&plugin); } diff --git a/plugins/netlink.c b/plugins/netlink.c index 043bd163..f452ebd5 100644 --- a/plugins/netlink.c +++ b/plugins/netlink.c @@ -414,7 +414,7 @@ static plugin_t plugin = { }, }; -PLUGIN_INIT(plugin_init) +PLUGIN_INIT(__init) { struct sockaddr_nl sa; int sd; @@ -447,7 +447,7 @@ PLUGIN_INIT(plugin_init) plugin_register(&plugin); } -PLUGIN_EXIT(plugin_exit) +PLUGIN_EXIT(__exit) { plugin_unregister(&plugin); close(plugin.io.fd); diff --git a/plugins/pidfile.c b/plugins/pidfile.c index f6496d4d..5ad65bed 100644 --- a/plugins/pidfile.c +++ b/plugins/pidfile.c @@ -338,7 +338,7 @@ static plugin_t plugin = { .depends = { "netlink" }, /* bootmisc depends on us */ }; -PLUGIN_INIT(plugin_init) +PLUGIN_INIT(__init) { int fd; @@ -353,7 +353,7 @@ PLUGIN_INIT(plugin_init) plugin_register(&plugin); } -PLUGIN_EXIT(plugin_exit) +PLUGIN_EXIT(__exit) { plugin_unregister(&plugin); iwatch_exit(&iw_pidfile); diff --git a/plugins/procps.c b/plugins/procps.c index 29ba7553..47524766 100644 --- a/plugins/procps.c +++ b/plugins/procps.c @@ -74,12 +74,12 @@ static plugin_t plugin = { .depends = { "bootmisc", }, }; -PLUGIN_INIT(plugin_init) +PLUGIN_INIT(__init) { plugin_register(&plugin); } -PLUGIN_EXIT(plugin_exit) +PLUGIN_EXIT(__exit) { plugin_unregister(&plugin); } diff --git a/plugins/resolvconf.c b/plugins/resolvconf.c index 992b63cd..4e4d375a 100644 --- a/plugins/resolvconf.c +++ b/plugins/resolvconf.c @@ -57,12 +57,12 @@ static plugin_t plugin = { .depends = { "bootmisc", }, }; -PLUGIN_INIT(plugin_init) +PLUGIN_INIT(__init) { plugin_register(&plugin); } -PLUGIN_EXIT(plugin_exit) +PLUGIN_EXIT(__exit) { plugin_unregister(&plugin); } diff --git a/plugins/rtc.c b/plugins/rtc.c index 8b722698..de96348d 100644 --- a/plugins/rtc.c +++ b/plugins/rtc.c @@ -320,7 +320,7 @@ static plugin_t plugin = { } }; -PLUGIN_INIT(plugin_init) +PLUGIN_INIT(__init) { struct tm tm = { 0 }; @@ -336,7 +336,7 @@ PLUGIN_INIT(plugin_init) plugin_register(&plugin); } -PLUGIN_EXIT(plugin_exit) +PLUGIN_EXIT(__exit) { uev_timer_stop(&rtc_timer); plugin_unregister(&plugin); diff --git a/plugins/sys.c b/plugins/sys.c index 9a8c20aa..c98a559a 100644 --- a/plugins/sys.c +++ b/plugins/sys.c @@ -184,7 +184,7 @@ static plugin_t plugin = { .depends = { "bootmisc", }, }; -PLUGIN_INIT(plugin_init) +PLUGIN_INIT(__init) { int fd; @@ -199,7 +199,7 @@ PLUGIN_INIT(plugin_init) plugin_register(&plugin); } -PLUGIN_EXIT(plugin_exit) +PLUGIN_EXIT(__exit) { plugin_unregister(&plugin); iwatch_exit(&iw_sys); diff --git a/plugins/tty.c b/plugins/tty.c index 7bcd2311..7ff982ea 100644 --- a/plugins/tty.c +++ b/plugins/tty.c @@ -108,13 +108,13 @@ static void tty_watcher(void *arg, int fd, int events) } } -PLUGIN_INIT(plugin_init) +PLUGIN_INIT(__init) { setup(); plugin_register(&plugin); } -PLUGIN_EXIT(plugin_exit) +PLUGIN_EXIT(__exit) { plugin_unregister(&plugin); if (plugin.io.fd) diff --git a/plugins/urandom.c b/plugins/urandom.c index 2de5f820..10b0da59 100644 --- a/plugins/urandom.c +++ b/plugins/urandom.c @@ -206,12 +206,12 @@ static plugin_t plugin = { .depends = { "bootmisc", } }; -PLUGIN_INIT(plugin_init) +PLUGIN_INIT(__init) { plugin_register(&plugin); } -PLUGIN_EXIT(plugin_exit) +PLUGIN_EXIT(__exit) { plugin_unregister(&plugin); } diff --git a/plugins/usr.c b/plugins/usr.c index 49f88ba9..1a29f868 100644 --- a/plugins/usr.c +++ b/plugins/usr.c @@ -108,7 +108,7 @@ static plugin_t plugin = { .depends = { "bootmisc", }, }; -PLUGIN_INIT(plugin_init) +PLUGIN_INIT(__init) { int fd; @@ -123,7 +123,7 @@ PLUGIN_INIT(plugin_init) plugin_register(&plugin); } -PLUGIN_EXIT(plugin_exit) +PLUGIN_EXIT(__exit) { plugin_unregister(&plugin); iwatch_exit(&iw_usr); diff --git a/plugins/x11-common.c b/plugins/x11-common.c index 08627044..01142f8d 100644 --- a/plugins/x11-common.c +++ b/plugins/x11-common.c @@ -50,12 +50,12 @@ static plugin_t plugin = { .hook[HOOK_SVC_PLUGIN] = { .cb = setup }, }; -PLUGIN_INIT(plugin_init) +PLUGIN_INIT(__init) { plugin_register(&plugin); } -PLUGIN_EXIT(plugin_exit) +PLUGIN_EXIT(__exit) { plugin_unregister(&plugin); }