From 501e8d313cd898bc427402141cc8edd6f56242aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Mon, 6 Mar 2023 10:18:15 +0100 Subject: [PATCH] Fix io.Seek* deprecation errors --- memmap.go | 3 ++- memmap_test.go | 2 +- unionFile.go | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/memmap.go b/memmap.go index 3f4ef42d..e6b7d70b 100644 --- a/memmap.go +++ b/memmap.go @@ -15,6 +15,7 @@ package afero import ( "fmt" + "io" "log" "os" "path/filepath" @@ -237,7 +238,7 @@ func (m *MemMapFs) OpenFile(name string, flag int, perm os.FileMode) (File, erro file = mem.NewReadOnlyFileHandle(file.(*mem.File).Data()) } if flag&os.O_APPEND > 0 { - _, err = file.Seek(0, os.SEEK_END) + _, err = file.Seek(0, io.SeekEnd) if err != nil { file.Close() return nil, err diff --git a/memmap_test.go b/memmap_test.go index ee75672c..52a492e8 100644 --- a/memmap_test.go +++ b/memmap_test.go @@ -226,7 +226,7 @@ func TestMultipleOpenFiles(t *testing.T) { if err != nil { t.Error("fs.OpenFile failed: " + err.Error()) } - _, err = fh2.Seek(0, os.SEEK_END) + _, err = fh2.Seek(0, io.SeekEnd) if err != nil { t.Error(err) } diff --git a/unionFile.go b/unionFile.go index f02e7553..62dd6c93 100644 --- a/unionFile.go +++ b/unionFile.go @@ -47,7 +47,7 @@ func (f *UnionFile) Read(s []byte) (int, error) { if (err == nil || err == io.EOF) && f.Base != nil { // advance the file position also in the base file, the next // call may be a write at this position (or a seek with SEEK_CUR) - if _, seekErr := f.Base.Seek(int64(n), os.SEEK_CUR); seekErr != nil { + if _, seekErr := f.Base.Seek(int64(n), io.SeekCurrent); seekErr != nil { // only overwrite err in case the seek fails: we need to // report an eventual io.EOF to the caller err = seekErr