Commit 87650ce8 authored by astaxie's avatar astaxie

make golint happy

parent fdce4af9
...@@ -113,7 +113,6 @@ func NewConfigData(adapterName string, data []byte) (Configer, error) { ...@@ -113,7 +113,6 @@ func NewConfigData(adapterName string, data []byte) (Configer, error) {
// 0, 0.0, f, F, FALSE, false, False, NO, no, No, N,n, OFF, off, Off. // 0, 0.0, f, F, FALSE, false, False, NO, no, No, N,n, OFF, off, Off.
// Any other value returns an error. // Any other value returns an error.
func ParseBool(val interface{}) (value bool, err error) { func ParseBool(val interface{}) (value bool, err error) {
if val != nil { if val != nil {
switch v := val.(type) { switch v := val.(type) {
case bool: case bool:
...@@ -140,7 +139,6 @@ func ParseBool(val interface{}) (value bool, err error) { ...@@ -140,7 +139,6 @@ func ParseBool(val interface{}) (value bool, err error) {
} }
} }
return false, fmt.Errorf("parsing %q: invalid syntax", val) return false, fmt.Errorf("parsing %q: invalid syntax", val)
} else {
return false, fmt.Errorf("parsing <nil>: invalid syntax")
} }
return false, fmt.Errorf("parsing <nil>: invalid syntax")
} }
...@@ -94,9 +94,8 @@ type ConfigContainer struct { ...@@ -94,9 +94,8 @@ type ConfigContainer struct {
func (c *ConfigContainer) Bool(key string) (bool, error) { func (c *ConfigContainer) Bool(key string) (bool, error) {
if v, ok := c.data[key]; ok { if v, ok := c.data[key]; ok {
return config.ParseBool(v) return config.ParseBool(v)
} else {
return false, fmt.Errorf("not exist key: %q", key)
} }
return false, fmt.Errorf("not exist key: %q", key)
} }
// DefaultBool return the bool value if has no error // DefaultBool return the bool value if has no error
......
...@@ -123,9 +123,8 @@ type ConfigContainer struct { ...@@ -123,9 +123,8 @@ type ConfigContainer struct {
func (c *ConfigContainer) Bool(key string) (bool, error) { func (c *ConfigContainer) Bool(key string) (bool, error) {
if v, ok := c.data[key]; ok { if v, ok := c.data[key]; ok {
return config.ParseBool(v) return config.ParseBool(v)
} else {
return false, fmt.Errorf("not exist key: %q", key)
} }
return false, fmt.Errorf("not exist key: %q", key)
} }
// DefaultBool return the bool value if has no error // DefaultBool return the bool value if has no error
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment