From nobody Fri Apr 11 13:52:52 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZYyn070fVz5s3XV; Fri, 11 Apr 2025 13:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZYyn06JWjz40Gb; Fri, 11 Apr 2025 13:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744379572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V1M5lyIdIGmKyRcWEcmsp8M0jMAi3eXxbE7C8bkUcew=; b=ZYMe9Y+uOqI1aY5fHO/q5wih8NIIk/tJoOoTx+uDj5JHQXDk5w35iI2bTEFjZxZK6WI3Qk pDJyAvf/4Xj2tWa+70ltKjgoPSgtLHZthFqfe8ricwKrclMn0X3W9X5vrXsOCsoywzXumd 7+mAstaUxM+oI7NWJL+ju3jlBvH/RzSBLqys6OU1rUGQQHsfvp6LtvujVvREIL5tN0mO67 y6dYr9s8/luWU1L5kCELpoO6R3PJ/xfdQf88wg98jJRqKO12El79FgdNu4wseSWh2b7sPT hc62XPQ9Tpmrwv4ZUm343bL5/YwpN/DBiN2pwLrl+xpsMT/oaTKAcvb79nvnjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744379572; a=rsa-sha256; cv=none; b=hGDsM6CEhVrXFwELkVg7+eEs7rGhGNcpVM7Dg5dsgcMMxX+d7rQ8TAy/5szOpOnR7yB6kB tz+b9EOHy+6xQlEi1bW83EC88obgb0cFGkyLADOwkAB7TQnVO6B/pdfMSYaLMhHfns268W igKtdq9lv93Kct6GDPwcT/uVDwDWEEDez66rOcp3O6xuEofgppykZ5gVPeFkvQ5Lczu8bT 5OxldLB8XVTQAPH1cOab0OT4YHnczD3e5QaX8yR/5awl62FkAofGj6PZ+qUZCubv0bQcWM q/Wo98Fh0/2+11bRXP+sPYoW7WoPgu48PFaqMkhfGG3Nnv5/fLB977cOrAyZ3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744379572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V1M5lyIdIGmKyRcWEcmsp8M0jMAi3eXxbE7C8bkUcew=; b=GI9UkFxnxD2POj/hXZaDWPFNFmQa7tnEpl1HeN4iuBoSCwe8Ht776TbDKTu8j+7JKtbspZ jdxDMfV34o4TJqC7h1aejl/SS8ow+rVZpqT7ZdzKfhWVqJBC/PvLtjasBciLVCe8bPzvlK IEpFOpU2ws/knzx4ihzm+R5u1r2+46h956KkXvrrKNWzOFwlS7PlkxoqUyzNOEQEDRkM+0 WdSkpxRy0IWoq9kriPBaIa1DahSp4SWQWxg9UzPzDT66GtvdY72kQcn4oIVQGdg+OIYJdk l57QaBqWPNWh3d3w6OOv5bG8bd1s8k23AYzWSJ56JPRPuO1+pF02IBNA9Kul2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZYyn05nVkzc71; Fri, 11 Apr 2025 13:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53BDqqNp033773; Fri, 11 Apr 2025 13:52:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53BDqqCQ033769; Fri, 11 Apr 2025 13:52:52 GMT (envelope-from git) Date: Fri, 11 Apr 2025 13:52:52 GMT Message-Id: <202504111352.53BDqqCQ033769@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 65eaf726201c - main - netlink: Move static arrays of parsers into tests that use them List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 65eaf726201cd81ecbc17b266786a042bccdf473 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=65eaf726201cd81ecbc17b266786a042bccdf473 commit 65eaf726201cd81ecbc17b266786a042bccdf473 Author: John Baldwin AuthorDate: 2025-04-11 01:30:34 +0000 Commit: John Baldwin 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 +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 +static const struct snl_hdr_parser *snl_all_genl_parsers[] = { + &_genl_ctrl_getfam_parser, &_genl_ctrl_mc_parser, +}; + static void require_netlink(void) {