From 7da1f7addf54e55c7b40c1a7bffe5a64989154d8 Mon Sep 17 00:00:00 2001
From: Mikio Hara <mikioh.public.networking@gmail.com>
Date: Thu, 8 Nov 2018 09:48:55 +0900
Subject: [PATCH] net: simplify nested if-blocks

Change-Id: I32e1829c955a48d8c4566430c13679e237bb0611
Reviewed-on: https://go-review.googlesource.com/c/148337
Run-TryBot: Mikio Hara <mikioh.public.networking@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
---
 src/net/interface.go | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/net/interface.go b/src/net/interface.go
index 46b0400f2f..f68df98aa2 100644
--- a/src/net/interface.go
+++ b/src/net/interface.go
@@ -223,15 +223,13 @@ func (zc *ipv6ZoneCache) name(index int) string {
 	zoneCache.RLock()
 	name, ok := zoneCache.toName[index]
 	zoneCache.RUnlock()
-	if !ok {
-		if !updated {
-			zoneCache.update(nil, true)
-			zoneCache.RLock()
-			name, ok = zoneCache.toName[index]
-			zoneCache.RUnlock()
-		}
+	if !ok && !updated {
+		zoneCache.update(nil, true)
+		zoneCache.RLock()
+		name, ok = zoneCache.toName[index]
+		zoneCache.RUnlock()
 	}
-	if !ok {
+	if !ok { // last resort
 		name = uitoa(uint(index))
 	}
 	return name
@@ -245,15 +243,13 @@ func (zc *ipv6ZoneCache) index(name string) int {
 	zoneCache.RLock()
 	index, ok := zoneCache.toIndex[name]
 	zoneCache.RUnlock()
-	if !ok {
-		if !updated {
-			zoneCache.update(nil, true)
-			zoneCache.RLock()
-			index, ok = zoneCache.toIndex[name]
-			zoneCache.RUnlock()
-		}
+	if !ok && !updated {
+		zoneCache.update(nil, true)
+		zoneCache.RLock()
+		index, ok = zoneCache.toIndex[name]
+		zoneCache.RUnlock()
 	}
-	if !ok {
+	if !ok { // last resort
 		index, _, _ = dtoi(name)
 	}
 	return index