The branch main has been updated by jhb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=65eaf726201cd81ecbc17b266786a042bccdf473
commit 65eaf726201cd81ecbc17b266786a042bccdf473
Author: John Baldwin <j...@freebsd.org>
AuthorDate: 2025-04-11 01:30:34 +0000
Commit: John Baldwin <j...@freebsd.org>
CommitDate: 2025-04-11 13:52:39 +0000
netlink: Move static arrays of parsers into tests that use them
These are not documented as part of the API in the manpages and
raise warnings on GCC in the test-includes stage.
Reported by: -Wunused-variable
---
sys/netlink/netlink_snl.h | 5 -----
sys/netlink/netlink_snl_generic.h | 4 ----
sys/netlink/netlink_snl_route_parsers.h | 7 -------
tests/sys/netlink/test_snl.c | 12 ++++++++++++
tests/sys/netlink/test_snl_generic.c | 4 ++++
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/sys/netlink/netlink_snl.h b/sys/netlink/netlink_snl.h
index faaeebe52eac..586716776bc5 100644
--- a/sys/netlink/netlink_snl.h
+++ b/sys/netlink/netlink_snl.h
@@ -1327,9 +1327,4 @@ snl_send_msgs(struct snl_writer *nw)
return (snl_send(nw->ss, nw->base, offset));
}
-static const struct snl_hdr_parser *snl_all_core_parsers[] = {
- &snl_errmsg_parser, &snl_donemsg_parser,
- &_nla_bit_parser, &_nla_bitset_parser,
-};
-
#endif
diff --git a/sys/netlink/netlink_snl_generic.h
b/sys/netlink/netlink_snl_generic.h
index acf483ac0243..10e98a0266e0 100644
--- a/sys/netlink/netlink_snl_generic.h
+++ b/sys/netlink/netlink_snl_generic.h
@@ -172,8 +172,4 @@ snl_get_genl_mcast_group(struct snl_state *ss, const char
*family_name,
return (0);
}
-static const struct snl_hdr_parser *snl_all_genl_parsers[] = {
- &_genl_ctrl_getfam_parser, &_genl_ctrl_mc_parser,
-};
-
#endif
diff --git a/sys/netlink/netlink_snl_route_parsers.h
b/sys/netlink/netlink_snl_route_parsers.h
index 256edfec297d..6b7a8188180d 100644
--- a/sys/netlink/netlink_snl_route_parsers.h
+++ b/sys/netlink/netlink_snl_route_parsers.h
@@ -389,11 +389,4 @@ _cb_p_nh(struct snl_state *ss __unused, void *_target)
SNL_DECLARE_PARSER_EXT(snl_nhmsg_parser, sizeof(struct nhmsg),
sizeof(struct snl_parsed_nhop), _fp_p_nh, _nla_p_nh, _cb_p_nh);
-static const struct snl_hdr_parser *snl_all_route_parsers[] = {
- &_metrics_mp_nh_parser, &_mpath_nh_parser, &_metrics_parser,
&snl_rtm_route_parser,
- &_link_fbsd_parser, &snl_rtm_link_parser, &snl_rtm_link_parser_simple,
- &_neigh_fbsd_parser, &snl_rtm_neigh_parser,
- &_addr_fbsd_parser, &snl_rtm_addr_parser, &_nh_fbsd_parser,
&snl_nhmsg_parser,
-};
-
#endif
diff --git a/tests/sys/netlink/test_snl.c b/tests/sys/netlink/test_snl.c
index bd607efa82fc..040414a96e2c 100644
--- a/tests/sys/netlink/test_snl.c
+++ b/tests/sys/netlink/test_snl.c
@@ -13,6 +13,18 @@
#include <atf-c.h>
+static const struct snl_hdr_parser *snl_all_core_parsers[] = {
+ &snl_errmsg_parser, &snl_donemsg_parser,
+ &_nla_bit_parser, &_nla_bitset_parser,
+};
+
+static const struct snl_hdr_parser *snl_all_route_parsers[] = {
+ &_metrics_mp_nh_parser, &_mpath_nh_parser, &_metrics_parser,
&snl_rtm_route_parser,
+ &_link_fbsd_parser, &snl_rtm_link_parser, &snl_rtm_link_parser_simple,
+ &_neigh_fbsd_parser, &snl_rtm_neigh_parser,
+ &_addr_fbsd_parser, &snl_rtm_addr_parser, &_nh_fbsd_parser,
&snl_nhmsg_parser,
+};
+
static void
require_netlink(void)
{
diff --git a/tests/sys/netlink/test_snl_generic.c
b/tests/sys/netlink/test_snl_generic.c
index 839127fe5232..c63b1380f2ad 100644
--- a/tests/sys/netlink/test_snl_generic.c
+++ b/tests/sys/netlink/test_snl_generic.c
@@ -11,6 +11,10 @@
#include <atf-c.h>
+static const struct snl_hdr_parser *snl_all_genl_parsers[] = {
+ &_genl_ctrl_getfam_parser, &_genl_ctrl_mc_parser,
+};
+
static void
require_netlink(void)
{
