From c588ddea2df37d1bd3d58b893009455d154616c3 Mon Sep 17 00:00:00 2001 From: Callan Taylor <31758692+CallanTaylor@users.noreply.github.com> Date: Wed, 13 Nov 2019 17:28:23 +1300 Subject: [PATCH] Close unclosed files (#735) * Cose unclosed files * Close additional unclosed file * Dont use defer in loop * Removed missed instances of defer in loop --- eBook/examples/chapter_11/static.go | 1 + eBook/examples/chapter_12/cat.go | 1 + eBook/examples/chapter_12/gzipped.go | 1 + eBook/examples/chapter_12/read_files.go | 1 + eBook/exercises/chapter_12/cat_numbered.go | 1 + 5 files changed, 5 insertions(+) diff --git a/eBook/examples/chapter_11/static.go b/eBook/examples/chapter_11/static.go index aca2b75..6df99a5 100644 --- a/eBook/examples/chapter_11/static.go +++ b/eBook/examples/chapter_11/static.go @@ -16,6 +16,7 @@ func main() { r = bufio.NewReader(r) r = new(bytes.Buffer) f, _ := os.Open("test.txt") + defer f.Close() r = bufio.NewReader(f) var s *bytes.Buffer = new(bytes.Buffer) r = s diff --git a/eBook/examples/chapter_12/cat.go b/eBook/examples/chapter_12/cat.go index 7b1627d..707500c 100644 --- a/eBook/examples/chapter_12/cat.go +++ b/eBook/examples/chapter_12/cat.go @@ -31,5 +31,6 @@ func main() { continue } cat(bufio.NewReader(f)) + f.Close() } } diff --git a/eBook/examples/chapter_12/gzipped.go b/eBook/examples/chapter_12/gzipped.go index aa9e5a5..6e10167 100644 --- a/eBook/examples/chapter_12/gzipped.go +++ b/eBook/examples/chapter_12/gzipped.go @@ -17,6 +17,7 @@ func main() { err) os.Exit(1) } + defer fi.Close() fz, err := gzip.NewReader(fi) if err != nil { r = bufio.NewReader(fi) diff --git a/eBook/examples/chapter_12/read_files.go b/eBook/examples/chapter_12/read_files.go index 74ff6f7..8b8f237 100644 --- a/eBook/examples/chapter_12/read_files.go +++ b/eBook/examples/chapter_12/read_files.go @@ -24,5 +24,6 @@ func main() { for line, _, err := r.ReadLine(); err != io.EOF; line, _, err = r.ReadLine() { fmt.Printf("Lines: %v (error %v)\n", string(line), err) } + fin.Close() } } diff --git a/eBook/exercises/chapter_12/cat_numbered.go b/eBook/exercises/chapter_12/cat_numbered.go index fba287d..758c2fb 100755 --- a/eBook/exercises/chapter_12/cat_numbered.go +++ b/eBook/exercises/chapter_12/cat_numbered.go @@ -39,5 +39,6 @@ func main() { continue } cat(bufio.NewReader(f)) + f.Close() } }