Rename IfchangeDummy for clarity

diff --git a/dep.go b/dep.go
index 3736bc2419e8ba78d1c7f8c288d0bc4552ef3aee..279e55dddbc1a736e950b8788394121651763307 100644 (file)
--- a/dep.go
+++ b/dep.go
@@ -41,7 +41,7 @@ const (
        DepTypeIfchange      = 0x02
        DepTypeAlways        = 0x03
        DepTypeStamp         = 0x04
-       DepTypeIfchangeDummy = 0x05
+       DepTypeIfchangeNonex = 0x05
 )
 
 var (
@@ -147,10 +147,10 @@ func depWrite(w io.Writer, fdDepName, cwd string, tgt *Tgt, hsh Hash) (err error
        return
 }
 
-func depWriteDummy(w io.Writer, fdDepName, tgtRel string) (err error) {
+func depWriteNonex(w io.Writer, fdDepName, tgtRel string) (err error) {
        tracef(CDebug, "ifchange: %s <- %s (non-existing)", fdDepName, tgtRel)
        _, err = io.Copy(w, bytes.NewBuffer(chunkWrite(bytes.Join([][]byte{
-               {DepTypeIfchangeDummy},
+               {DepTypeIfchangeNonex},
                []byte(tgtRel),
        }, nil))))
        return
@@ -174,7 +174,7 @@ func depsWrite(fdDep *os.File, tgts []*Tgt) error {
                        err = ErrLine(depWrite(fdDepW, fdDep.Name(), tgtDir, tgt, ""))
                } else {
                        tgtRel := tgt.RelTo(tgtDir)
-                       err = ErrLine(depWriteDummy(fdDepW, fdDep.Name(), tgtRel))
+                       err = ErrLine(depWriteNonex(fdDepW, fdDep.Name(), tgtRel))
                }
                if err != nil {
                        return err
@@ -281,7 +281,7 @@ func depParse(tgt *Tgt, data []byte) (*Dep, error) {
                                return nil, ErrLine(err)
                        }
                        dep.ifchanges = append(dep.ifchanges, ifchange)
-               case DepTypeIfchangeDummy:
+               case DepTypeIfchangeNonex:
                        if len(chunk) < 1 {
                                return nil, ErrLine(errors.New("too short \"ifchange\" format"))
                        }
@@ -326,7 +326,7 @@ func depReadOnlyIfchanges(pth string) (ifchanges []string, err error) {
                                return nil, ErrLine(err)
                        }
                        ifchanges = append(ifchanges, tgt)
-               case DepTypeIfchangeDummy:
+               case DepTypeIfchangeNonex:
                        ifchanges = append(ifchanges, string(chunk))
                }
        }

diff --git a/depfix.go b/depfix.go
index 1d1bdea13355334d4ec3c34ae5e2a145802d040a..72a40050c0c11588b900281bab1d782f9b30c1e0 100644 (file)
--- a/depfix.go
+++ b/depfix.go
@@ -178,8 +178,8 @@ func depFix(root string) error {
                                                                []byte(hsh),
                                                                []byte(name),
                                                        }, nil))))
-                                       case DepTypeIfchangeDummy:
-                                               err = depWriteDummy(fdDepW, fdDep.Name(), string(chunk))
+                                       case DepTypeIfchangeNonex:
+                                               err = depWriteNonex(fdDepW, fdDep.Name(), string(chunk))
                                        }
                                        if err != nil {
                                                return ErrLine(err)
@@ -234,7 +234,7 @@ func depFix(root string) error {
                                                err = ifcreate(fdDepW, fdDep.Name(), m["Target"])
                                        case "ifchange":
                                                if m["Size"] == "" {
-                                                       err = depWriteDummy(fdDepW, fdDep.Name(), m["Target"])
+                                                       err = depWriteNonex(fdDepW, fdDep.Name(), m["Target"])
                                                        break
                                                }
                                                name := string(m["Target"])

diff --git a/dot.go b/dot.go
index a77ec69197fda3e1b2c07daf950de2a542f73d8c..d40c22069db080213c4c9e3c697211bd3d19af63 100644 (file)
--- a/dot.go
+++ b/dot.go
@@ -52,8 +52,8 @@ func dotWalker(data map[DotNodes]bool, tgt *Tgt) (map[DotNodes]bool, error) {
                switch typ {
                case DepTypeIfcreate:
                        data[DotNodes{tgt.rel, NewTgt(path.Join(tgtH, string(chunk))).rel}] = true
-               case DepTypeIfchange, DepTypeIfchangeDummy:
-                       if typ == DepTypeIfchangeDummy {
+               case DepTypeIfchange, DepTypeIfchangeNonex:
+                       if typ == DepTypeIfchangeNonex {
                                name = string(chunk)
                        } else {
                                name = string(chunk[InodeLen+HashLen:])

diff --git a/main.go b/main.go
index 41d8d30f0ded6473b600938207d1890e323ae74f..d795544fe64a9b0a793aa724770380cb9e5d6ef0 100644 (file)
--- a/main.go
+++ b/main.go
@@ -571,7 +571,7 @@ func main() {
                                })
                                fields = append(fields, Inode(meta[:InodeLen]).RecfileFields()...)
                                err = recfileWrite(w, fields...)
-                       case DepTypeIfchangeDummy:
+                       case DepTypeIfchangeNonex:
                                err = recfileWrite(w, []recfile.Field{
                                        {Name: "Type", Value: "ifchange"},
                                        {Name: "Target", Value: string(chunk)},