From a4ffa9addbd995be5acd9cbfddeb0821790a014b Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 21 Mar 2018 16:25:58 -0700
Subject: [PATCH] Fix format string issues

Fix issues caught by go vet.

Bug: 73724997
Test: m checkbuild
Change-Id: Ib8d740457c15432dabe1575a6707726ddaf93084
Merged-In: Ib8d740457c15432dabe1575a6707726ddaf93084
(cherry picked from commit f46e37f5f79bd7111aed84f6cf172f20431ec010)
---
 androidmk/cmd/androidmk/android.go | 4 ++--
 bpfix/bpfix/bpfix.go               | 2 +-
 cc/cc_test.go                      | 2 +-
 cmd/extract_linker/main.go         | 8 ++++----
 cmd/pom2mk/pom2mk.go               | 2 +-
 cmd/zipsync/zipsync.go             | 4 ++--
 ui/logger/logger.go                | 2 +-
 ui/logger/logger_test.go           | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go
index 5196754e80..b2a8914e9d 100644
--- a/androidmk/cmd/androidmk/android.go
+++ b/androidmk/cmd/androidmk/android.go
@@ -259,7 +259,7 @@ func classifyLocalOrGlobalPath(value bpparser.Expression) (string, bpparser.Expr
 		}
 	case *bpparser.Operator:
 		if v.Type() != bpparser.StringType {
-			return "", nil, fmt.Errorf("classifyLocalOrGlobalPath expected a string, got %s", value.Type)
+			return "", nil, fmt.Errorf("classifyLocalOrGlobalPath expected a string, got %s", v.Type())
 		}
 
 		if v.Operator != '+' {
@@ -290,7 +290,7 @@ func classifyLocalOrGlobalPath(value bpparser.Expression) (string, bpparser.Expr
 	case *bpparser.String:
 		return "global", value, nil
 	default:
-		return "", nil, fmt.Errorf("classifyLocalOrGlobalPath expected a string, got %s", value.Type)
+		return "", nil, fmt.Errorf("classifyLocalOrGlobalPath expected a string, got %s", v.Type())
 
 	}
 }
diff --git a/bpfix/bpfix/bpfix.go b/bpfix/bpfix/bpfix.go
index 84454907bb..2c3cc6cdd4 100644
--- a/bpfix/bpfix/bpfix.go
+++ b/bpfix/bpfix/bpfix.go
@@ -67,7 +67,7 @@ func FixTree(tree *parser.File, config FixRequest) error {
 		// detect infinite loop
 		i++
 		if i >= maxNumIterations {
-			return fmt.Errorf("Applied fixes %s times and yet the tree continued to change. Is there an infinite loop?", i)
+			return fmt.Errorf("Applied fixes %d times and yet the tree continued to change. Is there an infinite loop?", i)
 			break
 		}
 	}
diff --git a/cc/cc_test.go b/cc/cc_test.go
index a4e253496c..10c1aba7f7 100644
--- a/cc/cc_test.go
+++ b/cc/cc_test.go
@@ -264,7 +264,7 @@ func checkVndkModule(t *testing.T, ctx *android.TestContext, name, subDir string
 
 	mod := ctx.ModuleForTests(name, vendorVariant).Module().(*Module)
 	if !mod.hasVendorVariant() {
-		t.Error("%q must have vendor variant", name)
+		t.Errorf("%q must have vendor variant", name)
 	}
 
 	// Check library properties.
diff --git a/cmd/extract_linker/main.go b/cmd/extract_linker/main.go
index 8530b4aa5f..3f24ab2dba 100644
--- a/cmd/extract_linker/main.go
+++ b/cmd/extract_linker/main.go
@@ -68,7 +68,7 @@ func main() {
 
 	ef, err := elf.NewFile(f)
 	if err != nil {
-		log.Fatal("Unable to read elf file: %v", err)
+		log.Fatalf("Unable to read elf file: %v", err)
 	}
 
 	asm := &bytes.Buffer{}
@@ -123,17 +123,17 @@ func main() {
 
 	if asmPath != "" {
 		if err := ioutil.WriteFile(asmPath, asm.Bytes(), 0777); err != nil {
-			log.Fatal("Unable to write %q: %v", asmPath, err)
+			log.Fatalf("Unable to write %q: %v", asmPath, err)
 		}
 	}
 
 	if scriptPath != "" {
 		buf := &bytes.Buffer{}
 		if err := linkerScriptTemplate.Execute(buf, sections); err != nil {
-			log.Fatal("Failed to create linker script: %v", err)
+			log.Fatalf("Failed to create linker script: %v", err)
 		}
 		if err := ioutil.WriteFile(scriptPath, buf.Bytes(), 0777); err != nil {
-			log.Fatal("Unable to write %q: %v", scriptPath, err)
+			log.Fatalf("Unable to write %q: %v", scriptPath, err)
 		}
 	}
 }
diff --git a/cmd/pom2mk/pom2mk.go b/cmd/pom2mk/pom2mk.go
index 574162436b..fc836411ad 100644
--- a/cmd/pom2mk/pom2mk.go
+++ b/cmd/pom2mk/pom2mk.go
@@ -406,7 +406,7 @@ Usage: %s [--rewrite <regex>=<replace>] [-exclude <module>] [--extra-deps <modul
 	dir := flag.Arg(0)
 	absDir, err := filepath.Abs(dir)
 	if err != nil {
-		fmt.Println(os.Stderr, "Failed to get absolute directory:", err)
+		fmt.Fprintln(os.Stderr, "Failed to get absolute directory:", err)
 		os.Exit(1)
 	}
 
diff --git a/cmd/zipsync/zipsync.go b/cmd/zipsync/zipsync.go
index 035a1455fa..1b300161b7 100644
--- a/cmd/zipsync/zipsync.go
+++ b/cmd/zipsync/zipsync.go
@@ -93,11 +93,11 @@ func main() {
 				}
 			}
 			if filepath.IsAbs(f.Name) {
-				log.Fatal("%q in %q is an absolute path", f.Name, input)
+				log.Fatalf("%q in %q is an absolute path", f.Name, input)
 			}
 
 			if prev, exists := seen[f.Name]; exists {
-				log.Fatal("%q found in both %q and %q", f.Name, prev, input)
+				log.Fatalf("%q found in both %q and %q", f.Name, prev, input)
 			}
 			seen[f.Name] = input
 
diff --git a/ui/logger/logger.go b/ui/logger/logger.go
index 15c413dd5c..c763e50c8f 100644
--- a/ui/logger/logger.go
+++ b/ui/logger/logger.go
@@ -85,7 +85,7 @@ func fileRotation(from, baseName, ext string, cur, max int) error {
 	}
 
 	if err := os.Rename(from, newName); err != nil {
-		return fmt.Errorf("Failed to rotate", from, "to", newName, ".", err)
+		return fmt.Errorf("Failed to rotate %s to %s. %s", from, newName, err)
 	}
 	return nil
 }
diff --git a/ui/logger/logger_test.go b/ui/logger/logger_test.go
index dc6f2e9185..bdf0231a6f 100644
--- a/ui/logger/logger_test.go
+++ b/ui/logger/logger_test.go
@@ -106,7 +106,7 @@ func TestPanic(t *testing.T) {
 			if p == panicValue {
 				os.Exit(42)
 			} else {
-				fmt.Fprintln(os.Stderr, "Expected %q, got %v", panicValue, p)
+				fmt.Fprintf(os.Stderr, "Expected %q, got %v\n", panicValue, p)
 				os.Exit(3)
 			}
 		}()