浏览代码

libnet: remove arg `options` from (*Endpoint).Leave()

This arg is never set by any caller. Better remove it

Signed-off-by: Albin Kerouanton <albinker@gmail.com>
Albin Kerouanton 1 年之前
父节点
当前提交
21136865ac
共有 1 个文件被更改,包括 3 次插入5 次删除
  1. 3 5
      libnetwork/endpoint.go

+ 3 - 5
libnetwork/endpoint.go

@@ -639,7 +639,7 @@ func (ep *Endpoint) hasInterface(iName string) bool {
 }
 }
 
 
 // Leave detaches the network resources populated in the sandbox.
 // Leave detaches the network resources populated in the sandbox.
-func (ep *Endpoint) Leave(sb *Sandbox, options ...EndpointOption) error {
+func (ep *Endpoint) Leave(sb *Sandbox) error {
 	if sb == nil || sb.ID() == "" || sb.Key() == "" {
 	if sb == nil || sb.ID() == "" || sb.Key() == "" {
 		return types.InvalidParameterErrorf("invalid Sandbox passed to endpoint leave: %v", sb)
 		return types.InvalidParameterErrorf("invalid Sandbox passed to endpoint leave: %v", sb)
 	}
 	}
@@ -647,10 +647,10 @@ func (ep *Endpoint) Leave(sb *Sandbox, options ...EndpointOption) error {
 	sb.joinLeaveStart()
 	sb.joinLeaveStart()
 	defer sb.joinLeaveEnd()
 	defer sb.joinLeaveEnd()
 
 
-	return ep.sbLeave(sb, false, options...)
+	return ep.sbLeave(sb, false)
 }
 }
 
 
-func (ep *Endpoint) sbLeave(sb *Sandbox, force bool, options ...EndpointOption) error {
+func (ep *Endpoint) sbLeave(sb *Sandbox, force bool) error {
 	n, err := ep.getNetworkFromStore()
 	n, err := ep.getNetworkFromStore()
 	if err != nil {
 	if err != nil {
 		return fmt.Errorf("failed to get network from store during leave: %v", err)
 		return fmt.Errorf("failed to get network from store during leave: %v", err)
@@ -672,8 +672,6 @@ func (ep *Endpoint) sbLeave(sb *Sandbox, force bool, options ...EndpointOption)
 		return types.ForbiddenErrorf("unexpected sandbox ID in leave request. Expected %s. Got %s", ep.sandboxID, sb.ID())
 		return types.ForbiddenErrorf("unexpected sandbox ID in leave request. Expected %s. Got %s", ep.sandboxID, sb.ID())
 	}
 	}
 
 
-	ep.processOptions(options...)
-
 	d, err := n.driver(!force)
 	d, err := n.driver(!force)
 	if err != nil {
 	if err != nil {
 		return fmt.Errorf("failed to get driver during endpoint leave: %v", err)
 		return fmt.Errorf("failed to get driver during endpoint leave: %v", err)