From 36c49360cfb68ea99dfdad8f70d5df72a2b3f99f Mon Sep 17 00:00:00 2001
From: Taras Madan <tarasmadan@google.com>
Date: Wed, 14 Aug 2024 12:07:56 +0200
Subject: tools/syz-cover: reduce main cyclo

---
 tools/syz-cover/syz-cover.go | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/tools/syz-cover/syz-cover.go b/tools/syz-cover/syz-cover.go
index ce08edef9..9446dffd8 100644
--- a/tools/syz-cover/syz-cover.go
+++ b/tools/syz-cover/syz-cover.go
@@ -95,27 +95,15 @@ func main() {
 	}
 	var modules []*vminfo.KernelModule
 	if *flagModules != "" {
-		m, err := loadModules(*flagModules)
-		if err != nil {
+		if modules, err = loadModules(*flagModules); err != nil {
 			tool.Fail(err)
 		}
-		modules = m
 	}
 	rg, err := cover.MakeReportGenerator(cfg, cfg.KernelSubsystem, modules, false)
 	if err != nil {
 		tool.Fail(err)
 	}
-	var pcs []uint64
-	if len(flag.Args()) == 0 {
-		for _, s := range rg.Symbols {
-			pcs = append(pcs, s.PCs...)
-		}
-	} else {
-		pcs, err = readPCs(flag.Args())
-		if err != nil {
-			tool.Fail(err)
-		}
-	}
+	pcs := initPCs(rg)
 	progs := []cover.Prog{{PCs: pcs}}
 	buf := new(bytes.Buffer)
 	params := cover.HandlerParams{
@@ -170,6 +158,21 @@ func main() {
 	}
 }
 
+func initPCs(rg *cover.ReportGenerator) []uint64 {
+	var pcs []uint64
+	if len(flag.Args()) == 0 {
+		for _, s := range rg.Symbols {
+			pcs = append(pcs, s.PCs...)
+		}
+		return pcs
+	}
+	pcs, err := readPCs(flag.Args())
+	if err != nil {
+		tool.Fail(err)
+	}
+	return pcs
+}
+
 func readPCs(files []string) ([]uint64, error) {
 	var pcs []uint64
 	for _, file := range files {
-- 
cgit mrf-deployment