Unify dep*Read/Write name

diff --git a/dep.go b/dep.go
index bf5e75809a3e985e5e950da10b5ff135db4d8cd3..539ef5791e3011f53e84add54b50ee671b103f3d 100644 (file)
--- a/dep.go
+++ b/dep.go
@@ -86,7 +86,7 @@ func fileHash(fd *os.File) (string, error) {
        return hex.EncodeToString(h.Sum(nil)), nil
 }
 
-func writeDep(fdDep *os.File, cwd, tgt string) error {
+func depWrite(fdDep *os.File, cwd, tgt string) error {
        tracef(CDebug, "ifchange: %s <- %s", fdDep.Name(), tgt)
        fd, err := os.Open(path.Join(cwd, tgt))
        if err != nil {
@@ -117,7 +117,7 @@ func writeDep(fdDep *os.File, cwd, tgt string) error {
        return recfileWrite(fdDep, fields...)
 }
 
-func writeDeps(fdDep *os.File, tgts []string) error {
+func depsWrite(fdDep *os.File, tgts []string) error {
        if fdDep == nil {
                tracef(CDebug, "no opened fdDep: %s", tgts)
                return nil
@@ -137,7 +137,7 @@ func writeDeps(fdDep *os.File, tgts []string) error {
                        panic(err)
                }
                if _, errStat := os.Stat(tgt); errStat == nil {
-                       err = writeDep(fdDep, tgtDir, tgtRel)
+                       err = depWrite(fdDep, tgtDir, tgtRel)
                } else {
                        tracef(CDebug, "ifchange: %s <- %s (non-existing)", fdDep.Name(), tgtRel)
                        fields := []recfile.Field{

diff --git a/main.go b/main.go
index 9f1158182194446d20e8a2c0a103d9b4fa3d86f5..0b893dac172389ca199dcc70a08a2358d88c502e 100644 (file)
--- a/main.go
+++ b/main.go
@@ -320,7 +320,7 @@ CmdSwitch:
        case CmdNameRedoIfchange:
                ok, err = ifchange(tgts, false, traced)
                if err == nil {
-                       err = writeDeps(fdDep, tgts)
+                       err = depsWrite(fdDep, tgts)
                }
        case CmdNameRedoIfcreate:
                if fdDep == nil {

diff --git a/run.go b/run.go
index ea14641a9304bd85adbee7c988cebdcc3059242c..3e6cd35fdbe5a3e41c2167b4436bca1f1840a7a6 100644 (file)
--- a/run.go
+++ b/run.go
@@ -322,7 +322,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                runErr.DoFile = doFileRelPath
        }
 
-       if err = writeDep(fdDep, cwdOrig, doFileRelPath); err != nil {
+       if err = depWrite(fdDep, cwdOrig, doFileRelPath); err != nil {
                cleanup()
                return TgtError{tgtOrig, err}
        }
@@ -707,7 +707,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                                        goto Finish
                                }
                        }
-                       err = writeDep(fdDep, cwdOrig, tgt)
+                       err = depWrite(fdDep, cwdOrig, tgt)
                        if err != nil {
                                goto Finish
                        }