From b42c8c2dba5ea7667c32681338930969ed5c1cdb Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Fri, 19 Nov 2021 13:13:16 +0300 Subject: [PATCH] Unify dep*Read/Write name --- dep.go | 6 +++--- main.go | 2 +- run.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dep.go b/dep.go index bf5e758..539ef57 100644 --- 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 9f11581..0b893da 100644 --- 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 ea14641..3e6cd35 100644 --- 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 } -- 2.44.0