From 750b751b9aba975915f34ecb2a3c55e32fd9de99 Mon Sep 17 00:00:00 2001
From: David Gwynne <dlg@cvs.openbsd.org>
Date: Thu, 17 Oct 2019 00:51:29 +0000
Subject: in6_setsockaddr and in6_setpeeraddr can't fail, so let them return
 void.

this also brings them in line with the AF_INET equivalents.

ok visa@ bluhm@
---
 sys/netinet/in_pcb.h   |  6 +++---
 sys/netinet6/in6_pcb.c | 10 +++-------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index 4c9ff602699..8e46bab2969 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_pcb.h,v 1.116 2019/07/15 12:40:42 bluhm Exp $	*/
+/*	$OpenBSD: in_pcb.h,v 1.117 2019/10/17 00:51:28 dlg Exp $	*/
 /*	$NetBSD: in_pcb.h,v 1.14 1996/02/13 23:42:00 christos Exp $	*/
 
 /*
@@ -287,8 +287,8 @@ struct inpcb *
 int	 in6_pcbaddrisavail(struct inpcb *, struct sockaddr_in6 *, int,
 	    struct proc *);
 int	 in6_pcbconnect(struct inpcb *, struct mbuf *);
-int	 in6_setsockaddr(struct inpcb *, struct mbuf *);
-int	 in6_setpeeraddr(struct inpcb *, struct mbuf *);
+void	 in6_setsockaddr(struct inpcb *, struct mbuf *);
+void	 in6_setpeeraddr(struct inpcb *, struct mbuf *);
 #endif /* INET6 */
 void	 in_pcbinit(struct inpcbtable *, int);
 struct inpcb *
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
index 0100c9e28e5..75c271a0a17 100644
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6_pcb.c,v 1.108 2018/10/04 17:33:41 bluhm Exp $	*/
+/*	$OpenBSD: in6_pcb.c,v 1.109 2019/10/17 00:51:28 dlg Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -305,7 +305,7 @@ in6_pcbconnect(struct inpcb *inp, struct mbuf *nam)
  * Get the local address/port, and put it in a sockaddr_in6.
  * This services the getsockname(2) call.
  */
-int
+void
 in6_setsockaddr(struct inpcb *inp, struct mbuf *nam)
 {
 	struct sockaddr_in6 *sin6;
@@ -320,15 +320,13 @@ in6_setsockaddr(struct inpcb *inp, struct mbuf *nam)
 	sin6->sin6_addr = inp->inp_laddr6;
 	/* KAME hack: recover scopeid */
 	in6_recoverscope(sin6, &inp->inp_laddr6);
-
-	return 0;
 }
 
 /*
  * Get the foreign address/port, and put it in a sockaddr_in6.
  * This services the getpeername(2) call.
  */
-int
+void
 in6_setpeeraddr(struct inpcb *inp, struct mbuf *nam)
 {
 	struct sockaddr_in6 *sin6;
@@ -343,8 +341,6 @@ in6_setpeeraddr(struct inpcb *inp, struct mbuf *nam)
 	sin6->sin6_addr = inp->inp_faddr6;
 	/* KAME hack: recover scopeid */
 	in6_recoverscope(sin6, &inp->inp_faddr6);
-
-	return 0;
 }
 
 /*
-- 
cgit v1.2.3