Do not shadow variables

diff --git a/main.go b/main.go
index 0d19119268fb00bbc4f106b3b3bd03a4c6573b7a..a79d2b130dd9679b6006682553e54c245fe29b35 100644 (file)
--- 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 38bfc13562b72d162791ae683f8db45e50a49703..0b935c55ac228f1129c13dca4515614d513c072f 100644 (file)
--- 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{}{}