toolstash: errors output should match errors guarded

ardnew · ardnew · commit 77a4e86342e8 · 2024-04-18T14:28:18.000-05:00
diff --git a/cmd/toolstash/main.go b/cmd/toolstash/main.go
@@ -423,7 +423,7 @@ func sameObject(file1, file2 string) bool {
 			log.Fatalf("reading %s: %v", file1, err1)
 		}
 		if err2 != nil {
-			log.Fatalf("reading %s: %v", file2, err1)
+			log.Fatalf("reading %s: %v", file2, err2)
 		}
 		if c1 != c2 {
 			return false
@@ -450,7 +450,7 @@ func skipVersion(b1, b2 *bufio.Reader, file1, file2 string) bool {
 			log.Fatalf("reading %s: %v", file1, err1)
 		}
 		if err2 != nil {
-			log.Fatalf("reading %s: %v", file2, err1)
+			log.Fatalf("reading %s: %v", file2, err2)
 		}
 		if c1 != c2 {
 			return false
@@ -473,7 +473,7 @@ func skipVersion(b1, b2 *bufio.Reader, file1, file2 string) bool {
 			log.Fatalf("reading %s: %v", file1, err1)
 		}
 		if err2 != nil {
-			log.Fatalf("reading %s: %v", file2, err1)
+			log.Fatalf("reading %s: %v", file2, err2)
 		}
 		if c1 != c2 {
 			return false

Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ func sameObject(file1, file2 string) bool {`
`423`	`423`	`log.Fatalf("reading %s: %v", file1, err1)`
`424`	`424`	`}`
`425`	`425`	`if err2 != nil {`
`426`		`- log.Fatalf("reading %s: %v", file2, err1)`
	`426`	`+ log.Fatalf("reading %s: %v", file2, err2)`
`427`	`427`	`}`
`428`	`428`	`if c1 != c2 {`
`429`	`429`	`return false`
`@@ -450,7 +450,7 @@ func skipVersion(b1, b2 *bufio.Reader, file1, file2 string) bool {`
`450`	`450`	`log.Fatalf("reading %s: %v", file1, err1)`
`451`	`451`	`}`
`452`	`452`	`if err2 != nil {`
`453`		`- log.Fatalf("reading %s: %v", file2, err1)`
	`453`	`+ log.Fatalf("reading %s: %v", file2, err2)`
`454`	`454`	`}`
`455`	`455`	`if c1 != c2 {`
`456`	`456`	`return false`
`@@ -473,7 +473,7 @@ func skipVersion(b1, b2 *bufio.Reader, file1, file2 string) bool {`
`473`	`473`	`log.Fatalf("reading %s: %v", file1, err1)`
`474`	`474`	`}`
`475`	`475`	`if err2 != nil {`
`476`		`- log.Fatalf("reading %s: %v", file2, err1)`
	`476`	`+ log.Fatalf("reading %s: %v", file2, err2)`
`477`	`477`	`}`
`478`	`478`	`if c1 != c2 {`
`479`	`479`	`return false`