From 36d1c4540af3ef058d68092e41af05aa4a8c5eca Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Thu, 8 Mar 2018 18:48:26 +0100
Subject: all: fix gometalinter warnings

Fix typos, non-canonical code, remove dead code, etc.
---
 pkg/symbolizer/nm.go              |  2 +-
 pkg/symbolizer/symbolizer_test.go | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'pkg/symbolizer')

diff --git a/pkg/symbolizer/nm.go b/pkg/symbolizer/nm.go
index 72e5db792..01d23ab94 100644
--- a/pkg/symbolizer/nm.go
+++ b/pkg/symbolizer/nm.go
@@ -34,7 +34,7 @@ func ReadSymbols(bin string) (map[string][]Symbol, error) {
 	for s.Scan() {
 		// A line looks as: "ffffffff8104db90 0000000000000059 t snb_uncore_msr_enable_box"
 		ln := s.Bytes()
-		if bytes.Index(ln, text[0]) == -1 && bytes.Index(ln, text[1]) == -1 {
+		if !bytes.Contains(ln, text[0]) && !bytes.Contains(ln, text[1]) {
 			continue
 		}
 		sp1 := bytes.IndexByte(ln, ' ')
diff --git a/pkg/symbolizer/symbolizer_test.go b/pkg/symbolizer/symbolizer_test.go
index bb902b290..30a8413f2 100644
--- a/pkg/symbolizer/symbolizer_test.go
+++ b/pkg/symbolizer/symbolizer_test.go
@@ -5,6 +5,7 @@ package symbolizer
 
 import (
 	"bufio"
+	"fmt"
 	"os"
 	"reflect"
 	"strconv"
@@ -114,7 +115,7 @@ func TestParse(t *testing.T) {
 		t.Fatal(err)
 	}
 	defer outputr.Close()
-	done := make(chan bool)
+	done := make(chan error)
 	go func() {
 		s := bufio.NewScanner(inputr)
 	loop:
@@ -122,7 +123,8 @@ func TestParse(t *testing.T) {
 			pc, err := strconv.ParseUint(s.Text(), 0, 64)
 			if err != nil {
 				outputw.Close()
-				t.Fatalf("got unexpected pc: %v", s.Text())
+				done <- fmt.Errorf("got unexpected pc: %v", s.Text())
+				return
 			}
 			for _, addr := range addresses {
 				if pc == addr.pc {
@@ -131,7 +133,8 @@ func TestParse(t *testing.T) {
 				}
 			}
 			outputw.Close()
-			t.Fatalf("got unexpected pc: 0x%x", pc)
+			done <- fmt.Errorf("got unexpected pc: 0x%x", pc)
+			return
 		}
 		outputw.Write([]byte("DONE\n"))
 		outputw.Close()
@@ -139,7 +142,9 @@ func TestParse(t *testing.T) {
 	}()
 	defer func() {
 		inputw.Close()
-		<-done
+		if err := <-done; err != nil {
+			t.Fatal(err)
+		}
 	}()
 
 	// First, symbolize all PCs one-by-one.
-- 
cgit mrf-deployment