archive-gh-me/ip2region
1
0
Fork 0
mirror of https://github.com/lionsoul2014/ip2region.git synced 2025-12-08 19:25:22 +00:00
Code Issues Projects Releases Wiki Activity

auto close the handle after buffer loaded

Browse Source
This commit is contained in:
Lion 2022-07-20 16:24:21 +08:00
parent 680624db65
commit c5fad74d95
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
binding/golang/xdb/util.go
View File

@ -76,7 +76,13 @@ func LoadHeaderFromFile(dbFile string) (*Header, error) {
return nil, fmt.Errorf("open xdb file `%s`: %w", dbFile, err) return nil, fmt.Errorf("open xdb file `%s`: %w", dbFile, err)
} }
return LoadHeader(handle) header, err := LoadHeader(handle)
if err != nil {
return nil, err
}
_ = handle.Close()
return header, nil
} }
// LoadHeaderFromBuff wrap the header info from the content buffer // LoadHeaderFromBuff wrap the header info from the content buffer
@ -112,7 +118,13 @@ func LoadVectorIndexFromFile(dbFile string) ([]byte, error) {
return nil, fmt.Errorf("open xdb file `%s`: %w", dbFile, err) return nil, fmt.Errorf("open xdb file `%s`: %w", dbFile, err)
} }
return LoadVectorIndex(handle) vIndex, err := LoadVectorIndex(handle)
if err != nil {
return nil, err
}
_ = handle.Close()
return vIndex, nil
} }
// LoadContent load the whole xdb content from the specified file handle // LoadContent load the whole xdb content from the specified file handle
@ -151,5 +163,11 @@ func LoadContentFromFile(dbFile string) ([]byte, error) {
return nil, fmt.Errorf("open xdb file `%s`: %w", dbFile, err) return nil, fmt.Errorf("open xdb file `%s`: %w", dbFile, err)
} }
return LoadContent(handle) cBuff, err := LoadContent(handle)
if err != nil {
return nil, err
}
_ = handle.Close()
return cBuff, nil
} }