diff --git a/internal/vaultik/blobcache.go b/internal/vaultik/blobcache.go index ac6bb88..50b5565 100644 --- a/internal/vaultik/blobcache.go +++ b/internal/vaultik/blobcache.go @@ -167,7 +167,7 @@ func (c *blobDiskCache) ReadAt(key string, offset, length int64) ([]byte, error) if err != nil { return nil, err } - defer f.Close() + defer func() { _ = f.Close() }() buf := make([]byte, length) if _, err := f.ReadAt(buf, offset); err != nil { diff --git a/internal/vaultik/blobcache_test.go b/internal/vaultik/blobcache_test.go index 2088706..778aadd 100644 --- a/internal/vaultik/blobcache_test.go +++ b/internal/vaultik/blobcache_test.go @@ -12,7 +12,7 @@ func TestBlobDiskCache_BasicGetPut(t *testing.T) { if err != nil { t.Fatal(err) } - defer cache.Close() + defer func() { _ = cache.Close() }() data := []byte("hello world") if err := cache.Put("key1", data); err != nil { @@ -39,7 +39,7 @@ func TestBlobDiskCache_EvictionUnderPressure(t *testing.T) { if err != nil { t.Fatal(err) } - defer cache.Close() + defer func() { _ = cache.Close() }() for i := 0; i < 5; i++ { data := make([]byte, 300) @@ -65,7 +65,7 @@ func TestBlobDiskCache_OversizedEntryRejected(t *testing.T) { if err != nil { t.Fatal(err) } - defer cache.Close() + defer func() { _ = cache.Close() }() data := make([]byte, 200) if err := cache.Put("big", data); err != nil { @@ -82,7 +82,7 @@ func TestBlobDiskCache_UpdateInPlace(t *testing.T) { if err != nil { t.Fatal(err) } - defer cache.Close() + defer func() { _ = cache.Close() }() if err := cache.Put("key1", []byte("v1")); err != nil { t.Fatal(err) @@ -111,7 +111,7 @@ func TestBlobDiskCache_ReadAt(t *testing.T) { if err != nil { t.Fatal(err) } - defer cache.Close() + defer func() { _ = cache.Close() }() data := make([]byte, 1024) if _, err := rand.Read(data); err != nil { @@ -159,7 +159,7 @@ func TestBlobDiskCache_LRUOrder(t *testing.T) { if err != nil { t.Fatal(err) } - defer cache.Close() + defer func() { _ = cache.Close() }() d := make([]byte, 100) if err := cache.Put("a", d); err != nil { diff --git a/internal/vaultik/restore.go b/internal/vaultik/restore.go index acc6f8a..7dd42ff 100644 --- a/internal/vaultik/restore.go +++ b/internal/vaultik/restore.go @@ -113,7 +113,7 @@ func (v *Vaultik) Restore(opts *RestoreOptions) error { if err != nil { return fmt.Errorf("creating blob cache: %w", err) } - defer blobCache.Close() + defer func() { _ = blobCache.Close() }() // Calculate total bytes for progress bar var totalBytes int64 @@ -139,7 +139,7 @@ func (v *Vaultik) Restore(opts *RestoreOptions) error { progressbar.OptionSetWidth(40), progressbar.OptionThrottle(100*time.Millisecond), progressbar.OptionOnCompletion(func() { - fmt.Fprint(v.Stderr, "\n") + _, _ = fmt.Fprint(v.Stderr, "\n") }), progressbar.OptionSetRenderBlankState(true), ) diff --git a/internal/vaultik/snapshot.go b/internal/vaultik/snapshot.go index 0e4fdc1..2960389 100644 --- a/internal/vaultik/snapshot.go +++ b/internal/vaultik/snapshot.go @@ -545,8 +545,6 @@ func (v *Vaultik) PurgeSnapshots(keepLatest bool, olderThan string, force bool) if !force { v.printfStdout("\nDelete %d snapshot(s)? [y/N] ", len(toDelete)) var confirm string - if _, err := v.scanStdin(&confirm); err != nil { - if _, err := v.scanStdin(&confirm); err != nil { if _, err := v.scanStdin(&confirm); err != nil { // Treat EOF or error as "no" v.printlnStdout("Cancelled") @@ -853,8 +851,6 @@ func (v *Vaultik) RemoveSnapshot(snapshotID string, opts *RemoveOptions) (*Remov v.printfStdout("Remove snapshot '%s' from local database? [y/N] ", snapshotID) } var confirm string - if err := v.scanlnStdin(&confirm); err != nil { - if _, err := v.scanStdin(&confirm); err != nil { if _, err := v.scanStdin(&confirm); err != nil { v.printlnStdout("Cancelled") return result, nil