From 21136865acf1befea2bea43f5ef27309b36b5929 Mon Sep 17 00:00:00 2001 From: Albin Kerouanton Date: Fri, 3 Nov 2023 10:35:51 +0100 Subject: [PATCH] libnet: remove arg `options` from (*Endpoint).Leave() This arg is never set by any caller. Better remove it Signed-off-by: Albin Kerouanton --- libnetwork/endpoint.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libnetwork/endpoint.go b/libnetwork/endpoint.go index fa53450868..48958309e5 100644 --- a/libnetwork/endpoint.go +++ b/libnetwork/endpoint.go @@ -639,7 +639,7 @@ func (ep *Endpoint) hasInterface(iName string) bool { } // 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() == "" { 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() 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() if err != nil { 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()) } - ep.processOptions(options...) - d, err := n.driver(!force) if err != nil { return fmt.Errorf("failed to get driver during endpoint leave: %v", err)