opencontainers/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2025-08-05 14:35:47 +03:00
Code Activity

Nit: fix use of bufio.Scanner.Err

Browse Source 
The Err() method should be called after the Scan() loop, not inside it.

Found by

 git grep -A3 -F '.Scan()' | grep Err

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin
2020-03-27 00:10:53 -07:00
parent 96596cbbec
commit 0af5cd2041
3 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libcontainer/cgroups/fs2/defaultpath.go
View File

@@ -80,9 +80,6 @@ func parseCgroupFromReader(r io.Reader) (string, error) {
s = bufio.NewScanner(r) s = bufio.NewScanner(r)
) )
for s.Scan() { for s.Scan() {
if err := s.Err(); err != nil {
return "", err
}
var ( var (
text = s.Text() text = s.Text()
parts = strings.SplitN(text, ":", 3) parts = strings.SplitN(text, ":", 3)
@@ -95,5 +92,8 @@ func parseCgroupFromReader(r io.Reader) (string, error) {
return parts[2], nil return parts[2], nil
} }
} }
if err := s.Err(); err != nil {
return "", err
}
return "", errors.New("cgroup path not found") return "", errors.New("cgroup path not found")
} }

8
libcontainer/intelrdt/intelrdt.go
View File

@@ -310,10 +310,6 @@ func parseCpuInfoFile(path string) (bool, bool, error) {
s := bufio.NewScanner(f) s := bufio.NewScanner(f)
for s.Scan() { for s.Scan() {
if err := s.Err(); err != nil {
return false, false, err
}
line := s.Text() line := s.Text()
// Search "cat_l3" and "mba" flags in first "flags" line // Search "cat_l3" and "mba" flags in first "flags" line
@@ -331,6 +327,10 @@ func parseCpuInfoFile(path string) (bool, bool, error) {
return isCatFlagSet, isMbaFlagSet, nil return isCatFlagSet, isMbaFlagSet, nil
} }
} }
if err := s.Err(); err != nil {
return false, false, err
}
return isCatFlagSet, isMbaFlagSet, nil return isCatFlagSet, isMbaFlagSet, nil
} }

28
libcontainer/user/user.go
View File

@@ -162,10 +162,6 @@ func ParsePasswdFilter(r io.Reader, filter func(User) bool) ([]User, error) {
) )
for s.Scan() { for s.Scan() {
if err := s.Err(); err != nil {
return nil, err
}
line := strings.TrimSpace(s.Text()) line := strings.TrimSpace(s.Text())
if line == "" { if line == "" {
continue continue
@@ -183,6 +179,9 @@ func ParsePasswdFilter(r io.Reader, filter func(User) bool) ([]User, error) {
out = append(out, p) out = append(out, p)
} }
} }
if err := s.Err(); err != nil {
return nil, err
}
return out, nil return out, nil
} }
@@ -221,10 +220,6 @@ func ParseGroupFilter(r io.Reader, filter func(Group) bool) ([]Group, error) {
) )
for s.Scan() { for s.Scan() {
if err := s.Err(); err != nil {
return nil, err
}
text := s.Text() text := s.Text()
if text == "" { if text == "" {
continue continue
@@ -242,6 +237,9 @@ func ParseGroupFilter(r io.Reader, filter func(Group) bool) ([]Group, error) {
out = append(out, p) out = append(out, p)
} }
} }
if err := s.Err(); err != nil {
return nil, err
}
return out, nil return out, nil
} }
@@ -532,10 +530,6 @@ func ParseSubIDFilter(r io.Reader, filter func(SubID) bool) ([]SubID, error) {
) )
for s.Scan() { for s.Scan() {
if err := s.Err(); err != nil {
return nil, err
}
line := strings.TrimSpace(s.Text()) line := strings.TrimSpace(s.Text())
if line == "" { if line == "" {
continue continue
@@ -549,6 +543,9 @@ func ParseSubIDFilter(r io.Reader, filter func(SubID) bool) ([]SubID, error) {
out = append(out, p) out = append(out, p)
} }
} }
if err := s.Err(); err != nil {
return nil, err
}
return out, nil return out, nil
} }
@@ -586,10 +583,6 @@ func ParseIDMapFilter(r io.Reader, filter func(IDMap) bool) ([]IDMap, error) {
) )
for s.Scan() { for s.Scan() {
if err := s.Err(); err != nil {
return nil, err
}
line := strings.TrimSpace(s.Text()) line := strings.TrimSpace(s.Text())
if line == "" { if line == "" {
continue continue
@@ -603,6 +596,9 @@ func ParseIDMapFilter(r io.Reader, filter func(IDMap) bool) ([]IDMap, error) {
out = append(out, p) out = append(out, p)
} }
} }
if err := s.Err(); err != nil {
return nil, err
}
return out, nil return out, nil
} }