dep.go | 6 +++--- main.go | 2 +- run.go | 4 ++-- diff --git a/dep.go b/dep.go index 3907b1a8b2a8705802d325319a4894eaec1a0d8a38065b92891af9c01c4c8245..70a62029af0be2dd868cd6926c49c91816111a05cec7cfa4bb74f314459dd5c7 100644 --- a/dep.go +++ b/dep.go @@ -86,7 +86,7 @@ } 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 @@ fields = append(fields, inode.RecfileFields()...) 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 @@ if err != nil { 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 4491bbaff86b55d520b92c64969f97aa6a96675a34ec27a1035245b5bbee9fe8..261d6faa289413004f7062e6fc621fcec7db37cb8ae6c9e162db8f48eec9fab6 100644 --- a/main.go +++ b/main.go @@ -320,7 +320,7 @@ } 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 97dd39be9198b10c8c068a5551be3f22ec74808c4a6aeac1b0729fcf5abf57eb..5777d1b6fcddbe9cfc42d85ddfb901a172f5d5ccf0694473c88af7cb48239273 100644 --- a/run.go +++ b/run.go @@ -322,7 +322,7 @@ basename = tgt[:len(tgt)-(len(doFile)-len("default.")-len(".do"))-1] 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 @@ if err != nil { goto Finish } } - err = writeDep(fdDep, cwdOrig, tgt) + err = depWrite(fdDep, cwdOrig, tgt) if err != nil { goto Finish }