Skip to content

Commit 97796a7

Browse files
committed
Minor.
1 parent cc1d104 commit 97796a7

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

keystore/atomicfile/write.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func WriteFile(filename string, r io.Reader, mode os.FileMode) (err error) {
2020

2121
f, err := os.CreateTemp(dir, file)
2222
if err != nil {
23-
return fmt.Errorf("cannot create temp file: %v", err)
23+
return fmt.Errorf("cannot create temp file: %w", err)
2424
}
2525
defer func() {
2626
if err != nil {
@@ -32,23 +32,23 @@ func WriteFile(filename string, r io.Reader, mode os.FileMode) (err error) {
3232
// it returns an error for repeating close operations.
3333
defer f.Close() //nolint:errcheck
3434
name := f.Name()
35-
if _, err := io.Copy(f, r); err != nil {
36-
return fmt.Errorf("cannot write data to tempfile %q: %v", name, err)
35+
if _, err = io.Copy(f, r); err != nil {
36+
return fmt.Errorf("cannot write data to tempfile %q: %w", name, err)
3737
}
3838
// fsync is important, otherwise os.Rename could rename a zero-length file
39-
if err := f.Sync(); err != nil {
40-
return fmt.Errorf("can't flush tempfile %q: %v", name, err)
39+
if err = f.Sync(); err != nil {
40+
return fmt.Errorf("can't flush tempfile %q: %w", name, err)
4141
}
42-
if err := f.Close(); err != nil {
43-
return fmt.Errorf("can't close tempfile %q: %v", name, err)
42+
if err = f.Close(); err != nil {
43+
return fmt.Errorf("can't close tempfile %q: %w", name, err)
4444
}
4545

4646
// get the file mode from the original file and use that for the replacement file, too.
4747
destInfo, err := os.Stat(filename)
4848
if os.IsNotExist(err) {
4949
// no original file
50-
if err := os.Chmod(name, mode); err != nil {
51-
return fmt.Errorf("can't set filemode on tempfile %q: %v", name, err)
50+
if err = os.Chmod(name, mode); err != nil {
51+
return fmt.Errorf("can't set filemode on tempfile %q: %w", name, err)
5252
}
5353
} else if err != nil {
5454
return err
@@ -59,13 +59,13 @@ func WriteFile(filename string, r io.Reader, mode os.FileMode) (err error) {
5959
}
6060

6161
if sourceInfo.Mode() != destInfo.Mode() {
62-
if err := os.Chmod(name, destInfo.Mode()); err != nil {
63-
return fmt.Errorf("can't set filemode on tempfile %q: %v", name, err)
62+
if err = os.Chmod(name, destInfo.Mode()); err != nil {
63+
return fmt.Errorf("can't set filemode on tempfile %q: %w", name, err)
6464
}
6565
}
6666
}
6767
if err := os.Rename(name, filename); err != nil {
68-
return fmt.Errorf("cannot replace %q with tempfile %q: %v", filename, name, err)
68+
return fmt.Errorf("cannot replace %q with tempfile %q: %w", filename, name, err)
6969
}
7070
return nil
7171
}

0 commit comments

Comments
 (0)