Skip to content
This repository was archived by the owner on Feb 27, 2018. It is now read-only.

Commit f28bedb

Browse files
author
Isaac Boehman
committed
Adds named return value to copyDiskImage()
Docker-DCO-1.1-Signed-off-by: Isaac Boehman <admin@yacn.pw> (github: yacn)
1 parent 96eeb1b commit f28bedb

1 file changed

Lines changed: 25 additions & 25 deletions

File tree

vbm.go

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package main
22

33
import (
44
"bytes"
5+
"io"
56
"os"
6-
"io"
77
"path/filepath"
88

99
vbx "github.com/boot2docker/boot2docker-cli/virtualbox"
@@ -68,30 +68,30 @@ func getHostOnlyNetworkInterface() (string, error) {
6868
}
6969

7070
// Copy disk image from given source path to destination
71-
func copyDiskImage(dst, src string) error {
72-
// Open source disk image
73-
srcImg, err := os.Open(src)
74-
if err != nil {
75-
return err
76-
}
77-
closeSrcImg := func() {
78-
if ee := srcImg.Close(); ee != nil {
79-
err = ee
80-
}
81-
}
82-
defer closeSrcImg()
83-
dstImg, err := os.Create(dst)
84-
if err != nil {
85-
return err
86-
}
87-
closeDstImg := func() {
88-
if ee := dstImg.Close(); ee != nil {
89-
err = ee
90-
}
91-
}
92-
defer closeDstImg()
93-
_, err = io.Copy(dstImg, srcImg)
94-
return err
71+
func copyDiskImage(dst, src string) (err error) {
72+
// Open source disk image
73+
srcImg, err := os.Open(src)
74+
if err != nil {
75+
return err
76+
}
77+
closeSrcImg := func() {
78+
if ee := srcImg.Close(); ee != nil {
79+
err = ee
80+
}
81+
}
82+
defer closeSrcImg()
83+
dstImg, err := os.Create(dst)
84+
if err != nil {
85+
return err
86+
}
87+
closeDstImg := func() {
88+
if ee := dstImg.Close(); ee != nil {
89+
err = ee
90+
}
91+
}
92+
defer closeDstImg()
93+
_, err = io.Copy(dstImg, srcImg)
94+
return err
9595
}
9696

9797
// Make a boot2docker VM disk image with the given size (in MB).

0 commit comments

Comments
 (0)