Avoid shadowed variables

Author: skx

add_cmd_test.go

@@ -24,10 +24,10 @@ https://example.net/
 		t.Fatalf("Error creating temporary file")
 	}
 
-	if _, err := tmpfile.Write(data); err != nil {
+	if _, err = tmpfile.Write(data); err != nil {
 		t.Fatalf("Error writing to config file")
 	}
-	if err := tmpfile.Close(); err != nil {
+	if err = tmpfile.Close(); err != nil {
 		t.Fatalf("Error creating temporary file")
 	}
 

del_cmd_test.go

@@ -23,10 +23,10 @@ https://example.net/
 		t.Fatalf("Error creating temporary file")
 	}
 
-	if _, err := tmpfile.Write(data); err != nil {
+	if _, err = tmpfile.Write(data); err != nil {
 		t.Fatalf("Error writing to config file")
 	}
-	if err := tmpfile.Close(); err != nil {
+	if err = tmpfile.Close(); err != nil {
 		t.Fatalf("Error creating temporary file")
 	}
 

import_cmd.go

@@ -82,7 +82,8 @@ func (i *importCmd) Execute(args []string) int {
 	for _, file := range args {
 
 		// Read content
-		data, err := ioutil.ReadFile(file)
+		var data []byte
+		data, err = ioutil.ReadFile(file)
 		if err != nil {
 			fmt.Printf("failed to read %s: %s\n", file, err.Error())
 			continue

import_cmd_test.go

@@ -22,10 +22,10 @@ https://example.net/
 		t.Fatalf("Error creating temporary file")
 	}
 
-	if _, err := tmpfile.Write(data); err != nil {
+	if _, err = tmpfile.Write(data); err != nil {
 		t.Fatalf("Error writing to config file")
 	}
-	if err := tmpfile.Close(); err != nil {
+	if err = tmpfile.Close(); err != nil {
 		t.Fatalf("Error creating temporary file")
 	}
 

processor/processor.go

@@ -126,7 +126,7 @@ func (p *Processor) ProcessFeeds(recipients []string) []error {
 		}
 
 		// Process this specific entry.
-		err := p.processFeed(entry, feedRecipients)
+		err = p.processFeed(entry, feedRecipients)
 		if err != nil {
 			errors = append(errors, fmt.Errorf("error processing %s - %s", entry.URL, err))
 		}