Updates in-line deferred function to not return

Isaac Boehman · Isaac Boehman · commit 96eeb1bb7517 · 2014-04-01T16:15:49.000-04:00
Docker-DCO-1.1-Signed-off-by: Isaac Boehman &lt;admin@yacn.pw&gt; (github: yacn)
diff --git a/vbm.go b/vbm.go
@@ -74,22 +74,20 @@ func copyDiskImage(dst, src string) error {
   if err != nil {
     return err
   }
-  closeSrcImg := func() error {
-    if err := srcImg.Close(); err != nil {
-      return err
+  closeSrcImg := func() {
+    if ee := srcImg.Close(); ee != nil {
+      err = ee
     }
-    return err
   }
   defer closeSrcImg()
   dstImg, err := os.Create(dst)
   if err != nil {
     return err
   }
-  closeDstImg := func () error {
-    if err := dstImg.Close(); err != nil {
-      return err
+  closeDstImg := func() {
+    if ee := dstImg.Close(); ee != nil {
+      err = ee
     }
-    return err
   }
   defer closeDstImg()
   _, err = io.Copy(dstImg, srcImg)

Original file line number	Diff line number	Diff line change
`@@ -74,22 +74,20 @@ func copyDiskImage(dst, src string) error {`
`74`	`74`	`if err != nil {`
`75`	`75`	`return err`
`76`	`76`	`}`
`77`		`- closeSrcImg := func() error {`
`78`		`- if err := srcImg.Close(); err != nil {`
`79`		`- return err`
	`77`	`+ closeSrcImg := func() {`
	`78`	`+ if ee := srcImg.Close(); ee != nil {`
	`79`	`+ err = ee`
`80`	`80`	`}`
`81`		`- return err`
`82`	`81`	`}`
`83`	`82`	`defer closeSrcImg()`
`84`	`83`	`dstImg, err := os.Create(dst)`
`85`	`84`	`if err != nil {`
`86`	`85`	`return err`
`87`	`86`	`}`
`88`		`- closeDstImg := func () error {`
`89`		`- if err := dstImg.Close(); err != nil {`
`90`		`- return err`
	`87`	`+ closeDstImg := func() {`
	`88`	`+ if ee := dstImg.Close(); ee != nil {`
	`89`	`+ err = ee`
`91`	`90`	`}`
`92`		`- return err`
`93`	`91`	`}`
`94`	`92`	`defer closeDstImg()`
`95`	`93`	`_, err = io.Copy(dstImg, srcImg)`