github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki 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()'

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin 2020-03-11 19:36:21 -07:00
parent c6851ace61
commit 6e638ad27a
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mount/mountinfo_linux.go
View File

@ -45,10 +45,6 @@ func parseInfoFile(r io.Reader) ([]Info, error) {
out := []Info{} out := []Info{}
var err error var err error
for s.Scan() { for s.Scan() {
if err = s.Err(); err != nil {
return nil, err
}
/* /*
See http://man7.org/linux/man-pages/man5/proc.5.html See http://man7.org/linux/man-pages/man5/proc.5.html
@ -128,6 +124,10 @@ func parseInfoFile(r io.Reader) ([]Info, error) {
out = append(out, p) out = append(out, p)
} }
if err = s.Err(); err != nil {
return nil, err
}
return out, nil return out, nil
} }

6
oci/spec_opts.go
View File

@ -1238,11 +1238,11 @@ func WithEnvFile(path string) SpecOpts {
sc := bufio.NewScanner(f) sc := bufio.NewScanner(f)
for sc.Scan() { for sc.Scan() {
if sc.Err() != nil {
return sc.Err()
}
vars = append(vars, sc.Text()) vars = append(vars, sc.Text())
} }
if err = sc.Err(); err != nil {
return err
}
return WithEnv(vars)(nil, nil, nil, s) return WithEnv(vars)(nil, nil, nil, s)
} }
} }

3
runtime/v2/README.md
View File

@ -227,9 +227,6 @@ func copy(wg *sync.WaitGroup, r io.Reader, pri journal.Priority, vars map[string
defer wg.Done() defer wg.Done()
s := bufio.NewScanner(r) s := bufio.NewScanner(r)
for s.Scan() { for s.Scan() {
if s.Err() != nil {
return
}
journal.Send(s.Text(), pri, vars) journal.Send(s.Text(), pri, vars)
} }
} }