From: Sergey Matveev <stargrave@stargrave.org>
Date: Fri, 9 Jul 2021 12:04:06 +0000 (+0300)
Subject: Map keys existence check simplification
X-Git-Tag: v7.2.1^2~1
X-Git-Url: http://www.git.cypherpunks.ru/?p=nncp.git;a=commitdiff_plain;h=d0d18ed65af3dd048272b04cc7f7f0007dd5dbd4

Map keys existence check simplification
---

diff --git a/src/progress.go b/src/progress.go
index 0c2f0ee..5ebc72b 100644
--- a/src/progress.go
+++ b/src/progress.go
@@ -132,9 +132,9 @@ func Progress(prefix string, les LEs) {
 		}
 	}
 	progressBarsLock.RLock()
-	pb, exists := progressBars[pkt]
+	pb := progressBars[pkt]
 	progressBarsLock.RUnlock()
-	if !exists {
+	if pb == nil {
 		progressBarsLock.Lock()
 		pb = ProgressBarNew(size, fullsize)
 		progressBars[pkt] = pb
@@ -156,8 +156,8 @@ func Progress(prefix string, les LEs) {
 
 func ProgressKill(pkt string) {
 	progressBarsLock.Lock()
-	pb, exists := progressBars[pkt]
-	if exists {
+	pb := progressBars[pkt]
+	if pb != nil {
 		pb.Kill()
 		delete(progressBars, pkt)
 	}
diff --git a/src/sp.go b/src/sp.go
index 5840bd1..5937d35 100644
--- a/src/sp.go
+++ b/src/sp.go
@@ -1324,9 +1324,9 @@ func (state *SPState) ProcessSP(payload []byte) ([][]byte, error) {
 			}
 			fullsize := int64(0)
 			state.RLock()
-			infoTheir, ok := state.infosTheir[*file.Hash]
+			infoTheir := state.infosTheir[*file.Hash]
 			state.RUnlock()
-			if !ok {
+			if infoTheir == nil {
 				state.Ctx.LogE("sp-file-open", lesp, err, func(les LEs) string {
 					return logMsg(les) + ": unknown file"
 				})
diff --git a/src/toss.go b/src/toss.go
index dc5573b..21d3007 100644
--- a/src/toss.go
+++ b/src/toss.go
@@ -120,8 +120,8 @@ func jobProcess(
 		}
 		argsStr := strings.Join(append([]string{handle}, args...), " ")
 		les = append(les, LE{"Type", "exec"}, LE{"Dst", argsStr})
-		cmdline, exists := sender.Exec[handle]
-		if !exists || len(cmdline) == 0 {
+		cmdline := sender.Exec[handle]
+		if len(cmdline) == 0 {
 			err = errors.New("No handle found")
 			ctx.LogE(
 				"rx-no-handle", les, err,
@@ -165,11 +165,11 @@ func jobProcess(
 				return err
 			}
 			if len(sendmail) > 0 && ctx.NotifyExec != nil {
-				notify, exists := ctx.NotifyExec[sender.Name+"."+handle]
-				if !exists {
-					notify, exists = ctx.NotifyExec["*."+handle]
+				notify := ctx.NotifyExec[sender.Name+"."+handle]
+				if notify == nil {
+					notify = ctx.NotifyExec["*."+handle]
 				}
-				if exists {
+				if notify != nil {
 					cmd := exec.Command(
 						sendmail[0],
 						append(sendmail[1:], notify.To)...,