From: Sergey Matveev <stargrave@stargrave.org>
Date: Sat, 7 Oct 2023 19:42:50 +0000 (+0300)
Subject: Rename IfchangeDummy for clarity
X-Git-Tag: v2.0.0~5
X-Git-Url: http://www.git.cypherpunks.ru/?p=goredo.git;a=commitdiff_plain;h=24cc8b5a500dddf0d3823f905581827dad556c9c

Rename IfchangeDummy for clarity
---

diff --git a/dep.go b/dep.go
index 3736bc2..279e55d 100644
--- 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 1d1bdea..72a4005 100644
--- 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 a77ec69..d40c220 100644
--- 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 41d8d30..d795544 100644
--- 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)},