From e6e35dba937599d098fc034eff2686e5ddc409e9 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 26 Oct 2020 10:51:06 +0100 Subject: sys/targets: add OS/Arch name consts We use strings to identify OS/Arch. These strings are duplicated throughout the code base massively. golangci-lint points to possiblity of typos and duplication. We already had to define these names in pkg/csource and disable checking for prog package. A future change triggers such warnings in another package. Add OS/Arch name consts to sys/targets so that they can be used to refer to OS/Arch. Use the consts everywhere. --- dashboard/app/reporting.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'dashboard/app/reporting.go') diff --git a/dashboard/app/reporting.go b/dashboard/app/reporting.go index 54ad38cdd..35a050fcb 100644 --- a/dashboard/app/reporting.go +++ b/dashboard/app/reporting.go @@ -15,6 +15,7 @@ import ( "github.com/google/syzkaller/dashboard/dashapi" "github.com/google/syzkaller/pkg/email" "github.com/google/syzkaller/pkg/html" + "github.com/google/syzkaller/sys/targets" "golang.org/x/net/context" db "google.golang.org/appengine/datastore" "google.golang.org/appengine/log" @@ -1175,9 +1176,9 @@ func (a bugReportSorter) Less(i, j int) bool { // Currently Linux-specific. func kernelArch(arch string) string { switch arch { - case "386": + case targets.I386: return "i386" - case "amd64": + case targets.AMD64: return "" // this is kinda the default, so we don't notify about it default: return arch -- cgit mrf-deployment