cli: use <netlink-private/utils.h> in cli and _nl_{init,exit}

"netlink-private/utils.h" is our header-only, internal helper header.
We should be able to use it everywhere, not only inside the library
itself.

Unlike for exapmle <netlink-private/netlink.h>, which is only
usable from the libraries.

10 files changed, 40 insertions, 20 deletions

diff --git a/lib/cli/cls/basic.c b/lib/cli/cls/basic.c
index 90ef554..63ee8ab 100644
--- a/lib/cli/cls/basic.c
+++ b/lib/cli/cls/basic.c
@@ -8,6 +8,8 @@
 #include <netlink/cli/cls.h>
 #include <netlink/route/cls/basic.h>
 
+#include <netlink-private/utils.h>
+
 static void print_usage(void)
 {
 	printf(
@@ -76,12 +78,12 @@ static struct nl_cli_tc_module basic_module =
 	.tm_parse_argv		= parse_argv,
 };
 
-static void __init basic_init(void)
+static void _nl_init basic_init(void)
 {
 	nl_cli_tc_register(&basic_module);
 }
 
-static void __exit basic_exit(void)
+static void _nl_exit basic_exit(void)
 {
 	nl_cli_tc_unregister(&basic_module);
 }
diff --git a/lib/cli/cls/cgroup.c b/lib/cli/cls/cgroup.c
index 43536b5..41e0470 100644
--- a/lib/cli/cls/cgroup.c
+++ b/lib/cli/cls/cgroup.c
@@ -8,6 +8,8 @@
 #include <netlink/cli/cls.h>
 #include <netlink/route/cls/cgroup.h>
 
+#include <netlink-private/utils.h>
+
 static void print_usage(void)
 {
 	printf(
@@ -58,12 +60,12 @@ static struct nl_cli_tc_module cgroup_module =
 	.tm_parse_argv		= parse_argv,
 };
 
-static void __init cgroup_init(void)
+static void _nl_init cgroup_init(void)
 {
 	nl_cli_tc_register(&cgroup_module);
 }
 
-static void __exit cgroup_exit(void)
+static void _nl_exit cgroup_exit(void)
 {
 	nl_cli_tc_unregister(&cgroup_module);
 }
diff --git a/lib/cli/qdisc/bfifo.c b/lib/cli/qdisc/bfifo.c
index 7e53541..fa0535b 100644
--- a/lib/cli/qdisc/bfifo.c
+++ b/lib/cli/qdisc/bfifo.c
@@ -7,6 +7,8 @@
 #include <netlink/cli/tc.h>
 #include <netlink/route/qdisc/fifo.h>
 
+#include <netlink-private/utils.h>
+
 static void print_usage(void)
 {
 	printf(
@@ -66,12 +68,12 @@ static struct nl_cli_tc_module bfifo_module =
 	.tm_parse_argv		= bfifo_parse_argv,
 };
 
-static void __init bfifo_init(void)
+static void _nl_init bfifo_init(void)
 {
 	nl_cli_tc_register(&bfifo_module);
 }
 
-static void __exit bfifo_exit(void)
+static void _nl_exit bfifo_exit(void)
 {
 	nl_cli_tc_unregister(&bfifo_module);
 }
diff --git a/lib/cli/qdisc/blackhole.c b/lib/cli/qdisc/blackhole.c
index 2425ab7..59a6df6 100644
--- a/lib/cli/qdisc/blackhole.c
+++ b/lib/cli/qdisc/blackhole.c
@@ -6,6 +6,8 @@
 #include <netlink/cli/utils.h>
 #include <netlink/cli/tc.h>
 
+#include <netlink-private/utils.h>
+
 static void print_usage(void)
 {
 	printf(
@@ -47,12 +49,12 @@ static struct nl_cli_tc_module blackhole_module =
 	.tm_parse_argv		= blackhole_parse_argv,
 };
 
-static void __init blackhole_init(void)
+static void _nl_init blackhole_init(void)
 {
 	nl_cli_tc_register(&blackhole_module);
 }
 
-static void __exit blackhole_exit(void)
+static void _nl_exit blackhole_exit(void)
 {
 	nl_cli_tc_unregister(&blackhole_module);
 }
diff --git a/lib/cli/qdisc/fq_codel.c b/lib/cli/qdisc/fq_codel.c
index 90e609e..6b8f36b 100644
--- a/lib/cli/qdisc/fq_codel.c
+++ b/lib/cli/qdisc/fq_codel.c
@@ -7,6 +7,8 @@
 #include <netlink/cli/tc.h>
 #include <netlink/route/qdisc/fq_codel.h>
 
+#include <netlink-private/utils.h>
+
 static void print_usage(void)
 {
 	printf(
@@ -95,12 +97,12 @@ static struct nl_cli_tc_module fq_codel_module =
 	.tm_parse_argv		= fq_codel_parse_argv,
 };
 
-static void __init fq_codel_init(void)
+static void _nl_init fq_codel_init(void)
 {
 	nl_cli_tc_register(&fq_codel_module);
 }
 
-static void __exit fq_codel_exit(void)
+static void _nl_exit fq_codel_exit(void)
 {
 	nl_cli_tc_unregister(&fq_codel_module);
 }
diff --git a/lib/cli/qdisc/hfsc.c b/lib/cli/qdisc/hfsc.c
index cbbc100..7fba7c7 100644
--- a/lib/cli/qdisc/hfsc.c
+++ b/lib/cli/qdisc/hfsc.c
@@ -8,6 +8,8 @@
 #include <netlink/route/qdisc/hfsc.h>
 #include <linux/pkt_sched.h>
 
+#include <netlink-private/utils.h>
+
 static void print_qdisc_usage(void)
 {
 	printf(
@@ -233,13 +235,13 @@ static struct nl_cli_tc_module hfsc_class_module =
 	.tm_parse_argv		= hfsc_parse_class_argv,
 };
 
-static void __init hfsc_init(void)
+static void _nl_init hfsc_init(void)
 {
 	nl_cli_tc_register(&hfsc_qdisc_module);
 	nl_cli_tc_register(&hfsc_class_module);
 }
 
-static void __exit hfsc_exit(void)
+static void _nl_exit hfsc_exit(void)
 {
 	nl_cli_tc_unregister(&hfsc_class_module);
 	nl_cli_tc_unregister(&hfsc_qdisc_module);
diff --git a/lib/cli/qdisc/htb.c b/lib/cli/qdisc/htb.c
index 235701c..6c0ad65 100644
--- a/lib/cli/qdisc/htb.c
+++ b/lib/cli/qdisc/htb.c
@@ -7,6 +7,8 @@
 #include <netlink/cli/tc.h>
 #include <netlink/route/qdisc/htb.h>
 
+#include <netlink-private/utils.h>
+
 static void print_qdisc_usage(void)
 {
 	printf(
@@ -184,13 +186,13 @@ static struct nl_cli_tc_module htb_class_module =
 	.tm_parse_argv		= htb_parse_class_argv,
 };
 
-static void __init htb_init(void)
+static void _nl_init htb_init(void)
 {
 	nl_cli_tc_register(&htb_qdisc_module);
 	nl_cli_tc_register(&htb_class_module);
 }
 
-static void __exit htb_exit(void)
+static void _nl_exit htb_exit(void)
 {
 	nl_cli_tc_unregister(&htb_class_module);
 	nl_cli_tc_unregister(&htb_qdisc_module);
diff --git a/lib/cli/qdisc/ingress.c b/lib/cli/qdisc/ingress.c
index 3c2a6c0..14efe83 100644
--- a/lib/cli/qdisc/ingress.c
+++ b/lib/cli/qdisc/ingress.c
@@ -6,6 +6,8 @@
 #include <netlink/cli/utils.h>
 #include <netlink/cli/tc.h>
 
+#include <netlink-private/utils.h>
+
 static void print_usage(void)
 {
 	printf(
@@ -47,12 +49,12 @@ static struct nl_cli_tc_module ingress_module =
 	.tm_parse_argv		= ingress_parse_argv,
 };
 
-static void __init ingress_init(void)
+static void _nl_init ingress_init(void)
 {
 	nl_cli_tc_register(&ingress_module);
 }
 
-static void __exit ingress_exit(void)
+static void _nl_exit ingress_exit(void)
 {
 	nl_cli_tc_unregister(&ingress_module);
 }
diff --git a/lib/cli/qdisc/pfifo.c b/lib/cli/qdisc/pfifo.c
index fbda6eb..e540cfb 100644
--- a/lib/cli/qdisc/pfifo.c
+++ b/lib/cli/qdisc/pfifo.c
@@ -7,6 +7,8 @@
 #include <netlink/cli/tc.h>
 #include <netlink/route/qdisc/fifo.h>
 
+#include <netlink-private/utils.h>
+
 static void print_usage(void)
 {
 	printf(
@@ -59,12 +61,12 @@ static struct nl_cli_tc_module pfifo_module =
 	.tm_parse_argv		= pfifo_parse_argv,
 };
 
-static void __init pfifo_init(void)
+static void _nl_init pfifo_init(void)
 {
 	nl_cli_tc_register(&pfifo_module);
 }
 
-static void __exit pfifo_exit(void)
+static void _nl_exit pfifo_exit(void)
 {
 	nl_cli_tc_unregister(&pfifo_module);
 }
diff --git a/lib/cli/qdisc/plug.c b/lib/cli/qdisc/plug.c
index 549db0b..06151d4 100644
--- a/lib/cli/qdisc/plug.c
+++ b/lib/cli/qdisc/plug.c
@@ -7,6 +7,8 @@
 #include <netlink/cli/tc.h>
 #include <netlink/route/qdisc/plug.h>
 
+#include <netlink-private/utils.h>
+
 static void print_usage(void)
 {
 	printf(
@@ -95,12 +97,12 @@ static struct nl_cli_tc_module plug_module =
 	.tm_parse_argv		= plug_parse_argv,
 };
 
-static void __init plug_init(void)
+static void _nl_init plug_init(void)
 {
 	nl_cli_tc_register(&plug_module);
 }
 
-static void __exit plug_exit(void)
+static void _nl_exit plug_exit(void)
 {
 	nl_cli_tc_unregister(&plug_module);
 }