all: remove nil check for slices

lelenanam · lelenanam · commit ace53bbe65d1 · 2016-10-13T13:55:38.000-07:00
Signed-off-by: Elena Morozova &lt;lelenanam@gmail.com&gt;
diff --git a/api/types/filters/parse.go b/api/types/filters/parse.go
@@ -165,7 +165,7 @@ func (filters Args) MatchKVList(field string, sources map[string]string) bool {
 		return true
 	}
 
-	if sources == nil || len(sources) == 0 {
+	if len(sources) == 0 {
 		return false
 	}
 
diff --git a/pkg/archive/archive_linux.go b/pkg/archive/archive_linux.go
@@ -36,7 +36,7 @@ func (overlayWhiteoutConverter) ConvertWrite(hdr *tar.Header, path string, fi os
 		if err != nil {
 			return err
 		}
-		if opaque != nil && len(opaque) == 1 && opaque[0] == 'y' {
+		if len(opaque) == 1 && opaque[0] == 'y' {
 			// create a header for the whiteout file
 			// it should inherit some properties from the parent, but be a regular file
 			*hdr = tar.Header{
diff --git a/pkg/archive/changes_linux.go b/pkg/archive/changes_linux.go
@@ -302,7 +302,7 @@ func overlayDeletedFile(root, path string, fi os.FileInfo) (string, error) {
 		if err != nil {
 			return "", err
 		}
-		if opaque != nil && len(opaque) == 1 && opaque[0] == 'y' {
+		if len(opaque) == 1 && opaque[0] == 'y' {
 			return path, nil
 		}
 	}
diff --git a/pkg/discovery/backends.go b/pkg/discovery/backends.go
@@ -69,7 +69,7 @@ func ParseAdvertise(advertise string) (string, error) {
 		return "", fmt.Errorf("unable to get advertise IP address from interface (%s) : %v", advertise, err)
 	}
 
-	if addrs == nil || len(addrs) == 0 {
+	if len(addrs) == 0 {
 		return "", fmt.Errorf("no available advertise IP address in interface (%s)", advertise)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ func (filters Args) MatchKVList(field string, sources map[string]string) bool {`
`165`	`165`	`return true`
`166`	`166`	`}`
`167`	`167`
`168`		`- if sources == nil \|\| len(sources) == 0 {`
	`168`	`+ if len(sources) == 0 {`
`169`	`169`	`return false`
`170`	`170`	`}`
`171`	`171`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func (overlayWhiteoutConverter) ConvertWrite(hdr *tar.Header, path string, fi os`
`36`	`36`	`if err != nil {`
`37`	`37`	`return err`
`38`	`38`	`}`
`39`		`- if opaque != nil && len(opaque) == 1 && opaque[0] == 'y' {`
	`39`	`+ if len(opaque) == 1 && opaque[0] == 'y' {`
`40`	`40`	`// create a header for the whiteout file`
`41`	`41`	`// it should inherit some properties from the parent, but be a regular file`
`42`	`42`	`*hdr = tar.Header{`
Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ func overlayDeletedFile(root, path string, fi os.FileInfo) (string, error) {`
`302`	`302`	`if err != nil {`
`303`	`303`	`return "", err`
`304`	`304`	`}`
`305`		`- if opaque != nil && len(opaque) == 1 && opaque[0] == 'y' {`
	`305`	`+ if len(opaque) == 1 && opaque[0] == 'y' {`
`306`	`306`	`return path, nil`
`307`	`307`	`}`
`308`	`308`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func ParseAdvertise(advertise string) (string, error) {`
`69`	`69`	`return "", fmt.Errorf("unable to get advertise IP address from interface (%s) : %v", advertise, err)`
`70`	`70`	`}`
`71`	`71`
`72`		`- if addrs == nil \|\| len(addrs) == 0 {`
	`72`	`+ if len(addrs) == 0 {`
`73`	`73`	`return "", fmt.Errorf("no available advertise IP address in interface (%s)", advertise)`
`74`	`74`	`}`
`75`	`75`