Commit f34964ed authored by Michalis Kargakis's avatar Michalis Kargakis Committed by Minux Ma

flag: Some idiomatic fixes

Make golint a bit happier

Change-Id: I8a14342f3e492e92bf5efa611f9ef91176624031
Reviewed-on: https://go-review.googlesource.com/1891Reviewed-by: default avatarMinux Ma <minux@golang.org>
parent 474ce690
...@@ -726,27 +726,27 @@ func (f *FlagSet) parseOne() (bool, error) { ...@@ -726,27 +726,27 @@ func (f *FlagSet) parseOne() (bool, error) {
if len(s) == 0 || s[0] != '-' || len(s) == 1 { if len(s) == 0 || s[0] != '-' || len(s) == 1 {
return false, nil return false, nil
} }
num_minuses := 1 numMinuses := 1
if s[1] == '-' { if s[1] == '-' {
num_minuses++ numMinuses++
if len(s) == 2 { // "--" terminates the flags if len(s) == 2 { // "--" terminates the flags
f.args = f.args[1:] f.args = f.args[1:]
return false, nil return false, nil
} }
} }
name := s[num_minuses:] name := s[numMinuses:]
if len(name) == 0 || name[0] == '-' || name[0] == '=' { if len(name) == 0 || name[0] == '-' || name[0] == '=' {
return false, f.failf("bad flag syntax: %s", s) return false, f.failf("bad flag syntax: %s", s)
} }
// it's a flag. does it have an argument? // it's a flag. does it have an argument?
f.args = f.args[1:] f.args = f.args[1:]
has_value := false hasValue := false
value := "" value := ""
for i := 1; i < len(name); i++ { // equals cannot be first for i := 1; i < len(name); i++ { // equals cannot be first
if name[i] == '=' { if name[i] == '=' {
value = name[i+1:] value = name[i+1:]
has_value = true hasValue = true
name = name[0:i] name = name[0:i]
break break
} }
...@@ -762,7 +762,7 @@ func (f *FlagSet) parseOne() (bool, error) { ...@@ -762,7 +762,7 @@ func (f *FlagSet) parseOne() (bool, error) {
} }
if fv, ok := flag.Value.(boolFlag); ok && fv.IsBoolFlag() { // special case: doesn't need an arg if fv, ok := flag.Value.(boolFlag); ok && fv.IsBoolFlag() { // special case: doesn't need an arg
if has_value { if hasValue {
if err := fv.Set(value); err != nil { if err := fv.Set(value); err != nil {
return false, f.failf("invalid boolean value %q for -%s: %v", value, name, err) return false, f.failf("invalid boolean value %q for -%s: %v", value, name, err)
} }
...@@ -771,12 +771,12 @@ func (f *FlagSet) parseOne() (bool, error) { ...@@ -771,12 +771,12 @@ func (f *FlagSet) parseOne() (bool, error) {
} }
} else { } else {
// It must have a value, which might be the next argument. // It must have a value, which might be the next argument.
if !has_value && len(f.args) > 0 { if !hasValue && len(f.args) > 0 {
// value is the next arg // value is the next arg
has_value = true hasValue = true
value, f.args = f.args[0], f.args[1:] value, f.args = f.args[0], f.args[1:]
} }
if !has_value { if !hasValue {
return false, f.failf("flag needs an argument: -%s", name) return false, f.failf("flag needs an argument: -%s", name)
} }
if err := flag.Value.Set(value); err != nil { if err := flag.Value.Set(value); err != nil {
......
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