toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

daemon: Rename copy to copyFunc

Browse Source 
"copy" can be misleading for humans because Go has its own builtin "copy" function

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 8bce6265fca22c117cf6d69d9ffd4ee78da9db8a
Component: engine
This commit is contained in:
Akihiro Suda
2016-06-01 06:50:23 +00:00
parent 62fbe9a76e
commit 894477b221
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/monitor.go
+3 -3
View File
@@ -126,7 +126,7 @@ func (daemon *Daemon) AttachStreams(id string, iop libcontainerd.IOPipe) error {
}
}
copy := func(w io.Writer, r io.Reader) {
copyFunc := func(w io.Writer, r io.Reader) {
s.Add(1)
go func() {
if _, err := io.Copy(w, r); err != nil {
@@ -137,10 +137,10 @@ func (daemon *Daemon) AttachStreams(id string, iop libcontainerd.IOPipe) error {
}
if iop.Stdout != nil {
copy(s.Stdout(), iop.Stdout)
copyFunc(s.Stdout(), iop.Stdout)
}
if iop.Stderr != nil {
copy(s.Stderr(), iop.Stderr)
copyFunc(s.Stderr(), iop.Stderr)
}
return nil