From b054178e11d34825a7508dfdead54057e13a96e9 Mon Sep 17 00:00:00 2001 From: izturn <44051386+izturn@users.noreply.github.com> Date: Tue, 9 Jan 2024 23:15:18 +0800 Subject: [PATCH] internal: replace min/max funcs with built-in ones (#6062) Signed-off-by: gang.liu --- internal/envoy/cluster.go | 7 ------- internal/xdscache/v3/listener.go | 14 -------------- 2 files changed, 21 deletions(-) diff --git a/internal/envoy/cluster.go b/internal/envoy/cluster.go index 7d5218df95a..8048b371a93 100644 --- a/internal/envoy/cluster.go +++ b/internal/envoy/cluster.go @@ -114,13 +114,6 @@ func truncate(l int, s, suffix string) string { return s[:l-len(suffix)-1] + "-" + suffix } -func min(a, b int) int { - if a > b { - return b - } - return a -} - // AnyPositive indicates if any of the values provided are greater than zero. func AnyPositive(first uint32, rest ...uint32) bool { if first > 0 { diff --git a/internal/xdscache/v3/listener.go b/internal/xdscache/v3/listener.go index 85070cd2253..3cba5ee2aa5 100644 --- a/internal/xdscache/v3/listener.go +++ b/internal/xdscache/v3/listener.go @@ -365,20 +365,6 @@ func (c *ListenerCache) OnChange(root *dag.DAG) { cfg := c.Config listeners := map[string]*envoy_listener_v3.Listener{} - max := func(a, b envoy_tls_v3.TlsParameters_TlsProtocol) envoy_tls_v3.TlsParameters_TlsProtocol { - if a > b { - return a - } - return b - } - - min := func(a, b envoy_tls_v3.TlsParameters_TlsProtocol) envoy_tls_v3.TlsParameters_TlsProtocol { - if a < b { - return a - } - return b - } - socketOptions := envoy_v3.NewSocketOptions().TCPKeepalive() if cfg.SocketOptions != nil { socketOptions = socketOptions.TOS(cfg.SocketOptions.TOS).TrafficClass(cfg.SocketOptions.TrafficClass)