From 4f09635583701cee465e56eb52a68064dbefee38 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Thu, 1 Apr 2021 16:17:27 +0700 Subject: [PATCH] fix staticcheck errors --- car.go | 25 +++++++++++-------------- selectivecar.go | 2 +- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/car.go b/car.go index 9f7e6d10..30fdd344 100644 --- a/car.go +++ b/car.go @@ -183,17 +183,16 @@ func loadCarFast(s batchStore, cr *CarReader) (*CarHeader, error) { var buf []blocks.Block for { blk, err := cr.Next() - switch err { - case io.EOF: - if len(buf) > 0 { - if err := s.PutMany(buf); err != nil { - return nil, err + if err != nil { + if err == io.EOF { + if len(buf) > 0 { + if err := s.PutMany(buf); err != nil { + return nil, err + } } + return cr.Header, nil } - return cr.Header, nil - default: return nil, err - case nil: } buf = append(buf, blk) @@ -208,15 +207,13 @@ func loadCarFast(s batchStore, cr *CarReader) (*CarHeader, error) { } func loadCarSlow(s Store, cr *CarReader) (*CarHeader, error) { - for { blk, err := cr.Next() - switch err { - case io.EOF: - return cr.Header, nil - default: + if err != nil { + if err == io.EOF { + return cr.Header, nil + } return nil, err - case nil: } if err := s.Put(blk); err != nil { diff --git a/selectivecar.go b/selectivecar.go index 007da104..15de2d63 100644 --- a/selectivecar.go +++ b/selectivecar.go @@ -212,7 +212,7 @@ func (sct *selectiveCarTraverser) traverseHeader() error { func (sct *selectiveCarTraverser) loader(lnk ipld.Link, ctx ipld.LinkContext) (io.Reader, error) { cl, ok := lnk.(cidlink.Link) if !ok { - return nil, errors.New("Incorrect Link Type") + return nil, errors.New("incorrect link type") } c := cl.Cid blk, err := sct.sc.store.Get(c)