Changing bitflag checking style to preferred style. Fixes moby#11668

jimmypuckett · jimmypuckett · commit ec5e22efe3fb · 2015-03-24T21:09:25.000-04:00
Signed-off-by: Jimmy Puckett &lt;jimmy.puckett@spinen.com&gt;
diff --git a/daemon/daemon.go b/daemon/daemon.go
@@ -445,8 +445,8 @@ func (daemon *Daemon) setupResolvconfWatcher() error {
 			select {
 			case event := <-watcher.Events:
 				if event.Name == "/etc/resolv.conf" &&
-					(event.Op&fsnotify.Write == fsnotify.Write ||
-						event.Op&fsnotify.Create == fsnotify.Create) {
+					(event.Op&fsnotify.Write != 0 ||
+						event.Op&fsnotify.Create != 0) {
 					// verify a real change happened before we go further--a file write may have happened
 					// without an actual change to the file
 					updatedResolvConf, newResolvConfHash, err := resolvconf.GetIfChanged()
diff --git a/daemon/graphdriver/aufs/migrate.go b/daemon/graphdriver/aufs/migrate.go
@@ -162,7 +162,7 @@ func tryRelocate(oldPath, newPath string) error {
 	}
 	// If the destination is a symlink then we already tried to relocate once before
 	// and it failed so we delete it and try to remove
-	if s != nil && s.Mode()&os.ModeSymlink == os.ModeSymlink {
+	if s != nil && s.Mode()&os.ModeSymlink != 0 {
 		if err := os.RemoveAll(newPath); err != nil {
 			return err
 		}
diff --git a/pkg/archive/archive_unix.go b/pkg/archive/archive_unix.go
@@ -36,8 +36,8 @@ func setHeaderForSpecialDevice(hdr *tar.Header, ta *tarAppender, name string, st
 	inode = uint64(s.Ino)
 
 	// Currently go does not fil in the major/minors
-	if s.Mode&syscall.S_IFBLK == syscall.S_IFBLK ||
-		s.Mode&syscall.S_IFCHR == syscall.S_IFCHR {
+	if s.Mode&syscall.S_IFBLK != 0 ||
+		s.Mode&syscall.S_IFCHR != 0 {
 		hdr.Devmajor = int64(major(uint64(s.Rdev)))
 		hdr.Devminor = int64(minor(uint64(s.Rdev)))
 	}
diff --git a/pkg/archive/changes.go b/pkg/archive/changes.go
@@ -176,7 +176,7 @@ func (info *FileInfo) path() string {
 }
 
 func (info *FileInfo) isDir() bool {
-	return info.parent == nil || info.stat.Mode()&syscall.S_IFDIR == syscall.S_IFDIR
+	return info.parent == nil || info.stat.Mode()&syscall.S_IFDIR != 0
 }
 
 func (info *FileInfo) addChanges(oldInfo *FileInfo, changes *[]Change) {

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ func tryRelocate(oldPath, newPath string) error {`
`162`	`162`	`}`
`163`	`163`	`// If the destination is a symlink then we already tried to relocate once before`
`164`	`164`	`// and it failed so we delete it and try to remove`
`165`		`- if s != nil && s.Mode()&os.ModeSymlink == os.ModeSymlink {`
	`165`	`+ if s != nil && s.Mode()&os.ModeSymlink != 0 {`
`166`	`166`	`if err := os.RemoveAll(newPath); err != nil {`
`167`	`167`	`return err`
`168`	`168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ func (info *FileInfo) path() string {`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`func (info *FileInfo) isDir() bool {`
`179`		`- return info.parent == nil \|\| info.stat.Mode()&syscall.S_IFDIR == syscall.S_IFDIR`
	`179`	`+ return info.parent == nil \|\| info.stat.Mode()&syscall.S_IFDIR != 0`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`func (info FileInfo) addChanges(oldInfo FileInfo, changes *[]Change) {`