0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Return pointer from newBaseContainer

Browse source 
It makes code more consistent.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
This commit is contained in:
Alexander Morozov 2015-10-27 09:05:25 -07:00
parent b6fa541877
commit 6d9bb99c97
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
daemon/daemon.go
View file

@ -177,10 +177,10 @@ func (daemon *Daemon) load(id string) (*Container, error) {
}
if container.ID != id {
return &container, fmt.Errorf("Container %s is stored at %s", container.ID, id)
return container, fmt.Errorf("Container %s is stored at %s", container.ID, id)
}
return &container, nil
return container, nil
}
// Register makes a container object usable by the daemon as <container.ID>
@ -492,7 +492,7 @@ func (daemon *Daemon) newContainer(name string, config *runconfig.Config, imgID
base.Driver = daemon.driver.String()
base.ExecDriver = daemon.execDriver.Name()
return &base, err
return base, err
}
// GetFullContainerName returns a constructed container name. I think

4
daemon/daemon_unix.go
View file

@ -599,8 +599,8 @@ func (daemon *Daemon) registerLinks(container *Container, hostConfig *runconfig.
return nil
}
func (daemon *Daemon) newBaseContainer(id string) Container {
return Container{
func (daemon *Daemon) newBaseContainer(id string) *Container {
return &Container{
CommonContainer: CommonContainer{
ID: id,
State: NewState(),

4
daemon/daemon_windows.go
View file

@ -140,8 +140,8 @@ func (daemon *Daemon) registerLinks(container *Container, hostConfig *runconfig.
return nil
}
func (daemon *Daemon) newBaseContainer(id string) Container {
return Container{
func (daemon *Daemon) newBaseContainer(id string) *Container {
return &Container{
CommonContainer: CommonContainer{
ID: id,
State: NewState(),