runtimetest: remove unnecessary else

Ma Shimiao · wking · commit ddd7300cee20 · 2016-09-15T09:21:22.000-07:00
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com> Backported to v1.0.0.rc1 from 609040b #208 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <wking@tremily.us>
diff --git a/cmd/runtimetest/main.go b/cmd/runtimetest/main.go
@@ -281,10 +281,9 @@ func validateDefaultDevices(spec *rspec.Spec) error {
 				return fmt.Errorf("device node %v not found", device)
 			}
 			return err
-		} else {
-			if fi.Mode()&os.ModeDevice != os.ModeDevice {
-				return fmt.Errorf("file %v is not a device as expected", device)
-			}
+		}
+		if fi.Mode()&os.ModeDevice != os.ModeDevice {
+			return fmt.Errorf("file %v is not a device as expected", device)
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -281,10 +281,9 @@ func validateDefaultDevices(spec *rspec.Spec) error {`
`281`	`281`	`return fmt.Errorf("device node %v not found", device)`
`282`	`282`	`}`
`283`	`283`	`return err`
`284`		`- } else {`
`285`		`- if fi.Mode()&os.ModeDevice != os.ModeDevice {`
`286`		`- return fmt.Errorf("file %v is not a device as expected", device)`
`287`		`- }`
	`284`	`+ }`
	`285`	`+ if fi.Mode()&os.ModeDevice != os.ModeDevice {`
	`286`	`+ return fmt.Errorf("file %v is not a device as expected", device)`
`288`	`287`	`}`
`289`	`288`	`}`
`290`	`289`