[src/trunk]: src/sys/netinet6 CID 1364757: remove unnecessary branching

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b75e1ce62c6e
branches:  trunk
changeset: 346843:b75e1ce62c6e
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Fri Aug 05 00:51:14 2016 +0000

description:
CID 1364757: remove unnecessary branching

diffstat:

 sys/netinet6/in6.c |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (38 lines):

diff -r c199bc73ef71 -r b75e1ce62c6e sys/netinet6/in6.c
--- a/sys/netinet6/in6.c        Thu Aug 04 23:54:45 2016 +0000
+++ b/sys/netinet6/in6.c        Fri Aug 05 00:51:14 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6.c,v 1.214 2016/08/01 04:37:53 ozaki-r Exp $        */
+/*     $NetBSD: in6.c,v 1.215 2016/08/05 00:51:14 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.214 2016/08/01 04:37:53 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.215 2016/08/05 00:51:14 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -485,8 +485,7 @@
 
        case SIOCGIFADDR_IN6:
                ifr->ifr_addr = ia->ia_addr;
-               if ((error = sa6_recoverscope(&ifr->ifr_addr)) != 0)
-                       break;
+               error = sa6_recoverscope(&ifr->ifr_addr);
                break;
 
        case SIOCGIFDSTADDR_IN6:
@@ -499,8 +498,7 @@
                 * an error?
                 */
                ifr->ifr_dstaddr = ia->ia_dstaddr;
-               if ((error = sa6_recoverscope(&ifr->ifr_dstaddr)) != 0)
-                       break;
+               error = sa6_recoverscope(&ifr->ifr_dstaddr);
                break;
 
        case SIOCGIFNETMASK_IN6: