git: 2fb4a03d55a9 - rtsock: quiet -Wunused-variable in LINT-NOIP kernels
Ryan Libby
rlibby at FreeBSD.org
Thu Dec 24 20:35:51 UTC 2020
The branch main has been updated by rlibby:
URL: https://cgit.FreeBSD.org/src/commit/?id=2fb4a03d55a9135346f1b8fc3aadbc1a29eeeb5d
commit 2fb4a03d55a9135346f1b8fc3aadbc1a29eeeb5d
Author: Ryan Libby <rlibby at FreeBSD.org>
AuthorDate: 2020-12-24 20:34:18 +0000
Commit: Ryan Libby <rlibby at FreeBSD.org>
CommitDate: 2020-12-24 20:34:18 +0000
rtsock: quiet -Wunused-variable in LINT-NOIP kernels
Fixup after r368769 / d68fb8d978bbd3cf1b5db35f309aaeab30636d43.
Reported by: mjg
Reviewed by: melifaro
Sponsored by: Dell EMC Isilon
Differential Revision: https://reviews.freebsd.org/D27730
---
sys/net/rtsock.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 5acfd658caf6..88ae0c0868c8 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -799,11 +799,11 @@ static void
export_rtaddrs(const struct rtentry *rt, struct sockaddr *dst,
struct sockaddr *mask)
{
- uint32_t scopeid = 0;
#ifdef INET
if (dst->sa_family == AF_INET) {
struct sockaddr_in *dst4 = (struct sockaddr_in *)dst;
struct sockaddr_in *mask4 = (struct sockaddr_in *)mask;
+ uint32_t scopeid = 0;
rt_get_inet_prefix_pmask(rt, &dst4->sin_addr, &mask4->sin_addr,
&scopeid);
return;
@@ -813,8 +813,9 @@ export_rtaddrs(const struct rtentry *rt, struct sockaddr *dst,
if (dst->sa_family == AF_INET6) {
struct sockaddr_in6 *dst6 = (struct sockaddr_in6 *)dst;
struct sockaddr_in6 *mask6 = (struct sockaddr_in6 *)mask;
- rt_get_inet6_prefix_pmask(rt, &dst6->sin6_addr, &mask6->sin6_addr,
- &scopeid);
+ uint32_t scopeid = 0;
+ rt_get_inet6_prefix_pmask(rt, &dst6->sin6_addr,
+ &mask6->sin6_addr, &scopeid);
dst6->sin6_scope_id = scopeid;
return;
}
More information about the dev-commits-src-main
mailing list