Merge pull request #5 from soyoo/patch-1

kubeedge-bot · web-flow · commit 8fa2f50baa62 · 2021-02-27T19:25:25.000+08:00
modbus-go: fix logical exceptions
diff --git a/pkg/modbus/config.go b/pkg/modbus/config.go
@@ -77,8 +77,7 @@ func (c *Config) parseFlags() error {
 	pflag.StringVar(&c.Mqtt.PrivateKey, "mqtt-priviatekey", c.Mqtt.PrivateKey, "private key file path")
 	pflag.Parse()
 
-	if (c.Mqtt.Cert != "" && c.Mqtt.PrivateKey == "") ||
-		(c.Mqtt.Cert == "" && c.Mqtt.PrivateKey != "") {
+	if c.Mqtt.Cert == "" || c.Mqtt.PrivateKey == "" {
 		return ErrConfigCert
 	}
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,7 @@ func (c *Config) parseFlags() error {`
`77`	`77`	`pflag.StringVar(&c.Mqtt.PrivateKey, "mqtt-priviatekey", c.Mqtt.PrivateKey, "private key file path")`
`78`	`78`	`pflag.Parse()`
`79`	`79`
`80`		`- if (c.Mqtt.Cert != "" && c.Mqtt.PrivateKey == "") \|\|`
`81`		`- (c.Mqtt.Cert == "" && c.Mqtt.PrivateKey != "") {`
	`80`	`+ if c.Mqtt.Cert == "" \|\| c.Mqtt.PrivateKey == "" {`
`82`	`81`	`return ErrConfigCert`
`83`	`82`	`}`
`84`	`83`	`return nil`