From: Jeremy Sowden <jeremy@azazel.net>
To: Netfilter Devel <netfilter-devel@vger.kernel.org>
Subject: [PATCH ulogd2 v2 v2 09/34] src: define constructors and destructors consistently
Date: Tue, 29 Nov 2022 21:47:24 +0000 [thread overview]
Message-ID: <20221129214749.247878-10-jeremy@azazel.net> (raw)
In-Reply-To: <20221129214749.247878-1-jeremy@azazel.net>
Remove separate declarations and declare the functions static.
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
filter/raw2packet/ulogd_raw2packet_BASE.c | 4 +---
filter/ulogd_filter_HWHDR.c | 4 +---
filter/ulogd_filter_IFINDEX.c | 4 +---
filter/ulogd_filter_IP2BIN.c | 4 +---
filter/ulogd_filter_IP2HBIN.c | 4 +---
filter/ulogd_filter_IP2STR.c | 4 +---
filter/ulogd_filter_MARK.c | 4 +---
filter/ulogd_filter_PRINTFLOW.c | 4 +---
filter/ulogd_filter_PRINTPKT.c | 4 +---
filter/ulogd_filter_PWSNIFF.c | 2 +-
input/flow/ulogd_inpflow_NFCT.c | 5 +----
input/packet/ulogd_inppkt_NFLOG.c | 4 +---
input/packet/ulogd_inppkt_ULOG.c | 11 ++++++-----
input/sum/ulogd_inpflow_NFACCT.c | 4 +---
output/dbi/ulogd_output_DBI.c | 4 ++--
output/ipfix/ulogd_output_IPFIX.c | 4 +---
output/mysql/ulogd_output_MYSQL.c | 4 +---
output/pcap/ulogd_output_PCAP.c | 4 +---
output/pgsql/ulogd_output_PGSQL.c | 4 +---
output/sqlite3/ulogd_output_SQLITE3.c | 5 +----
20 files changed, 26 insertions(+), 61 deletions(-)
diff --git a/filter/raw2packet/ulogd_raw2packet_BASE.c b/filter/raw2packet/ulogd_raw2packet_BASE.c
index 9117d27da09a..71ef006c90fb 100644
--- a/filter/raw2packet/ulogd_raw2packet_BASE.c
+++ b/filter/raw2packet/ulogd_raw2packet_BASE.c
@@ -1002,9 +1002,7 @@ static struct ulogd_plugin base_plugin = {
.version = VERSION,
};
-void __attribute__ ((constructor)) init(void);
-
-void init(void)
+static void __attribute__ ((constructor)) init(void)
{
ulogd_register_plugin(&base_plugin);
}
diff --git a/filter/ulogd_filter_HWHDR.c b/filter/ulogd_filter_HWHDR.c
index a5ee60dea44b..08a84fc49d75 100644
--- a/filter/ulogd_filter_HWHDR.c
+++ b/filter/ulogd_filter_HWHDR.c
@@ -236,9 +236,7 @@ static struct ulogd_plugin mac2str_pluging = {
.version = VERSION,
};
-void __attribute__ ((constructor)) init(void);
-
-void init(void)
+static __attribute__ ((constructor)) void init(void)
{
ulogd_register_plugin(&mac2str_pluging);
}
diff --git a/filter/ulogd_filter_IFINDEX.c b/filter/ulogd_filter_IFINDEX.c
index 3ca57955190c..2205e0025ca1 100644
--- a/filter/ulogd_filter_IFINDEX.c
+++ b/filter/ulogd_filter_IFINDEX.c
@@ -149,9 +149,7 @@ static struct ulogd_plugin ifindex_plugin = {
.version = VERSION,
};
-void __attribute__ ((constructor)) init(void);
-
-void init(void)
+static __attribute__ ((constructor)) void init(void)
{
ulogd_register_plugin(&ifindex_plugin);
}
diff --git a/filter/ulogd_filter_IP2BIN.c b/filter/ulogd_filter_IP2BIN.c
index 42bcd7c15f1b..ca6d3abae884 100644
--- a/filter/ulogd_filter_IP2BIN.c
+++ b/filter/ulogd_filter_IP2BIN.c
@@ -234,9 +234,7 @@ static struct ulogd_plugin ip2bin_pluging = {
.version = VERSION,
};
-void __attribute__ ((constructor)) init(void);
-
-void init(void)
+static __attribute__ ((constructor)) void init(void)
{
ulogd_register_plugin(&ip2bin_pluging);
}
diff --git a/filter/ulogd_filter_IP2HBIN.c b/filter/ulogd_filter_IP2HBIN.c
index 2711f9c3e12a..2d003a6335db 100644
--- a/filter/ulogd_filter_IP2HBIN.c
+++ b/filter/ulogd_filter_IP2HBIN.c
@@ -190,9 +190,7 @@ static struct ulogd_plugin ip2hbin_pluging = {
.version = VERSION,
};
-void __attribute__ ((constructor)) init(void);
-
-void init(void)
+static __attribute__ ((constructor)) void init(void)
{
ulogd_register_plugin(&ip2hbin_pluging);
}
diff --git a/filter/ulogd_filter_IP2STR.c b/filter/ulogd_filter_IP2STR.c
index 4d0536817b6c..177107fa8707 100644
--- a/filter/ulogd_filter_IP2STR.c
+++ b/filter/ulogd_filter_IP2STR.c
@@ -224,9 +224,7 @@ static struct ulogd_plugin ip2str_pluging = {
.version = VERSION,
};
-void __attribute__ ((constructor)) init(void);
-
-void init(void)
+static __attribute__ ((constructor)) void init(void)
{
ulogd_register_plugin(&ip2str_pluging);
}
diff --git a/filter/ulogd_filter_MARK.c b/filter/ulogd_filter_MARK.c
index 94343a2b6b5b..61b4d9a7eaea 100644
--- a/filter/ulogd_filter_MARK.c
+++ b/filter/ulogd_filter_MARK.c
@@ -111,9 +111,7 @@ static struct ulogd_plugin mark_pluging = {
.version = VERSION,
};
-void __attribute__ ((constructor)) init(void);
-
-void init(void)
+static __attribute__ ((constructor)) void init(void)
{
ulogd_register_plugin(&mark_pluging);
}
diff --git a/filter/ulogd_filter_PRINTFLOW.c b/filter/ulogd_filter_PRINTFLOW.c
index 95351f881c54..618b18b445c5 100644
--- a/filter/ulogd_filter_PRINTFLOW.c
+++ b/filter/ulogd_filter_PRINTFLOW.c
@@ -57,9 +57,7 @@ static struct ulogd_plugin printflow_plugin = {
.version = VERSION,
};
-void __attribute__ ((constructor)) init(void);
-
-void init(void)
+static __attribute__ ((constructor)) void init(void)
{
ulogd_register_plugin(&printflow_plugin);
}
diff --git a/filter/ulogd_filter_PRINTPKT.c b/filter/ulogd_filter_PRINTPKT.c
index de5c4688a4f1..7199e3cada07 100644
--- a/filter/ulogd_filter_PRINTPKT.c
+++ b/filter/ulogd_filter_PRINTPKT.c
@@ -57,9 +57,7 @@ static struct ulogd_plugin printpkt_plugin = {
.version = VERSION,
};
-void __attribute__ ((constructor)) init(void);
-
-void init(void)
+static __attribute__ ((constructor)) void init(void)
{
ulogd_register_plugin(&printpkt_plugin);
}
diff --git a/filter/ulogd_filter_PWSNIFF.c b/filter/ulogd_filter_PWSNIFF.c
index ef9e02115d84..6f4a04fc8329 100644
--- a/filter/ulogd_filter_PWSNIFF.c
+++ b/filter/ulogd_filter_PWSNIFF.c
@@ -170,7 +170,7 @@ static struct ulogd_plugin pwsniff_plugin = {
.version = VERSION,
};
-void __attribute__ ((constructor)) init(void)
+static void __attribute__ ((constructor)) init(void)
{
ulogd_register_plugin(&pwsniff_plugin);
}
diff --git a/input/flow/ulogd_inpflow_NFCT.c b/input/flow/ulogd_inpflow_NFCT.c
index 04910601fb8c..6209cdbd5dc1 100644
--- a/input/flow/ulogd_inpflow_NFCT.c
+++ b/input/flow/ulogd_inpflow_NFCT.c
@@ -1545,10 +1545,7 @@ static struct ulogd_plugin nfct_plugin = {
.version = VERSION,
};
-void __attribute__ ((constructor)) init(void);
-
-void init(void)
+static void __attribute__ ((constructor)) init(void)
{
ulogd_register_plugin(&nfct_plugin);
}
-
diff --git a/input/packet/ulogd_inppkt_NFLOG.c b/input/packet/ulogd_inppkt_NFLOG.c
index 4cbae69fee20..191716b6e2d7 100644
--- a/input/packet/ulogd_inppkt_NFLOG.c
+++ b/input/packet/ulogd_inppkt_NFLOG.c
@@ -712,9 +712,7 @@ struct ulogd_plugin libulog_plugin = {
.version = VERSION,
};
-void __attribute__ ((constructor)) init(void);
-
-void init(void)
+static void __attribute__ ((constructor)) init(void)
{
ulogd_register_plugin(&libulog_plugin);
}
diff --git a/input/packet/ulogd_inppkt_ULOG.c b/input/packet/ulogd_inppkt_ULOG.c
index bc271dbfd0b1..fd4f5693cab2 100644
--- a/input/packet/ulogd_inppkt_ULOG.c
+++ b/input/packet/ulogd_inppkt_ULOG.c
@@ -265,7 +265,8 @@ static int configure(struct ulogd_pluginstance *upi,
{
return config_parse_file(upi->id, upi->config_kset);
}
-static int init(struct ulogd_pluginstance *upi)
+
+static int start(struct ulogd_pluginstance *upi)
{
struct ulog_input *ui = (struct ulog_input *) &upi->private;
@@ -298,7 +299,7 @@ out_buf:
return -1;
}
-static int fini(struct ulogd_pluginstance *pi)
+static int stop(struct ulogd_pluginstance *pi)
{
struct ulog_input *ui = (struct ulog_input *)pi->private;
@@ -320,13 +321,13 @@ struct ulogd_plugin libulog_plugin = {
.num_keys = ARRAY_SIZE(output_keys),
},
.configure = &configure,
- .start = &init,
- .stop = &fini,
+ .start = &start,
+ .stop = &stop,
.config_kset = &libulog_kset,
.version = VERSION,
};
-void __attribute__ ((constructor)) initializer(void)
+static void __attribute__ ((constructor)) init(void)
{
ulogd_register_plugin(&libulog_plugin);
}
diff --git a/input/sum/ulogd_inpflow_NFACCT.c b/input/sum/ulogd_inpflow_NFACCT.c
index c680a52a80e8..9a1991e7aef7 100644
--- a/input/sum/ulogd_inpflow_NFACCT.c
+++ b/input/sum/ulogd_inpflow_NFACCT.c
@@ -300,9 +300,7 @@ static struct ulogd_plugin nfacct_plugin = {
.version = VERSION,
};
-void __attribute__ ((constructor)) init(void);
-
-void init(void)
+static void __attribute__ ((constructor)) init(void)
{
ulogd_register_plugin(&nfacct_plugin);
}
diff --git a/output/dbi/ulogd_output_DBI.c b/output/dbi/ulogd_output_DBI.c
index 95bd35789c08..7f42c08efc2b 100644
--- a/output/dbi/ulogd_output_DBI.c
+++ b/output/dbi/ulogd_output_DBI.c
@@ -307,14 +307,14 @@ static struct ulogd_plugin dbi_plugin = {
.version = VERSION,
};
-void __attribute__ ((constructor)) init(void)
+static void __attribute__ ((constructor)) init(void)
{
dbi_initialize_r(NULL, &libdbi_instance);
ulogd_register_plugin(&dbi_plugin);
}
-void __attribute__ ((destructor)) fini(void)
+static void __attribute__ ((destructor)) fini(void)
{
dbi_shutdown_r(libdbi_instance);
}
diff --git a/output/ipfix/ulogd_output_IPFIX.c b/output/ipfix/ulogd_output_IPFIX.c
index 745d30a163b2..45fd36bc271c 100644
--- a/output/ipfix/ulogd_output_IPFIX.c
+++ b/output/ipfix/ulogd_output_IPFIX.c
@@ -504,9 +504,7 @@ static struct ulogd_plugin ipfix_plugin = {
.version = VERSION,
};
-void __attribute__ ((constructor)) init(void);
-
-void init(void)
+static void __attribute__ ((constructor)) init(void)
{
ulogd_register_plugin(&ipfix_plugin);
}
diff --git a/output/mysql/ulogd_output_MYSQL.c b/output/mysql/ulogd_output_MYSQL.c
index 0b79a9cd270c..c98b98284748 100644
--- a/output/mysql/ulogd_output_MYSQL.c
+++ b/output/mysql/ulogd_output_MYSQL.c
@@ -278,9 +278,7 @@ static struct ulogd_plugin plugin_mysql = {
.version = VERSION,
};
-void __attribute__ ((constructor)) init(void);
-
-void init(void)
+static void __attribute__ ((constructor)) init(void)
{
ulogd_register_plugin(&plugin_mysql);
}
diff --git a/output/pcap/ulogd_output_PCAP.c b/output/pcap/ulogd_output_PCAP.c
index c125ffcd2a8f..5f9fde3c48ed 100644
--- a/output/pcap/ulogd_output_PCAP.c
+++ b/output/pcap/ulogd_output_PCAP.c
@@ -307,9 +307,7 @@ static struct ulogd_plugin pcap_plugin = {
.version = VERSION,
};
-void __attribute__ ((constructor)) init(void);
-
-void init(void)
+static void __attribute__ ((constructor)) init(void)
{
ulogd_register_plugin(&pcap_plugin);
}
diff --git a/output/pgsql/ulogd_output_PGSQL.c b/output/pgsql/ulogd_output_PGSQL.c
index 7f215f0fee4c..a508f9cf75a1 100644
--- a/output/pgsql/ulogd_output_PGSQL.c
+++ b/output/pgsql/ulogd_output_PGSQL.c
@@ -357,9 +357,7 @@ static struct ulogd_plugin pgsql_plugin = {
.version = VERSION,
};
-void __attribute__ ((constructor)) init(void);
-
-void init(void)
+static void __attribute__ ((constructor)) init(void)
{
ulogd_register_plugin(&pgsql_plugin);
}
diff --git a/output/sqlite3/ulogd_output_SQLITE3.c b/output/sqlite3/ulogd_output_SQLITE3.c
index 8dd7cec586cf..40d99ca3b249 100644
--- a/output/sqlite3/ulogd_output_SQLITE3.c
+++ b/output/sqlite3/ulogd_output_SQLITE3.c
@@ -435,10 +435,7 @@ static struct ulogd_plugin sqlite3_plugin = {
.version = VERSION,
};
-static void init(void) __attribute__((constructor));
-
-static void
-init(void)
+static void __attribute__ ((constructor)) init(void)
{
ulogd_register_plugin(&sqlite3_plugin);
}
--
2.35.1
next prev parent reply other threads:[~2022-11-29 21:48 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-29 21:47 [PATCH ulogd2 v2 v2 00/34] Refactor of the DB output plug-ins Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 01/34] ulogd: fix parse-error check Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 02/34] filter: fix buffer sizes in filter plug-ins Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 03/34] output: JSON: remove incorrect config value check Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 04/34] db: fix back-log capacity checks Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 05/34] build: add checks to configure.ac Jeremy Sowden
2022-11-30 10:04 ` Jan Engelhardt
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 06/34] src: remove some trailing white space Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 07/34] src: remove zero-valued config-key fields Jeremy Sowden
2022-11-30 10:21 ` Jan Engelhardt
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 08/34] src: parenthesize config-entry macro arguments Jeremy Sowden
2022-11-29 21:47 ` Jeremy Sowden [this message]
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 10/34] src: remove `TIME_ERR` macro Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 11/34] src: remove superfluous casts Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 12/34] conffile: replace malloc+strcpy with strdup Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 13/34] output: remove zero-initialized `struct ulogd_plugin` members Jeremy Sowden
2022-11-30 10:26 ` Jan Engelhardt
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 14/34] output: de-duplicate allocation of input keys Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 15/34] db: reorganize source Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 16/34] db: use consistent integer return values to indicate errors Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 17/34] db: change return type of two functions to `void` Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 18/34] db: open-code `_loop_reconnect_db` Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 19/34] db: improve calculation of sql statement length Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 20/34] db: refactor configuration Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 21/34] db: refactor ring-buffer initialization Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 22/34] db: refactor ring-buffer Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 23/34] db: refactor backlog Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 24/34] db: use `struct db_stmt` objects more widely Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 25/34] db: synchronize access to ring-buffer Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 26/34] db: avoid cancelling ring-buffer thread Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 27/34] db, IP2BIN: defer formatting of raw strings Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 28/34] db: add prep & exec support Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 29/34] output: mysql: " Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 30/34] output: pgsql: remove a couple of struct members Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 31/34] output: pgsql: remove variable-length arrays Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 32/34] output: pgsql: tidy up `open_db_pgsql` and fix memory leak Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 33/34] output: pgsql: add prep & exec support Jeremy Sowden
2022-11-29 21:47 ` [PATCH ulogd2 v2 v2 34/34] output: sqlite3: reimplement using the common DB API Jeremy Sowden
2022-11-30 10:27 ` [PATCH ulogd2 v2 v2 00/34] Refactor of the DB output plug-ins Pablo Neira Ayuso
2022-11-30 16:03 ` Jeremy Sowden
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221129214749.247878-10-jeremy@azazel.net \
--to=jeremy@azazel.net \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).