From: Sergey Matveev <stargrave@stargrave.org>
Date: Fri, 6 Oct 2023 19:01:44 +0000 (+0300)
Subject: Do not shadow variables
X-Git-Tag: v2.0.0~13
X-Git-Url: http://www.git.cypherpunks.ru/?p=goredo.git;a=commitdiff_plain;h=9d7519924e635be8f99cd0c7d12f36b06be6f5ef

Do not shadow variables
---

diff --git a/main.go b/main.go
index 0d19119..a79d2b1 100644
--- a/main.go
+++ b/main.go
@@ -383,12 +383,14 @@ CmdSwitch:
 			err = ErrLine(err)
 			break
 		}
-		if err = os.Remove(fdTmp.Name()); err != nil {
-			err = ErrLine(err)
+		err = ErrLine(os.Remove(fdTmp.Name()))
+		if err != nil {
 			break
 		}
 		tgt := tgts[0]
-		doFile, upLevels, err := findDo(fdTmp, tgt.h, tgt.t)
+		var doFile string
+		var upLevels int
+		doFile, upLevels, err = findDo(fdTmp, tgt.h, tgt.t)
 		if err != nil {
 			err = ErrLine(err)
 			break
diff --git a/run.go b/run.go
index 38bfc13..0b935c5 100644
--- a/run.go
+++ b/run.go
@@ -796,8 +796,8 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
 		fdDepOpened = false
 
 		// Post-commit .rec sanitizing
-		if depInfo, err := depRead(tgt); err == nil {
-			ifchangeSeen := make(map[string]struct{}, len(depInfo.ifchanges))
+		dep, err = depRead(tgt)
+		if err == nil {
 			ifchangeSeen := make(map[string]struct{}, len(dep.ifchanges))
 			for _, ifchange := range dep.ifchanges {
 				ifchangeSeen[ifchange.tgt.a] = struct{}{}