diff options
| author | Jakob Unterwurzacher | 2016-09-25 19:01:50 +0200 |
|---|---|---|
| committer | Jakob Unterwurzacher | 2016-09-25 19:02:12 +0200 |
| commit | 166ba74a053898a52ff2e48125c1df97f35a85fd (patch) | |
| tree | 291dc1be32c88aa9fa4784085afff5c349cc939a /internal | |
| parent | c7b3150afc26a6992c6059002c84b1afc236f663 (diff) | |
tests: enable all go vet checks
...and fix reported errors:
internal/fusefrontend_reverse/rfile.go:40: github.com/rfjakob/gocryptfs/internal/contentenc.FileHeader composite literal uses unkeyed fields
internal/fusefrontend_reverse/rfs.go:249: github.com/hanwen/go-fuse/fuse.DirEntry composite literal uses unkeyed fields
internal/fusefrontend_reverse/rfs.go:264: github.com/hanwen/go-fuse/fuse.DirEntry composite literal uses unkeyed fields
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/fusefrontend_reverse/rfile.go | 6 | ||||
| -rw-r--r-- | internal/fusefrontend_reverse/rfs.go | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/internal/fusefrontend_reverse/rfile.go b/internal/fusefrontend_reverse/rfile.go index 4e9b5ba..8c5e5f3 100644 --- a/internal/fusefrontend_reverse/rfile.go +++ b/internal/fusefrontend_reverse/rfile.go @@ -34,10 +34,14 @@ func (rfs *reverseFS) NewFile(relPath string, flags uint32) (nodefs.File, fuse.S return nil, fuse.ToStatus(err) } id := derivePathIV(relPath) + header := contentenc.FileHeader{ + Version: contentenc.CurrentVersion, + Id: id, + } return &reverseFile{ File: nodefs.NewDefaultFile(), fd: fd, - header: contentenc.FileHeader{contentenc.CurrentVersion, id}, + header: header, contentEnc: rfs.contentEnc, }, fuse.OK } diff --git a/internal/fusefrontend_reverse/rfs.go b/internal/fusefrontend_reverse/rfs.go index 06ca07e..8411461 100644 --- a/internal/fusefrontend_reverse/rfs.go +++ b/internal/fusefrontend_reverse/rfs.go @@ -246,7 +246,10 @@ func (rfs *reverseFS) OpenDir(cipherPath string, context *fuse.Context) ([]fuse. // plus one for gocryptfs.diriv. virtualFiles := make([]fuse.DirEntry, len(entries)+1) // Virtual gocryptfs.diriv file - virtualFiles[0] = fuse.DirEntry{syscall.S_IFREG | 0400, nametransform.DirIVFilename} + virtualFiles[0] = fuse.DirEntry{ + Mode: syscall.S_IFREG | 0400, + Name: nametransform.DirIVFilename, + } // Actually used entries nVirtual := 1 @@ -261,7 +264,10 @@ func (rfs *reverseFS) OpenDir(cipherPath string, context *fuse.Context) ([]fuse. cName = rfs.nameTransform.EncryptName(entries[i].Name, dirIV) if len(cName) > syscall.NAME_MAX { cName = nametransform.HashLongName(cName) - dotNameFile := fuse.DirEntry{syscall.S_IFREG | 0600, cName + nametransform.LongNameSuffix} + dotNameFile := fuse.DirEntry{ + Mode: syscall.S_IFREG | 0600, + Name: cName + nametransform.LongNameSuffix, + } virtualFiles[nVirtual] = dotNameFile nVirtual++ } |