Merge pull request #320 from tychoish/close-files-more-often

close open files
tags/v2.17.02 v2.17.02
shirou 8 years ago committed by GitHub
commit d371ba1293

@ -104,6 +104,7 @@ func Users() ([]UserStat, error) {
if err != nil {
return ret, err
}
defer file.Close()
buf, err := ioutil.ReadAll(file)
if err != nil {

@ -112,6 +112,7 @@ func Users() ([]UserStat, error) {
if err != nil {
return ret, err
}
defer file.Close()
buf, err := ioutil.ReadAll(file)
if err != nil {
@ -180,6 +181,8 @@ func getUsersFromUtmp(utmpfile string) ([]UserStat, error) {
if err != nil {
return ret, err
}
defer file.Close()
buf, err := ioutil.ReadAll(file)
if err != nil {
return ret, err

@ -131,6 +131,7 @@ func Users() ([]UserStat, error) {
if err != nil {
return nil, err
}
defer file.Close()
buf, err := ioutil.ReadAll(file)
if err != nil {

@ -123,6 +123,8 @@ func Users() ([]UserStat, error) {
if err != nil {
return ret, err
}
defer file.Close()
buf, err := ioutil.ReadAll(file)
if err != nil {
return ret, err

@ -33,9 +33,9 @@ func NumProcs() (uint64, error) {
if err != nil {
return 0, err
}
defer f.Close()
list, err := f.Readdir(-1)
defer f.Close()
if err != nil {
return 0, err
}

@ -40,6 +40,8 @@ func getTerminalMap() (map[uint64]string, error) {
return nil, err
}
}
defer ptsd.Close()
if ptsnames == nil {
defer ptsd.Close()
ptsnames, err = ptsd.Readdirnames(-1)

Loading…
Cancel
Save