Skip to content

Commit 32d3d96

Browse files
willscottwillscott
committed
lint
1 parent 1557c7b commit 32d3d96

File tree

10 files changed

+55
-38
lines changed

10 files changed

+55
-38
lines changed

‎conn.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,9 @@ func (w *response) writeHeader(code ResponseCode) error {
237237
// Write a response to an xdr message
238238
func (w *response) Write(dat []byte) error {
239239
if !w.responded {
240-
w.writeHeader(ResponseCodeSuccess)
240+
if err := w.writeHeader(ResponseCodeSuccess); err != nil {
241+
return err
242+
}
241243
}
242244

243245
acc := 0

‎example/helloworld/main.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,12 @@ func main() {
2020

2121
mem := memfs.New()
2222
f, err := mem.Create("hello.txt")
23-
f.Write([]byte("hello world"))
24-
f.Close()
23+
if err != nil {
24+
fmt.Printf("Failed to create file: %v\n", err)
25+
return
26+
}
27+
_, _ = f.Write([]byte("hello world"))
28+
_ = f.Close()
2529

2630
handler := nfshelper.NewNullAuthHandler(mem)
2731
cacheHelper := nfshelper.NewCachingHandler(handler)

‎mount.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ const (
1212
)
1313

1414
func init() {
15-
RegisterMessageHandler(mountServiceID, uint32(MountProcMount), onMount)
16-
RegisterMessageHandler(mountServiceID, uint32(MountProcUmnt), onUMount)
15+
_ = RegisterMessageHandler(mountServiceID, uint32(MountProcMount), onMount)
16+
_ = RegisterMessageHandler(mountServiceID, uint32(MountProcUmnt), onUMount)
1717
}
1818

1919
func onMount(ctx context.Context, w *response, userHandle Handler) error {
@@ -25,7 +25,9 @@ func onMount(ctx context.Context, w *response, userHandle Handler) error {
2525
mountReq := MountRequest{Header: w.req.Header, Dirpath: dirpath}
2626
status, handle, flavors := userHandle.Mount(ctx, w.conn, mountReq)
2727

28-
w.writeHeader(ResponseCodeSuccess)
28+
if err := w.writeHeader(ResponseCodeSuccess); err != nil {
29+
return err
30+
}
2931

3032
writer := bytes.NewBuffer([]byte{})
3133
if err := xdr.Write(writer, uint32(status)); err != nil {
@@ -35,8 +37,8 @@ func onMount(ctx context.Context, w *response, userHandle Handler) error {
3537
rootHndl := userHandle.ToHandle(handle, []string{})
3638

3739
if status == MountStatusOk {
38-
xdr.Write(writer, rootHndl)
39-
xdr.Write(writer, flavors)
40+
_ = xdr.Write(writer, rootHndl)
41+
_ = xdr.Write(writer, flavors)
4042
}
4143
return w.Write(writer.Bytes())
4244
}

‎nfs.go

+22-22
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,28 @@ const (
99
)
1010

1111
func init() {
12-
RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureNull), onNull) // 0
13-
RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureGetAttr), onGetAttr) // 1
14-
RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureSetAttr), onSetAttr) // 2
15-
RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureLookup), onLookup) // 3
16-
RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureAccess), onAccess) // 4
17-
RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureReadlink), onReadLink) // 5
18-
RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureRead), onRead) // 6
19-
RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureWrite), onWrite) // 7
20-
RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureCreate), onCreate) // 8
21-
RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureMkDir), onMkdir) // 9
22-
RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureSymlink), onSymlink) // 10
23-
RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureMkNod), onMknod) // 11
24-
RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureRemove), onRemove) // 12
25-
RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureRmDir), onRmDir) // 13
26-
RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureRename), onRename) // 14
27-
RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureLink), onLink) // 15
28-
RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureReadDir), onReadDir) // 16
29-
RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureReadDirPlus), onReadDirPlus) // 17
30-
RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureFSStat), onFSStat) // 18
31-
RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureFSInfo), onFSInfo) // 19
32-
RegisterMessageHandler(nfsServiceID, uint32(NFSProcedurePathConf), onPathConf) // 20
33-
RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureCommit), onCommit) // 21
12+
_ = RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureNull), onNull) // 0
13+
_ = RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureGetAttr), onGetAttr) // 1
14+
_ = RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureSetAttr), onSetAttr) // 2
15+
_ = RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureLookup), onLookup) // 3
16+
_ = RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureAccess), onAccess) // 4
17+
_ = RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureReadlink), onReadLink) // 5
18+
_ = RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureRead), onRead) // 6
19+
_ = RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureWrite), onWrite) // 7
20+
_ = RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureCreate), onCreate) // 8
21+
_ = RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureMkDir), onMkdir) // 9
22+
_ = RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureSymlink), onSymlink) // 10
23+
_ = RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureMkNod), onMknod) // 11
24+
_ = RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureRemove), onRemove) // 12
25+
_ = RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureRmDir), onRmDir) // 13
26+
_ = RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureRename), onRename) // 14
27+
_ = RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureLink), onLink) // 15
28+
_ = RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureReadDir), onReadDir) // 16
29+
_ = RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureReadDirPlus), onReadDirPlus) // 17
30+
_ = RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureFSStat), onFSStat) // 18
31+
_ = RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureFSInfo), onFSInfo) // 19
32+
_ = RegisterMessageHandler(nfsServiceID, uint32(NFSProcedurePathConf), onPathConf) // 20
33+
_ = RegisterMessageHandler(nfsServiceID, uint32(NFSProcedureCommit), onCommit) // 21
3434
}
3535

