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

daemon: updateSandboxNetworkSettings: remove unused error-return

Browse source 
This function never returns an error, so let's remove the error-return,
and give it a slightly more to-the-point name.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-08-12 13:48:41 +02:00
parent 2eccf0e8d1
commit 405f571ae8
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
daemon/container_operations.go
View file

@ -545,7 +545,7 @@ func (daemon *Daemon) allocateNetwork(cfg *config.Config, container *container.C
if err != nil {
return err
}
updateSandboxNetworkSettings(container, sb)
setNetworkSandbox(container, sb)
defer func() {
if retErr != nil {
sb.Delete()
@ -747,7 +747,7 @@ func (daemon *Daemon) connectToNetwork(cfg *config.Config, container *container.
return err
}
updateSandboxNetworkSettings(container, sb)
setNetworkSandbox(container, sb)
}
joinOptions, err := buildJoinOptions(container.NetworkSettings, n)
@ -1096,9 +1096,8 @@ func getNetworkID(name string, endpointSettings *networktypes.EndpointSettings)
return name
}
// updateSandboxNetworkSettings updates the sandbox ID and Key.
func updateSandboxNetworkSettings(c *container.Container, sb *libnetwork.Sandbox) error {
// setNetworkSandbox updates the sandbox ID and Key.
func setNetworkSandbox(c *container.Container, sb *libnetwork.Sandbox) {
c.NetworkSettings.SandboxID = sb.ID()
c.NetworkSettings.SandboxKey = sb.Key()
return nil
}