From 66d3e115e4b2aca06d4988a0721ef78e0eb943bc Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Wed, 1 Aug 2018 16:35:37 +0200 Subject: syz-fuzzer: slightly simplify main Move output type parsing into a separate function. Update #538 --- syz-fuzzer/fuzzer.go | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/syz-fuzzer/fuzzer.go b/syz-fuzzer/fuzzer.go index eb4489ba0..aa2f02caa 100644 --- a/syz-fuzzer/fuzzer.go +++ b/syz-fuzzer/fuzzer.go @@ -5,7 +5,6 @@ package main import ( "flag" - "fmt" "net/http" _ "net/http/pprof" "os" @@ -103,20 +102,7 @@ func main() { flagTest = flag.Bool("test", false, "enable image testing mode") // used by syz-ci ) flag.Parse() - var outputType OutputType - switch *flagOutput { - case "none": - outputType = OutputNone - case "stdout": - outputType = OutputStdout - case "dmesg": - outputType = OutputDmesg - case "file": - outputType = OutputFile - default: - fmt.Fprintf(os.Stderr, "-output flag must be one of none/stdout/dmesg/file\n") - os.Exit(1) - } + outputType := parseOutputType(*flagOutput) log.Logf(0, "fuzzer started") target, err := prog.GetTarget(*flagOS, *flagArch) @@ -420,3 +406,19 @@ func signalPrio(target *prog.Target, c *prog.Call, ci *ipc.CallInfo) (prio uint8 } return } + +func parseOutputType(str string) OutputType { + switch str { + case "none": + return OutputNone + case "stdout": + return OutputStdout + case "dmesg": + return OutputDmesg + case "file": + return OutputFile + default: + log.Fatalf("-output flag must be one of none/stdout/dmesg/file") + return OutputNone + } +} -- cgit mrf-deployment