Merge pull request #1105 from fmarmol/master

Switch usage from os.*File.Readdir to os.*File.ReadDir.
pull/1168/head
shirou 3 years ago committed by GitHub
commit 9bbd81f709
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -545,12 +545,12 @@ func getProcInodes(root string, pid int32, max int) (map[string][]inodeMap, erro
return ret, err return ret, err
} }
defer f.Close() defer f.Close()
files, err := f.Readdir(max) dirEntries, err := f.ReadDir(max)
if err != nil { if err != nil {
return ret, err return ret, err
} }
for _, fd := range files { for _, dirEntry := range dirEntries {
inodePath := fmt.Sprintf("%s/%d/fd/%s", root, pid, fd.Name()) inodePath := fmt.Sprintf("%s/%d/fd/%s", root, pid, dirEntry.Name())
inode, err := os.Readlink(inodePath) inode, err := os.Readlink(inodePath)
if err != nil { if err != nil {
@ -566,7 +566,7 @@ func getProcInodes(root string, pid int32, max int) (map[string][]inodeMap, erro
if !ok { if !ok {
ret[inode] = make([]inodeMap, 0) ret[inode] = make([]inodeMap, 0)
} }
fd, err := strconv.Atoi(fd.Name()) fd, err := strconv.Atoi(dirEntry.Name())
if err != nil { if err != nil {
continue continue
} }

Loading…
Cancel
Save