From nobody Sat Apr 08 19:44:53 2023 X-Original-To: dev-commits-src-branches@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 4Pv5Ky0319z44nXl; Sat, 8 Apr 2023 19:44:54 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pv5Kx55qMz440N; Sat, 8 Apr 2023 19:44:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680983093; 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=h20CPFKSwl0e8kZ8Sqsbb8L7WLCA3Ixkgg0f4ntRUCc=; b=I7FoSWIAgsY1inbqZlZh99dvqPfwolbey0Nuf6qjyxY++uxyEv7YtHPByJtuxDqJUvrxmA ruWgU+wFmV9doqRfwZHCMcVdjtGPzdnEWVG/vuGC22v5LdlIixuLysRh4tJ8X4phf853IS gHPdRBOrqeDVZC+EIgiX+oLvXHqiPUFq0NI1UFjspuO3I5eRBEjsWgqYq/3E/XpwWxEFqq WveFHXW5/Axn9nZBk1fAq+xfIjBMg43xAlluCpX2VHa6pcAtC7Rq55yInQiZF43vPq9Jrd hitEgnDoltXrugeSRr32FDgLhOiO78rM63oMP1upDyYhgb908uRSJDcadk7BfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680983093; 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=h20CPFKSwl0e8kZ8Sqsbb8L7WLCA3Ixkgg0f4ntRUCc=; b=cL6WOgINEhBUCgaBsrG0WVw6055JUv2rBpOYjlKHUIrWmn7OtoqUJMtNEyScUYzOzyuOeG QRNaU9fvfS+SWHjYs6619mXMsCtlrS1LDM3gp0zDvyUBLrYvpiAc+4DIAuYALiOIkYWiYw p19BU/AkdAd3eU4bjRiFhU6nx9h0yNWO5Vp4Mv3A0Uvpad6bmK5vK3JpbuvzM6iw30Zdb6 asWOjfneQh1UNTg+Pn22uc+3gRNDVpJ8DOhTb2Q9vJZf7ORMdoAfhfRRY8vH7cewIY/UMk hj3yA7SoNciM4niMdNQsLV8JfpIsvyHWuO2gLWjYprvPHTv3p7f8eLJwV4NbwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680983093; a=rsa-sha256; cv=none; b=oj5qhW21WCxRBe1kbnxQx05+IBkhu55ZVk0XGQ2YNnkMhBxuqdIh6oUiK4rr826Nu0u03A RN4xcnb1e8HcEniVHBGXRbxFs99M4wCRtPaGf2PKrcDu4GF8p+DHFNzPbhirlo0Wz92aPD 3yQScGI/al+9KpllynK6x/hk6Ky0+Nl8Vg5TQUD35nyLyh6I6O3sghc+f/nSTabisNfZFs mAwZothhz+EGm35rK+PP1GYfjKWCL/UFlNnt6oiC4e7jPQGz0GzUnovYEPWqbzGIb4zHfi KprQjGSyYIca+qek9YbZ50D2LWK1qIF8EDIVYixA17jcf0V692dKO8oW5r3Yww== 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 4Pv5Kx33gmzfss; Sat, 8 Apr 2023 19:44:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 338JirnE018752; Sat, 8 Apr 2023 19:44:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 338JirXw018751; Sat, 8 Apr 2023 19:44:53 GMT (envelope-from git) Date: Sat, 8 Apr 2023 19:44:53 GMT Message-Id: <202304081944.338JirXw018751@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 32bd3c9438e7 - stable/13 - fix buildworld after 595d23f777dc. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 32bd3c9438e725673e32aff2e95d534d080fe263 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=32bd3c9438e725673e32aff2e95d534d080fe263 commit 32bd3c9438e725673e32aff2e95d534d080fe263 Author: Alexander V. Chernikov AuthorDate: 2023-03-09 15:44:59 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-08 19:06:08 +0000 fix buildworld after 595d23f777dc. Reported by: se (cherry picked from commit da4047d3ba23201ae4049dccea1151bd6ca2d1df) --- sys/netlink/netlink_snl.h | 4 ++-- sys/netlink/netlink_snl_route.h | 8 ++++---- sys/netlink/netlink_snl_route_compat.h | 3 +++ sys/netlink/netlink_snl_route_parsers.h | 9 +++++---- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/sys/netlink/netlink_snl.h b/sys/netlink/netlink_snl.h index 4e6524783310..31b90003b519 100644 --- a/sys/netlink/netlink_snl.h +++ b/sys/netlink/netlink_snl.h @@ -677,7 +677,7 @@ snl_add_msg_attr(struct snl_writer *nw, int attr_type, int attr_len, const void return (false); } - struct nlattr *nla = (struct nlattr *)(&nw->base[nw->offset]); + struct nlattr *nla = (struct nlattr *)(void *)(&nw->base[nw->offset]); nla->nla_len = attr_len + sizeof(struct nlattr); nla->nla_type = attr_type; @@ -838,7 +838,7 @@ snl_finalize_msg(struct snl_writer *nw) return (NULL); } -static bool +static inline bool snl_send_msgs(struct snl_writer *nw) { int offset = nw->offset; diff --git a/sys/netlink/netlink_snl_route.h b/sys/netlink/netlink_snl_route.h index 281794a9d6f7..e67bffde215e 100644 --- a/sys/netlink/netlink_snl_route.h +++ b/sys/netlink/netlink_snl_route.h @@ -134,10 +134,10 @@ snl_add_msg_attr_ip(struct snl_writer *nw, int attrtype, const struct sockaddr * switch (sa->sa_family) { case AF_INET: - addr = &((const struct sockaddr_in *)sa)->sin_addr; + addr = &((const struct sockaddr_in *)(const void *)sa)->sin_addr; return (snl_add_msg_attr(nw, attrtype, 4, addr)); case AF_INET6: - addr = &((const struct sockaddr_in6 *)sa)->sin6_addr; + addr = &((const struct sockaddr_in6 *)(const void *)sa)->sin6_addr; return (snl_add_msg_attr(nw, attrtype, 16, addr)); } @@ -153,10 +153,10 @@ snl_add_msg_attr_ipvia(struct snl_writer *nw, int attrtype, const struct sockadd switch (sa->sa_family) { case AF_INET: - memcpy(&buf[1], &((const struct sockaddr_in *)sa)->sin_addr, 4); + memcpy(&buf[1], &((const struct sockaddr_in *)(const void *)sa)->sin_addr, 4); return (snl_add_msg_attr(nw, attrtype, 5, buf)); case AF_INET6: - memcpy(&buf[1], &((const struct sockaddr_in6 *)sa)->sin6_addr, 16); + memcpy(&buf[1], &((const struct sockaddr_in6 *)(const void *)sa)->sin6_addr, 16); return (snl_add_msg_attr(nw, attrtype, 17, buf)); } diff --git a/sys/netlink/netlink_snl_route_compat.h b/sys/netlink/netlink_snl_route_compat.h index 51904abb4003..0314c5715e4f 100644 --- a/sys/netlink/netlink_snl_route_compat.h +++ b/sys/netlink/netlink_snl_route_compat.h @@ -27,6 +27,9 @@ #ifndef _NETLINK_NETLINK_SNL_ROUTE_COMPAT_H_ #define _NETLINK_NETLINK_SNL_ROUTE_COMPAT_H_ +#include +#include + /* * This file contains netlink-compatible definitions from the * net/route.h header. diff --git a/sys/netlink/netlink_snl_route_parsers.h b/sys/netlink/netlink_snl_route_parsers.h index a76fb7da8ec2..a370f89fb9e3 100644 --- a/sys/netlink/netlink_snl_route_parsers.h +++ b/sys/netlink/netlink_snl_route_parsers.h @@ -28,7 +28,7 @@ #define _NETLINK_NETLINK_SNL_ROUTE_PARSERS_H_ #include -#include +#include /* TODO: this file should be generated automatically */ @@ -72,7 +72,8 @@ struct rta_mpath { }; static bool -nlattr_get_multipath(struct snl_state *ss, struct nlattr *nla, const void *arg, void *target) +nlattr_get_multipath(struct snl_state *ss, struct nlattr *nla, const void *arg __unused, + void *target) { int data_len = nla->nla_len - sizeof(struct nlattr); struct rtnexthop *rtnh; @@ -83,7 +84,7 @@ nlattr_get_multipath(struct snl_state *ss, struct nlattr *nla, const void *arg, struct rta_mpath *mp = snl_allocz(ss, sz); mp->num_nhops = 0; - for (rtnh = (struct rtnexthop *)(nla + 1); data_len > 0; ) { + for (rtnh = (struct rtnexthop *)(void *)(nla + 1); data_len > 0; ) { struct rta_mpath_nh *mpnh = &mp->nhops[mp->num_nhops++]; if (!snl_parse_header(ss, rtnh, rtnh->rtnh_len, &_mpath_nh_parser, mpnh)) @@ -91,7 +92,7 @@ nlattr_get_multipath(struct snl_state *ss, struct nlattr *nla, const void *arg, int len = NL_ITEM_ALIGN(rtnh->rtnh_len); data_len -= len; - rtnh = (struct rtnexthop *)((char *)rtnh + len); + rtnh = (struct rtnexthop *)(void *)((char *)rtnh + len); } if (data_len != 0 || mp->num_nhops == 0) { return (false);