KurlesHS/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

Merge pull request #1157 from ceh/defer-file-close-after-err-check

Browse source 
internal: check error before deferring file Close()
This commit is contained in:
Alexander Neumann 2017-08-13 19:50:05 +02:00
commit d87b2f189d
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/archiver/archiver.go
View file

@ -210,10 +210,10 @@ func updateNodeContent(node *restic.Node, results []saveResult) error {
// Save for each chunk. // Save for each chunk.
func (arch *Archiver) SaveFile(ctx context.Context, p *restic.Progress, node *restic.Node) (*restic.Node, error) { func (arch *Archiver) SaveFile(ctx context.Context, p *restic.Progress, node *restic.Node) (*restic.Node, error) {
file, err := fs.Open(node.Path) file, err := fs.Open(node.Path)
defer file.Close()
if err != nil { if err != nil {
return node, errors.Wrap(err, "Open") return node, errors.Wrap(err, "Open")
} }
defer file.Close()
debug.RunHook("archiver.SaveFile", node.Path) debug.RunHook("archiver.SaveFile", node.Path)

3
internal/restic/node.go
View file

@ -243,11 +243,10 @@ func (node Node) createFileAt(ctx context.Context, path string, repo Repository,
} }
f, err := fs.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0600) f, err := fs.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0600)
defer f.Close()
if err != nil { if err != nil {
return errors.Wrap(err, "OpenFile") return errors.Wrap(err, "OpenFile")
} }
defer f.Close()
var buf []byte var buf []byte
for _, id := range node.Content { for _, id := range node.Content {

2
internal/test/helpers.go
View file

@ -94,8 +94,8 @@ func Random(seed, count int) []byte {
// SetupTarTestFixture extracts the tarFile to outputDir. // SetupTarTestFixture extracts the tarFile to outputDir.
func SetupTarTestFixture(t testing.TB, outputDir, tarFile string) { func SetupTarTestFixture(t testing.TB, outputDir, tarFile string) {
input, err := os.Open(tarFile) input, err := os.Open(tarFile)
defer input.Close()
OK(t, err) OK(t, err)
defer input.Close()
var rd io.Reader var rd io.Reader
switch filepath.Ext(tarFile) { switch filepath.Ext(tarFile) {