3636
func onNull(ctx context.Context, w *response, userHandle Handler) error {

‎nfs_onlookup.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
func lookupSuccessResponse(handle []byte, entPath, dirPath []string, fs billy.Filesystem) []byte {
1212
writer := bytes.NewBuffer([]byte{})
13-
xdr.Write(writer, uint32(NFSStatusOk))
14-
xdr.Write(writer, handle)
13+
_ = xdr.Write(writer, uint32(NFSStatusOk))
14+
_ = xdr.Write(writer, handle)
1515
WritePostOpAttrs(writer, tryStat(fs, entPath))
1616
WritePostOpAttrs(writer, tryStat(fs, dirPath))
1717
return writer.Bytes()

‎nfs_onreaddir.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func onReadDir(ctx context.Context, w *response, userHandle Handler) error {
7070
started = false
7171
entities = entities[0 : len(entities)-1]
7272
}
73-
vHash.Write([]byte(c.Name()))
73+
_, _ = vHash.Write([]byte(c.Name()))
7474
}
7575

7676
verif := vHash.Sum([]byte{})[0:8]

‎nfs_onreaddirplus.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func onReadDirPlus(ctx context.Context, w *response, userHandle Handler) error {
8383
started = false
8484
entities = entities[0 : len(entities)-1]
8585
}
86-
vHash.Write([]byte(c.Name()))
86+
_, _ = vHash.Write([]byte(c.Name()))
8787
}
8888

8989
verif := vHash.Sum([]byte{})[0:8]

‎nfs_onwrite.go

+3
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ func onWrite(ctx context.Context, w *response, userHandle Handler) error {
4646
if len(req.Data) > math.MaxInt32 || req.Count > math.MaxInt32 {
4747
return &NFSStatusError{NFSStatusFBig}
4848
}
49+
if req.How != uint32(unstable) && req.How != uint32(dataSync) && req.How != uint32(fileSync) {
50+
return &NFSStatusError{NFSStatusInval}
51+
}
4952

5053
// stat first for pre-op wcc.
5154
info, err := fs.Stat(fs.Join(path...))

‎nfs_test.go

+7-3
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@ func TestNFS(t *testing.T) {
2121

2222
mem := memfs.New()
2323
// File needs to exist in the root for memfs to acknowledge the root exists.
24-
mem.Create("/test")
24+
_, _ = mem.Create("/test")
2525

2626
handler := helpers.NewNullAuthHandler(mem)
2727
cacheHelper := helpers.NewCachingHandler(handler)
28-
go nfs.Serve(listener, cacheHelper)
28+
go func() {
29+
_ = nfs.Serve(listener, cacheHelper)
30+
}()
2931

3032
c, err := rpc.DialTCP(listener.Addr().Network(), nil, listener.Addr().(*net.TCPAddr).String())
3133
if err != nil {
@@ -39,7 +41,9 @@ func TestNFS(t *testing.T) {
3941
if err != nil {
4042
t.Fatal(err)
4143
}
42-
defer mounter.Unmount()
44+
defer func() {
45+
_ = mounter.Unmount()
46+
}()
4347

4448
_, err = target.FSInfo()
4549
if err != nil {

‎server.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ func (s *Server) Serve(l net.Listener) error {
5151
baseCtx = s.Context
5252
}
5353
if bytes.Equal(s.ID[:], []byte{0, 0, 0, 0, 0, 0, 0, 0}) {
54-
rand.Reader.Read(s.ID[:])
54+
if _, err := rand.Reader.Read(s.ID[:]); err != nil {
55+
return err
56+
}
5557
}
5658

5759
var tempDelay time.Duration

0 commit comments

Comments
 (0)