Close files in loop

Files/Requests opened in the loop are now closed after each iteration, not at the end.

Close #6

cmd/imgcat/imgcat.go

@@ -36,35 +36,43 @@ func main() {
 	} else {
 		for _, filename := range flag.Args() {
 			if strings.HasPrefix(filename, "http://") || strings.HasPrefix(filename, "https://") {
-				res, err := http.Get(filename)
-				if err != nil {
-					log.Fatal(err)
-				}
-				defer res.Body.Close()
-
-				if err := display(res.Body); err != nil {
-					log.Fatal(err)
-				}
+				displayNetPicture(filename)
 			} else {
 				// Skip errors and directories
 				if fi, err := os.Stat(filename); err != nil || fi.IsDir() {
 					continue
 				}
 
-				f, err := os.Open(filename)
-				if err != nil {
-					log.Fatal(err)
-				}
-				defer f.Close()
-
-				if err := display(f); err != nil {
-					log.Fatal(err)
-				}
+				displayLocalPicture(filename)
 			}
 		}
 	}
 }
 
+func displayNetPicture(filename string) {
+	res, err := http.Get(filename)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer res.Body.Close()
+
+	if err := display(res.Body); err != nil {
+		log.Fatal(err)
+	}
+}
+
+func displayLocalPicture(filename string) {
+	f, err := os.Open(filename)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer f.Close()
+
+	if err := display(f); err != nil {
+		log.Fatal(err)
+	}
+}
+
 func display(r io.Reader) error {
 	data, err := ioutil.ReadAll(r)
 	if err != nil {

cmd/imgls/imgls.go

@@ -39,19 +39,23 @@ func main() {
 				continue
 			}
 
-			f, err := os.Open(filename)
-			if err != nil {
-				log.Fatal(err)
-			}
-			defer f.Close()
-
-			if err := display(filename, f); err != nil {
-				log.Fatal(err)
-			}
+			displayLocalPicture(filename)
 		}
 	}
 }
 
+func displayLocalPicture(filename string) {
+	f, err := os.Open(filename)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer f.Close()
+
+	if err := display(filename, f); err != nil {
+		log.Fatal(err)
+	}
+}
+
 func display(filename string, r io.Reader) error {
 	data, err := ioutil.ReadAll(r)
 	if err != nil {