Implement go vet recommendations

diff --git a/reader_test.go b/reader_test.go
index 1cb0c4fdf8a0746255229473dfdb7fce2b0e4b5b..86021dd60ae8c6bfff8af2a93c04ec7d49014483 100644 (file)
--- a/reader_test.go
+++ b/reader_test.go
@@ -17,7 +17,8 @@ func TestReaderReadContext(t *testing.T) {
        tt, err := cl.AddTorrent(testutil.GreetingMetaInfo())
        require.NoError(t, err)
        defer tt.Drop()
-       ctx, _ := context.WithDeadline(context.Background(), time.Now().Add(time.Millisecond))
+       ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(time.Millisecond))
+       defer cancel()
        r := tt.Files()[0].NewReader()
        defer r.Close()
        _, err = r.ReadContext(ctx, make([]byte, 1))

diff --git a/storage/mmap.go b/storage/mmap.go
index d859c2e54ebd99d3cd64a1bab609e254489bd44f..8bce4dc778827acea4096c57ff5dc37e479d1750 100644 (file)
--- a/storage/mmap.go
+++ b/storage/mmap.go
@@ -46,7 +46,7 @@ func (s *mmapClientImpl) Close() error {
 
 type mmapTorrentStorage struct {
        infoHash metainfo.Hash
-       span     mmap_span.MMapSpan
+       span     *mmap_span.MMapSpan
        pc       PieceCompletion
 }
 
@@ -55,8 +55,8 @@ func (ts *mmapTorrentStorage) Piece(p metainfo.Piece) PieceImpl {
                pc:       ts.pc,
                p:        p,
                ih:       ts.infoHash,
-               ReaderAt: io.NewSectionReader(&ts.span, p.Offset(), p.Length()),
-               WriterAt: missinggo.NewSectionWriter(&ts.span, p.Offset(), p.Length()),
+               ReaderAt: io.NewSectionReader(ts.span, p.Offset(), p.Length()),
+               WriterAt: missinggo.NewSectionWriter(ts.span, p.Offset(), p.Length()),
        }
 }
 
@@ -92,7 +92,8 @@ func (sp mmapStoragePiece) MarkNotComplete() error {
        return nil
 }
 
-func mMapTorrent(md *metainfo.Info, location string) (mms mmap_span.MMapSpan, err error) {
+func mMapTorrent(md *metainfo.Info, location string) (mms *mmap_span.MMapSpan, err error) {
+       mms = &mmap_span.MMapSpan{}
        defer func() {
                if err != nil {
                        mms.Close()