TheArchive/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-08-26 09:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fs: drop unused permission parameter from OpenFile

Browse Source
This commit is contained in:
Michael Eischer
2024-11-02 17:47:54 +01:00
parent b402e8a6fc
commit 623ba92b98
12 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/archiver/archiver.go
View File

@@ -497,7 +497,7 @@ func (arch *Archiver) save(ctx context.Context, snPath, target string, previous
// reopen file and do an fstat() on the open file to check it is still
// a file (and has not been exchanged for e.g. a symlink)
file, err := arch.FS.OpenFile(target, fs.O_RDONLY|fs.O_NOFOLLOW, 0)
file, err := arch.FS.OpenFile(target, fs.O_RDONLY|fs.O_NOFOLLOW)
if err != nil {
debug.Log("Openfile() for %v returned error: %v", target, err)
return filterError(err)

16
internal/archiver/archiver_test.go
View File

@@ -76,7 +76,7 @@ func saveFile(t testing.TB, repo archiverRepo, filename string, filesystem fs.FS
startCallback = true
}
file, err := arch.FS.OpenFile(filename, fs.O_RDONLY|fs.O_NOFOLLOW, 0)
file, err := arch.FS.OpenFile(filename, fs.O_RDONLY|fs.O_NOFOLLOW)
if err != nil {
t.Fatal(err)
}
@@ -1665,8 +1665,8 @@ type MockFS struct {
bytesRead map[string]int // tracks bytes read from all opened files
}
func (m *MockFS) OpenFile(name string, flag int, perm os.FileMode) (fs.File, error) {
f, err := m.FS.OpenFile(name, flag, perm)
func (m *MockFS) OpenFile(name string, flag int) (fs.File, error) {
f, err := m.FS.OpenFile(name, flag)
if err != nil {
return f, err
}
@@ -2056,12 +2056,12 @@ type TrackFS struct {
m sync.Mutex
}
func (m *TrackFS) OpenFile(name string, flag int, perm os.FileMode) (fs.File, error) {
func (m *TrackFS) OpenFile(name string, flag int) (fs.File, error) {
m.m.Lock()
m.opened[name]++
m.m.Unlock()
return m.FS.OpenFile(name, flag, perm)
return m.FS.OpenFile(name, flag)
}
type failSaveRepo struct {
@@ -2228,9 +2228,9 @@ func (fs *StatFS) Lstat(name string) (os.FileInfo, error) {
return fs.FS.Lstat(name)
}
func (fs *StatFS) OpenFile(name string, flags int, perm os.FileMode) (fs.File, error) {
func (fs *StatFS) OpenFile(name string, flags int) (fs.File, error) {
if fi, ok := fs.OverrideLstat[fixpath(name)]; ok {
f, err := fs.FS.OpenFile(name, flags, perm)
f, err := fs.FS.OpenFile(name, flags)
if err != nil {
return nil, err
}
@@ -2242,7 +2242,7 @@ func (fs *StatFS) OpenFile(name string, flags int, perm os.FileMode) (fs.File, e
return wrappedFile, nil
}
return fs.FS.OpenFile(name, flags, perm)
return fs.FS.OpenFile(name, flags)
}
type fileStat struct {

2
internal/archiver/exclude.go
View File

@@ -153,7 +153,7 @@ func isDirExcludedByFile(dir, tagFilename, header string, fs fs.FS, warnf func(m
// From this stage, errors mean tagFilename exists but it is malformed.
// Warnings will be generated so that the user is informed that the
// indented ignore-action is not performed.
f, err := fs.OpenFile(tf, os.O_RDONLY, 0)
f, err := fs.OpenFile(tf, os.O_RDONLY)
if err != nil {
warnf("could not open exclusion tagfile: %v", err)
return false

2
internal/archiver/file_saver_test.go
View File

@@ -72,7 +72,7 @@ func TestFileSaver(t *testing.T) {
var results []futureNode
for _, filename := range files {
f, err := testFs.OpenFile(filename, os.O_RDONLY, 0)
f, err := testFs.OpenFile(filename, os.O_RDONLY)
if err != nil {
t.Fatal(err)
}