Do not shadow variables

[goredo.git] / main.go

diff --git a/main.go b/main.go
index b36c1b74a9b29911aac0bea85a0ba835705db5f5..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
@@ -425,7 +427,7 @@ CmdSwitch:
        case CmdNameRedoTargets:
                raws := make([]string, 0, len(tgts))
                for _, tgt := range tgts {
-                       raws = append(raws, tgt.String())
+                       raws = append(raws, tgt.rel)
                }
                if tgtsWasEmpty {
                        raws = []string{Cwd}
@@ -457,11 +459,11 @@ CmdSwitch:
                        }
                        seen := make(map[string]*Tgt)
                        for _, tgt := range tgts {
-                               collectWholeDeps(deps[tgt.a], deps, seen)
+                               collectWholeDeps(deps[tgt.rel], deps, seen)
                        }
                        res = make([]string, 0, len(seen))
                        for _, dep := range seen {
-                               res = append(res, dep.String())
+                               res = append(res, dep.rel)
                        }
                }
                sort.Strings(res)
@@ -471,7 +473,7 @@ CmdSwitch:
        case CmdNameRedoOOD:
                raws := make([]string, 0, len(tgts))
                for _, tgt := range tgts {
-                       raws = append(raws, tgt.String())
+                       raws = append(raws, tgt.rel)
                }
                if tgtsWasEmpty {
                        raws, err = targetsWalker([]string{Cwd})
@@ -496,7 +498,7 @@ CmdSwitch:
                {
                        raws := make([]string, 0, len(tgts))
                        for _, tgt := range tgts {
-                               raws = append(raws, tgt.String())
+                               raws = append(raws, tgt.rel)
                        }
                        if tgtsWasEmpty {
                                raws, err = targetsWalker([]string{Cwd})
@@ -519,7 +521,7 @@ CmdSwitch:
                }
                res := make([]string, 0, len(srcs))
                for _, tgt := range srcs {
-                       res = append(res, tgt.String())
+                       res = append(res, tgt.rel)
                }
                srcs = nil
                sort.Strings(res)