all: fix gometalinter warnings

Fix typos, non-canonical code, remove dead code, etc.

3 files changed, 5 insertions, 5 deletions

diff --git a/pkg/csource/build.go b/pkg/csource/build.go
index 69f5adfcb..b027b337f 100644
--- a/pkg/csource/build.go
+++ b/pkg/csource/build.go
@@ -27,7 +27,7 @@ func Build(target *prog.Target, lang, src string) (string, error) {
 	sysTarget := targets.List[target.OS][target.Arch]
 	compiler := sysTarget.CCompilerPrefix + "gcc"
 	if _, err := exec.LookPath(compiler); err != nil {
-		return "", NoCompilerErr
+		return "", ErrNoCompiler
 	}
 	flags := []string{
 		"-x", lang, "-Wall", "-Werror", "-O1", "-g", "-o", bin.Name(),
@@ -46,13 +46,13 @@ func Build(target *prog.Target, lang, src string) (string, error) {
 	if err != nil {
 		os.Remove(bin.Name())
 		data, _ := ioutil.ReadFile(src)
-		return "", fmt.Errorf("failed to build program:\n%s\n%s\ncompiler invocation: %v %v\n",
+		return "", fmt.Errorf("failed to build program:\n%s\n%s\ncompiler invocation: %v %v",
 			data, out, compiler, flags)
 	}
 	return bin.Name(), nil
 }
 
-var NoCompilerErr = errors.New("no target compiler")
+var ErrNoCompiler = errors.New("no target compiler")
 
 // Format reformats C source using clang-format.
 func Format(src []byte) ([]byte, error) {
diff --git a/pkg/csource/common.go b/pkg/csource/common.go
index dd13e53bf..f77df3459 100644
--- a/pkg/csource/common.go
+++ b/pkg/csource/common.go
@@ -33,7 +33,7 @@ func createCommonHeader(p *prog.Prog, opts Options) ([]byte, error) {
 	cmd.Stderr = stderr
 	cmd.Stdout = stdout
 	if err := cmd.Run(); len(stdout.Bytes()) == 0 {
-		return nil, fmt.Errorf("cpp failed: %v\n%v\n%v\n", err, stdout.String(), stderr.String())
+		return nil, fmt.Errorf("cpp failed: %v\n%v\n%v", err, stdout.String(), stderr.String())
 	}
 
 	src, err := removeSystemDefines(stdout.Bytes(), defines)
diff --git a/pkg/csource/csource_test.go b/pkg/csource/csource_test.go
index 4aaaa3451..fa5eee58a 100644
--- a/pkg/csource/csource_test.go
+++ b/pkg/csource/csource_test.go
@@ -114,7 +114,7 @@ func testOne(t *testing.T, p *prog.Prog, opts Options) {
 	}
 	defer os.Remove(srcf)
 	bin, err := Build(p.Target, "c", srcf)
-	if err == NoCompilerErr {
+	if err == ErrNoCompiler {
 		t.Skip(err)
 	}
 	if err != nil {