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

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

Browse Source 
daemon: Rename copy to copyFunc
Upstream-commit: 0aeac288a33e498ad6bfa5a91f044a469c78a138
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2016-06-02 15:31:08 +02:00
parent ce5b5efc4f 894477b221
commit 3bf6a7fe89
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/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)
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