docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23161 from AkihiroSuda/rename-misleading-function-name 

daemon: Rename copy to copyFunc
This commit is contained in:
Sebastiaan van Stijn 2016-06-02 15:31:08 +02:00
parent 22aca92ee3 8bce6265fc
commit 0aeac288a3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/monitor.go
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) s.Add(1)
go func() { go func() {
if _, err := io.Copy(w, r); err != nil { 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 { if iop.Stdout != nil {
copy(s.Stdout(), iop.Stdout) copyFunc(s.Stdout(), iop.Stdout)
} }
if iop.Stderr != nil { if iop.Stderr != nil {
copy(s.Stderr(), iop.Stderr) copyFunc(s.Stderr(), iop.Stderr)
} }
return nil return nil