Merge pull request moby#38510 from ZYecho/tune-code

tiborvass · web-flow · commit 119f892016ef · 2019-03-21T13:56:02.000-07:00
fix: simplify code logic
diff --git a/daemon/stats/collector_unix.go b/daemon/stats/collector_unix.go
@@ -33,7 +33,6 @@ const nanoSecondsPerSecond = 1e9
 // provided. See `man 5 proc` for details on specific field
 // information.
 func (s *Collector) getSystemCPUUsage() (uint64, error) {
-	var line string
 	f, err := os.Open("/proc/stat")
 	if err != nil {
 		return 0, err
@@ -43,9 +42,9 @@ func (s *Collector) getSystemCPUUsage() (uint64, error) {
 		f.Close()
 	}()
 	s.bufReader.Reset(f)
-	err = nil
-	for err == nil {
-		line, err = s.bufReader.ReadString('\n')
+
+	for {
+		line, err := s.bufReader.ReadString('\n')
 		if err != nil {
 			break
 		}
