Skip to content

Commit

Permalink
all: fix code formatting
Browse files Browse the repository at this point in the history
Reformat, remove debug leftovers, fix comment style.
  • Loading branch information
dvyukov committed Oct 16, 2018
1 parent 8cd3060 commit 1ba7fd7
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 13 deletions.
1 change: 0 additions & 1 deletion pkg/build/linux_generated.go
Expand Up @@ -117,4 +117,3 @@ menuentry 'linux' --class gnu-linux --class gnu --class os {
EOF
sudo grub-install --target=i386-pc --boot-directory=disk.mnt/boot --no-floppy $DISKDEV
`

2 changes: 1 addition & 1 deletion pkg/ipc/ipc.go
Expand Up @@ -88,7 +88,7 @@ type CallInfo struct {
Flags CallFlags
Signal []uint32 // feedback signal, filled if FlagSignal is set
Cover []uint32 // per-call coverage, filled if FlagSignal is set and cover == true,
//if dedup == false, then cov effectively contains a trace, otherwise duplicates are removed
// if dedup == false, then cov effectively contains a trace, otherwise duplicates are removed
Comps prog.CompMap // per-call comparison operands
Errno int // call errno (0 if the call was successful)
}
Expand Down
11 changes: 0 additions & 11 deletions prog/resources.go
Expand Up @@ -15,24 +15,17 @@ var timespecRes = &ResourceDesc{
}

func (target *Target) calcResourceCtors(kind []string, precise bool) []*Syscall {

//fmt.Printf("calcResourceCtors: kind=%+v\n", kind)

// Find calls that produce the necessary resources.
var metas []*Syscall
for _, meta := range target.Syscalls {
// Recurse into arguments to see if there is an out/inout arg of necessary type.
ok := false
//if meta.Name != "pipe$9p" { continue }
//fmt.Printf("found pipe$9p\n")

ForeachType(meta, func(typ Type) {
if ok {
return
}
switch typ1 := typ.(type) {
case *ResourceType:
//fmt.Printf(" output: %+v\n", typ1.Desc.Kind)
if typ1.Dir() != DirIn && isCompatibleResourceImpl(kind, typ1.Desc.Kind, precise) {
ok = true
}
Expand Down Expand Up @@ -75,11 +68,9 @@ func (target *Target) isCompatibleResource(dst, src string) bool {
// If precise is true, then it does not allow passing a less specialized resource (e.g. fd)
// as a more specialized resource (e.g. socket). Otherwise it does.
func isCompatibleResourceImpl(dst, src []string, precise bool) bool {
//fmt.Printf("isCompatibleResourceImpl: %+v/%v vs %+v/%v\n", dst, len(dst), src, len(src))
if len(dst) > len(src) {
// dst is more specialized, e.g dst=socket, src=fd.
if precise {
//fmt.Printf(" = false1\n")
return false
}
dst = dst[:len(src)]
Expand All @@ -90,11 +81,9 @@ func isCompatibleResourceImpl(dst, src []string, precise bool) bool {
}
for i, k := range dst {
if k != src[i] {
//fmt.Printf(" = false2\n")
return false
}
}
//fmt.Printf(" = true\n")
return true
}

Expand Down

0 comments on commit 1ba7fd7

Please sign in to comment.