Merge pull request #1215 from Lomanic/issue1198

[net][linux] Fix #1198 "f.ReadDir undefined" on Go 1.15 by redefining a custom readDir according to go version
pull/1221/head
shirou 3 years ago committed by GitHub
commit c56b5223c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -549,7 +549,7 @@ func getProcInodes(root string, pid int32, max int) (map[string][]inodeMap, erro
return ret, err return ret, err
} }
defer f.Close() defer f.Close()
dirEntries, err := f.ReadDir(max) dirEntries, err := readDir(f, max)
if err != nil { if err != nil {
return ret, err return ret, err
} }

@ -0,0 +1,12 @@
//go:build !go1.16
// +build !go1.16
package net
import (
"os"
)
func readDir(f *os.File, max int) ([]os.FileInfo, error) {
return f.Readdir(max)
}

@ -0,0 +1,12 @@
//go:build go1.16
// +build go1.16
package net
import (
"os"
)
func readDir(f *os.File, max int) ([]os.DirEntry, error) {
return f.ReadDir(max)
}
Loading…
Cancel
Save