Optimize the comparison mode of bool judgment

Signed-off-by: Fish-pro <zechun.chen@daocloud.io>
cilium · Jan 7, 2023 · 0552604 · 0552604
1 parent 80af06e
commit 0552604
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/cilium/cmd/helpers.go b/cilium/cmd/helpers.go
@@ -409,7 +409,7 @@ func getIpv6EnableStatus() bool {
 	if _, err := client.Daemon.GetHealthz(params); err == nil {
 		if resp, err := client.ConfigGet(); err == nil {
 			if resp.Status != nil {
-				return resp.Status.Addressing.IPV6 != nil && resp.Status.Addressing.IPV6.Enabled == true
+				return resp.Status.Addressing.IPV6 != nil && resp.Status.Addressing.IPV6.Enabled
 			}
 		}
 	} else { // else read the EnableIPv6 status from the file-system

diff --git a/pkg/bgp/speaker/speaker_test.go b/pkg/bgp/speaker/speaker_test.go
@@ -496,7 +496,7 @@ func TestSpeakerOnDeleteNode(t *testing.T) {
 	}
 
 	// confirm speaker rejects any further events.
-	if spkr.shutDown() != true {
+	if !spkr.shutDown() {
 		t.Fatalf("wanted speaker to be shutdown")
 	}
 	if err := spkr.OnAddNode(nil, nil); !errors.Is(err, ErrShutDown) {

diff --git a/pkg/datapath/linux/ipsec/ipsec_linux.go b/pkg/datapath/linux/ipsec/ipsec_linux.go
@@ -151,7 +151,7 @@ func ipSecReplaceStateIn(remoteIP, localIP net.IP, zeroMark bool) (uint8, error)
 		Value: linux_defaults.RouteMarkDecrypt,
 		Mask:  linux_defaults.IPsecMarkMaskIn,
 	}
-	if zeroMark != true {
+	if !zeroMark {
 		state.OutputMark = &netlink.XfrmMark{
 			Value: linux_defaults.RouteMarkDecrypt,
 			Mask:  linux_defaults.RouteMarkMask,

diff --git a/pkg/datapath/linux/route/route_linux.go b/pkg/datapath/linux/route/route_linux.go
@@ -447,7 +447,7 @@ func replaceRule(spec Rule, family int) error {
 	if err != nil {
 		return err
 	}
-	if exists == true {
+	if exists {
 		return nil
 	}
 	rule := netlink.NewRule()

diff --git a/pkg/k8s/service.go b/pkg/k8s/service.go
@@ -637,8 +637,8 @@ func (s *Service) EqualsClusterService(svc *serviceStore.ClusterService) bool {
 	// These comparisons must match the ParseClusterService() function above.
 	if ip.UnsortedIPListsAreEqual(s.FrontendIPs, feIPs) &&
 		s.IsHeadless == (len(svc.Frontends) == 0) &&
-		s.IncludeExternal == true &&
-		s.Shared == true &&
+		s.IncludeExternal &&
+		s.Shared &&
 		s.ExtTrafficPolicy == loadbalancer.SVCTrafficPolicyCluster &&
 		s.IntTrafficPolicy == loadbalancer.SVCTrafficPolicyCluster &&
 		s.HealthCheckNodePort == 0 &&

diff --git a/proxylib/cassandra/cassandraparser.go b/proxylib/cassandra/cassandraparser.go
@@ -252,7 +252,7 @@ func (p *CassandraParser) OnData(reply, endStream bool, dataArray [][]byte) (OpT
 		} else if len(parts) == 4 {
 			fields["query_action"] = parts[2]
 			fields["query_table"] = parts[3]
-		} else if unpreparedQuery == true {
+		} else if unpreparedQuery {
 			fields["error"] = "unknown prepared query id"
 		} else {
 			// do not log non-query accesses

diff --git a/test/bpf_tests/gocovmerge.go b/test/bpf_tests/gocovmerge.go
@@ -59,7 +59,7 @@ func mergeProfileBlock(p *cover.Profile, pb cover.ProfileBlock, startIndex int)
 	}
 
 	i := 0
-	if sortFunc(i) != true {
+	if !sortFunc(i) {
 		i = sort.Search(len(p.Blocks)-startIndex, sortFunc)
 	}
 	i += startIndex