summaryrefslogtreecommitdiff
path: root/sys/netinet6
diff options
context:
space:
mode:
authorryo <ryo@NetBSD.org>2022-10-14 19:39:32 +0000
committerryo <ryo@NetBSD.org>2022-10-14 19:39:32 +0000
commite289043cd64cf5742a536a97f12cbd9f7cc08098 (patch)
tree11e01b63c8289e93fb8c6964a78124d2841c6053 /sys/netinet6
parente993bb8afa6461f5514d170965308592080f3cfd (diff)
Avoid error of "-Wreturn-local-addr", and simplify the logic.
However, -Wreturn-local-addr is still disabled by default by GCC_NO_RETURN_LOCAL_ADDR in bsd.own.mk because it causes errors in other parts.
Diffstat (limited to 'sys/netinet6')
-rw-r--r--sys/netinet6/in6_pcb.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
index 41fd29eb56a..53fbd5903d5 100644
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_pcb.c,v 1.170 2022/08/29 09:14:02 knakahara Exp $ */
+/* $NetBSD: in6_pcb.c,v 1.171 2022/10/14 19:39:32 ryo Exp $ */
/* $KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.170 2022/08/29 09:14:02 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.171 2022/10/14 19:39:32 ryo Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1055,6 +1055,7 @@ in6_pcblookup_port(struct inpcbtable *table, struct in6_addr *laddr6,
if (vp && table->vestige && table->vestige->init_ports6) {
struct vestigial_inpcb better;
+ bool has_better = false;
void *state;
state = (*table->vestige->init_ports6)(laddr6,
@@ -1087,7 +1088,7 @@ in6_pcblookup_port(struct inpcbtable *table, struct in6_addr *laddr6,
continue;
if (wildcard < matchwild) {
better = *vp;
- match = (void*)&better;
+ has_better = true;
matchwild = wildcard;
if (matchwild == 0)
@@ -1095,13 +1096,9 @@ in6_pcblookup_port(struct inpcbtable *table, struct in6_addr *laddr6,
}
}
- if (match) {
- if (match != (void*)&better)
- return match;
- else {
- *vp = better;
- return 0;
- }
+ if (has_better) {
+ *vp = better;
+ return 0;
}
}
return (match);