Browse Source

daemon: updateSandboxNetworkSettings: remove unused error-return

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>
Sebastiaan van Stijn 1 year ago
parent
commit
405f571ae8
1 changed files with 4 additions and 5 deletions
  1. 4 5
      daemon/container_operations.go

+ 4 - 5
daemon/container_operations.go

@@ -545,7 +545,7 @@ func (daemon *Daemon) allocateNetwork(cfg *config.Config, container *container.C
 			if err != nil {
 			if err != nil {
 				return err
 				return err
 			}
 			}
-			updateSandboxNetworkSettings(container, sb)
+			setNetworkSandbox(container, sb)
 			defer func() {
 			defer func() {
 				if retErr != nil {
 				if retErr != nil {
 					sb.Delete()
 					sb.Delete()
@@ -747,7 +747,7 @@ func (daemon *Daemon) connectToNetwork(cfg *config.Config, container *container.
 			return err
 			return err
 		}
 		}
 
 
-		updateSandboxNetworkSettings(container, sb)
+		setNetworkSandbox(container, sb)
 	}
 	}
 
 
 	joinOptions, err := buildJoinOptions(container.NetworkSettings, n)
 	joinOptions, err := buildJoinOptions(container.NetworkSettings, n)
@@ -1096,9 +1096,8 @@ func getNetworkID(name string, endpointSettings *networktypes.EndpointSettings)
 	return name
 	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.SandboxID = sb.ID()
 	c.NetworkSettings.SandboxKey = sb.Key()
 	c.NetworkSettings.SandboxKey = sb.Key()
-	return nil
 }
 }