DepTypeIfchange = 0x02
DepTypeAlways = 0x03
DepTypeStamp = 0x04
- DepTypeIfchangeDummy = 0x05
+ DepTypeIfchangeNonex = 0x05
)
var (
type Ifchange struct {
tgt *Tgt
- meta string
+ meta [InodeLen + HashLen]byte
}
-func (ifchange *Ifchange) Inode() Inode {
- return Inode(ifchange.meta[:InodeLen])
+func (ifchange *Ifchange) Inode() *Inode {
+ inode := Inode(ifchange.meta[:InodeLen])
+ return &inode
}
func (ifchange *Ifchange) Hash() Hash {
}
_, err = io.Copy(w, bytes.NewBuffer(chunkWrite(bytes.Join([][]byte{
{DepTypeIfchange},
- []byte(inode),
+ inode[:],
[]byte(hsh),
[]byte(tgt.RelTo(cwd)),
}, nil))))
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
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
if len(chunk) < InodeLen+HashLen+1 {
return nil, "", errors.New("too short \"ifchange\" format")
}
- name := string(chunk[InodeLen+HashLen:])
- meta := string(chunk[:InodeLen+HashLen])
tgtH, _ := pathSplit(tgt.a)
- ifchange := &Ifchange{tgt: NewTgt(path.Join(tgtH, name)), meta: meta}
- cachedFound := false
+ name := string(chunk[InodeLen+HashLen:])
+ ifchange := &Ifchange{
+ tgt: NewTgt(path.Join(tgtH, name)),
+ meta: ([InodeLen + HashLen]byte)(chunk),
+ }
for _, cached := range IfchangeCache[ifchange.tgt.rel] {
if ifchange.meta == cached.meta {
- ifchange = cached
- cachedFound = true
- break
+ return cached, name, nil
}
}
- if IfchangeCache != nil && !cachedFound {
+ if IfchangeCache != nil {
IfchangeCache[ifchange.tgt.rel] = append(IfchangeCache[ifchange.tgt.rel], ifchange)
}
return ifchange, name, nil
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"))
}
return nil, ErrLine(err)
}
ifchanges = append(ifchanges, tgt)
- case DepTypeIfchangeDummy:
+ case DepTypeIfchangeNonex:
ifchanges = append(ifchanges, string(chunk))
}
}