CVS commit: src/sys/netinet6

[Ryota Ozaki]

Module Name:    src
Committed By:   ozaki-r
Date:           Thu Nov 23 07:05:02 UTC 2017

Modified Files:
        src/sys/netinet6: in6.c

Log Message:
Remove unnecessary goto because there is no cleanup code to share (NFC)


To generate a diff of this commit:
cvs rdiff -u -r1.251 -r1.252 src/sys/netinet6/in6.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/netinet6/in6.c
diff -u src/sys/netinet6/in6.c:1.251 src/sys/netinet6/in6.c:1.252
--- src/sys/netinet6/in6.c:1.251	Fri Nov 17 07:37:12 2017
+++ src/sys/netinet6/in6.c	Thu Nov 23 07:05:02 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: in6.c,v 1.251 2017/11/17 07:37:12 ozaki-r Exp $	*/
+/*	$NetBSD: in6.c,v 1.252 2017/11/23 07:05:02 ozaki-r Exp $	*/
 /*	$KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.251 2017/11/17 07:37:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.252 2017/11/23 07:05:02 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1187,7 +1187,7 @@ in6_update_ifa1(struct ifnet *ifp, struc
 				error = EINVAL;
 				if (hostIsNew)
 					free(ia, M_IFADDR);
-				goto exit;
+				return error;
 			}
 
 			if (!IN6_ARE_ADDR_EQUAL(&ia->ia_prefixmask.sin6_addr,
@@ -1263,7 +1263,7 @@ in6_update_ifa1(struct ifnet *ifp, struc
 	if (error != 0) {
 		if (hostIsNew)
 			free(ia, M_IFADDR);
-		goto exit;
+		return error;
 	}
 
 	/*
@@ -1357,7 +1357,6 @@ in6_update_ifa1(struct ifnet *ifp, struc
 
   cleanup:
 	in6_purgeaddr(&ia->ia_ifa);
-  exit:
 	return error;
 }