tools/syz-trace2syz: use short variable declaration syntax

Use short variable declaration syntax where possible.
Move declarations closer to usages.

3 files changed, 8 insertions, 15 deletions

diff --git a/tools/syz-trace2syz/proggen/proggen.go b/tools/syz-trace2syz/proggen/proggen.go
index 54d614670..06d75f19f 100644
--- a/tools/syz-trace2syz/proggen/proggen.go
+++ b/tools/syz-trace2syz/proggen/proggen.go
@@ -120,7 +120,7 @@ func genArgs(syzType prog.Type, traceArg parser.IrType, ctx *Context) prog.Arg {
 }
 
 func genVma(syzType *prog.VmaType, _ parser.IrType, ctx *Context) prog.Arg {
-	var npages uint64 = 1
+	npages := uint64(1)
 	if syzType.RangeBegin != 0 || syzType.RangeEnd != 0 {
 		npages = syzType.RangeEnd
 	}
diff --git a/tools/syz-trace2syz/proggen/proggen_test.go b/tools/syz-trace2syz/proggen/proggen_test.go
index 6e495bd66..9c6dcd5c3 100644
--- a/tools/syz-trace2syz/proggen/proggen_test.go
+++ b/tools/syz-trace2syz/proggen/proggen_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/google/syzkaller/tools/syz-trace2syz/parser"
 )
 
-var (
+const (
 	OS   = "linux"
 	Arch = "amd64"
 )
@@ -32,13 +32,10 @@ func initializeTarget(os, arch string) *prog.Target {
 }
 
 func parseSingleTrace(t *testing.T, data string) *Context {
-	var traceTree *parser.TraceTree
-	var ctx *Context
-
 	target := initializeTarget(OS, Arch)
 	selector := NewCallSelector()
-	traceTree = parser.ParseLoop([]byte(data))
-	ctx = GenSyzProg(traceTree.TraceMap[traceTree.RootPid], target, selector)
+	traceTree := parser.ParseLoop([]byte(data))
+	ctx := GenSyzProg(traceTree.TraceMap[traceTree.RootPid], target, selector)
 	ctx.FillOutMemory()
 	if err := ctx.Prog.Finalize(); err != nil {
 		t.Fatalf("failed to parse trace: %s", err.Error())
@@ -184,13 +181,9 @@ func TestIdentifySockaddrStorage(t *testing.T) {
 	}
 
 	validator := func(arg prog.Arg, field string) error {
-		var (
-			storageArg *prog.UnionArg
-			storagePtr *prog.PointerArg
-			ok         bool
-		)
-		storagePtr = arg.(*prog.PointerArg)
-		if storageArg, ok = storagePtr.Res.(*prog.UnionArg); !ok {
+		storagePtr := arg.(*prog.PointerArg)
+		storageArg, ok := storagePtr.Res.(*prog.UnionArg)
+		if !ok {
 			t.Fatalf("second argument not union: %s", storagePtr.Res.Type().Name())
 		}
 		fieldName := storageArg.Option.Type().Name()
diff --git a/tools/syz-trace2syz/trace2syz.go b/tools/syz-trace2syz/trace2syz.go
index 3400004c8..4d6eee36b 100644
--- a/tools/syz-trace2syz/trace2syz.go
+++ b/tools/syz-trace2syz/trace2syz.go
@@ -115,12 +115,12 @@ func progIsTooLarge(p *prog.Prog) bool {
 }
 
 func getTraceFiles(dir string) []string {
-	var names []string
 	infos, err := ioutil.ReadDir(dir)
 	if err != nil {
 		log.Fatalf("%s", err)
 
 	}
+	var names []string
 	for _, info := range infos {
 		name := filepath.Join(dir, info.Name())
 		names = append(names, name)