more linting

Signed-off-by: Frederic BIDON <[email protected]>

flag_test.go

@@ -573,6 +573,7 @@ func TestShorthandLookup(t *testing.T) {
 	flag := f.ShorthandLookup("a")
 	if flag == nil {
 		t.Errorf("f.ShorthandLookup(\"a\") returned nil")
+		return // required
 	}
 	if flag.Name != "boola" {
 		t.Errorf("f.ShorthandLookup(\"a\") found %q instead of \"boola\"", flag.Name)

ipnet_slice_test.go

@@ -13,10 +13,7 @@ func getCIDR(ip net.IP, cidr *net.IPNet, err error) net.IPNet {
 }
 
 func equalCIDR(c1 net.IPNet, c2 net.IPNet) bool {
-	if c1.String() == c2.String() {
-		return true
-	}
-	return false
+	return c1.String() == c2.String()
 }
 
 func setUpIPNetFlagSet(ipsp *[]net.IPNet) *FlagSet {

string_array.go

@@ -30,9 +30,7 @@ func (s *stringArrayValue) Append(val string) error {
 
 func (s *stringArrayValue) Replace(val []string) error {
 	out := make([]string, len(val))
-	for i, d := range val {
-		out[i] = d
-	}
+	copy(out, val)
 	*s.value = out
 	return nil
 }
@@ -53,6 +51,9 @@ func (s *stringArrayValue) String() string {
 }
 
 func stringArrayConv(sval string) (interface{}, error) {
+	if len(sval) == 0 {
+		return []string{}, nil
+	}
 	sval = sval[1 : len(sval)-1]
 	// An empty string would cause a array with one (empty) string
 	if len(sval) == 0 {

string_array_test.go

@@ -254,3 +254,10 @@ func TestSAWithSquareBrackets(t *testing.T) {
 		}
 	}
 }
+
+func TestStringArrayConv(t *testing.T) {
+	_, err := stringArrayConv("")
+	if err != nil {
+		t.Errorf("unexpected failure on stringArrayConv")
+	}
+}