1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

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
commit 0aeac288a3

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