Defer closing files when reading saved wallet.

This commit is contained in:
Josh Rickmar 2013-09-03 17:05:22 -04:00
parent 3d6ad329d0
commit 42274b143f

3
cmd.go
View file

@ -136,6 +136,7 @@ func OpenWallet(cfg *config, account string) (*BtcWallet, error) {
return nil, err return nil, err
} }
} }
defer wfile.Close()
if txfile, err = os.Open(txfilepath); err != nil { if txfile, err = os.Open(txfilepath); err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
if txfile, err = os.Create(txfilepath); err != nil { if txfile, err = os.Create(txfilepath); err != nil {
@ -145,6 +146,7 @@ func OpenWallet(cfg *config, account string) (*BtcWallet, error) {
return nil, err return nil, err
} }
} }
defer txfile.Close()
if utxofile, err = os.Open(utxofilepath); err != nil { if utxofile, err = os.Open(utxofilepath); err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
if utxofile, err = os.Create(utxofilepath); err != nil { if utxofile, err = os.Create(utxofilepath); err != nil {
@ -154,6 +156,7 @@ func OpenWallet(cfg *config, account string) (*BtcWallet, error) {
return nil, err return nil, err
} }
} }
defer utxofile.Close()
wlt := new(wallet.Wallet) wlt := new(wallet.Wallet)
if _, err = wlt.ReadFrom(wfile); err != nil { if _, err = wlt.ReadFrom(wfile); err != nil {