From bbc178ccc4caff764d49f5b079cacf253c744b72 Mon Sep 17 00:00:00 2001 From: Emil Hessman Date: Sun, 14 Jan 2018 14:25:04 +0000 Subject: [PATCH] lib/fs: harmonize CreateSymlink definitions (fixes #4567) GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4632 LGTM: imsodin, AudriusButkevicius --- lib/fs/basicfs_windows.go | 2 +- lib/fs/errorfs.go | 2 +- lib/fs/filesystem.go | 2 +- lib/fs/logfs.go | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/fs/basicfs_windows.go b/lib/fs/basicfs_windows.go index e660931d..c4b56de0 100644 --- a/lib/fs/basicfs_windows.go +++ b/lib/fs/basicfs_windows.go @@ -28,7 +28,7 @@ func (BasicFilesystem) ReadSymlink(path string) (string, error) { return "", errNotSupported } -func (BasicFilesystem) CreateSymlink(path, target string) error { +func (BasicFilesystem) CreateSymlink(target, name string) error { return errNotSupported } diff --git a/lib/fs/errorfs.go b/lib/fs/errorfs.go index 035e6a4f..7dd14be9 100644 --- a/lib/fs/errorfs.go +++ b/lib/fs/errorfs.go @@ -20,7 +20,7 @@ type errorFilesystem struct { func (fs *errorFilesystem) Chmod(name string, mode FileMode) error { return fs.err } func (fs *errorFilesystem) Chtimes(name string, atime time.Time, mtime time.Time) error { return fs.err } func (fs *errorFilesystem) Create(name string) (File, error) { return nil, fs.err } -func (fs *errorFilesystem) CreateSymlink(name, target string) error { return fs.err } +func (fs *errorFilesystem) CreateSymlink(target, name string) error { return fs.err } func (fs *errorFilesystem) DirNames(name string) ([]string, error) { return nil, fs.err } func (fs *errorFilesystem) Lstat(name string) (FileInfo, error) { return nil, fs.err } func (fs *errorFilesystem) Mkdir(name string, perm FileMode) error { return fs.err } diff --git a/lib/fs/filesystem.go b/lib/fs/filesystem.go index 15ba5add..de0db356 100644 --- a/lib/fs/filesystem.go +++ b/lib/fs/filesystem.go @@ -21,7 +21,7 @@ type Filesystem interface { Chmod(name string, mode FileMode) error Chtimes(name string, atime time.Time, mtime time.Time) error Create(name string) (File, error) - CreateSymlink(name, target string) error + CreateSymlink(target, name string) error DirNames(name string) ([]string, error) Lstat(name string) (FileInfo, error) Mkdir(name string, perm FileMode) error diff --git a/lib/fs/logfs.go b/lib/fs/logfs.go index b7ce67ec..f74b3a57 100644 --- a/lib/fs/logfs.go +++ b/lib/fs/logfs.go @@ -44,9 +44,9 @@ func (fs *logFilesystem) Create(name string) (File, error) { return file, err } -func (fs *logFilesystem) CreateSymlink(name, target string) error { - err := fs.Filesystem.CreateSymlink(name, target) - l.Debugln(getCaller(), fs.Type(), fs.URI(), "CreateSymlink", name, target, err) +func (fs *logFilesystem) CreateSymlink(target, name string) error { + err := fs.Filesystem.CreateSymlink(target, name) + l.Debugln(getCaller(), fs.Type(), fs.URI(), "CreateSymlink", target, name, err) return err }