Skip to content

Commit 25a6151

Browse files
authored
Fix errcheck and staticcheck lint errors (#1)
1 parent 93cce6b commit 25a6151

2 files changed

Lines changed: 24 additions & 24 deletions

File tree

archives_test.go

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,10 @@ func createTestZip() []byte {
128128

129129
for _, file := range files {
130130
f, _ := w.Create(file.name)
131-
f.Write([]byte(file.content))
131+
_, _ = f.Write([]byte(file.content))
132132
}
133133

134-
w.Close()
134+
_ = w.Close()
135135
return buf.Bytes()
136136
}
137137

@@ -141,7 +141,7 @@ func TestZipReader(t *testing.T) {
141141
if err != nil {
142142
t.Fatalf("openZip failed: %v", err)
143143
}
144-
defer reader.Close()
144+
defer func() { _ = reader.Close() }()
145145

146146
// Test List
147147
files, err := reader.List()
@@ -166,7 +166,7 @@ func TestZipReader(t *testing.T) {
166166
if err != nil {
167167
t.Fatalf("Extract failed: %v", err)
168168
}
169-
defer rc.Close()
169+
defer func() { _ = rc.Close() }()
170170

171171
content, _ := io.ReadAll(rc)
172172
if string(content) != "# Test Package" {
@@ -202,12 +202,12 @@ func createTestTarGz() []byte {
202202
Mode: 0644,
203203
ModTime: time.Now(),
204204
}
205-
tw.WriteHeader(header)
206-
tw.Write([]byte(file.content))
205+
_ = tw.WriteHeader(header)
206+
_, _ = tw.Write([]byte(file.content))
207207
}
208208

209-
tw.Close()
210-
gw.Close()
209+
_ = tw.Close()
210+
_ = gw.Close()
211211
return buf.Bytes()
212212
}
213213

@@ -217,7 +217,7 @@ func TestTarReader(t *testing.T) {
217217
if err != nil {
218218
t.Fatalf("openTar failed: %v", err)
219219
}
220-
defer reader.Close()
220+
defer func() { _ = reader.Close() }()
221221

222222
// Test List
223223
files, err := reader.List()
@@ -242,7 +242,7 @@ func TestTarReader(t *testing.T) {
242242
if err != nil {
243243
t.Fatalf("Extract failed: %v", err)
244244
}
245-
defer rc.Close()
245+
defer func() { _ = rc.Close() }()
246246

247247
content, _ := io.ReadAll(rc)
248248
if !strings.Contains(string(content), "test") {
@@ -257,15 +257,15 @@ func TestOpen(t *testing.T) {
257257
if err != nil {
258258
t.Fatalf("Open zip failed: %v", err)
259259
}
260-
reader.Close()
260+
_ = reader.Close()
261261

262262
// Test TAR.GZ
263263
tgzData := createTestTarGz()
264264
reader, err = Open("test.tar.gz", bytes.NewReader(tgzData))
265265
if err != nil {
266266
t.Fatalf("Open tar.gz failed: %v", err)
267267
}
268-
reader.Close()
268+
_ = reader.Close()
269269

270270
// Test unsupported format
271271
_, err = Open("test.unknown", bytes.NewReader([]byte("data")))
@@ -280,7 +280,7 @@ func TestZipListDir(t *testing.T) {
280280
if err != nil {
281281
t.Fatalf("openZip failed: %v", err)
282282
}
283-
defer reader.Close()
283+
defer func() { _ = reader.Close() }()
284284

285285
// Test listing src directory
286286
srcFiles, err := reader.ListDir("src")
@@ -329,16 +329,16 @@ func TestOpenWithPrefix(t *testing.T) {
329329

330330
for _, file := range files {
331331
f, _ := w.Create(file.name)
332-
f.Write([]byte(file.content))
332+
_, _ = f.Write([]byte(file.content))
333333
}
334-
w.Close()
334+
_ = w.Close()
335335

336336
// Open with prefix stripping
337337
reader, err := OpenWithPrefix("test.zip", bytes.NewReader(buf.Bytes()), "package/")
338338
if err != nil {
339339
t.Fatalf("OpenWithPrefix failed: %v", err)
340340
}
341-
defer reader.Close()
341+
defer func() { _ = reader.Close() }()
342342

343343
// List files - should not include package/ prefix
344344
files2, err := reader.List()
@@ -374,7 +374,7 @@ func TestOpenWithPrefix(t *testing.T) {
374374
if err != nil {
375375
t.Fatalf("Extract failed: %v", err)
376376
}
377-
defer rc.Close()
377+
defer func() { _ = rc.Close() }()
378378

379379
content, _ := io.ReadAll(rc)
380380
if string(content) != "# Test" {
@@ -399,18 +399,18 @@ func TestGetStripPrefixNpm(t *testing.T) {
399399
Size: int64(len(content)),
400400
Mode: 0644,
401401
}
402-
tw.WriteHeader(header)
403-
tw.Write([]byte(content))
402+
_ = tw.WriteHeader(header)
403+
_, _ = tw.Write([]byte(content))
404404
}
405-
tw.Close()
406-
gw.Close()
405+
_ = tw.Close()
406+
_ = gw.Close()
407407

408408
// Open with npm prefix stripping
409409
reader, err := OpenWithPrefix("test.tgz", bytes.NewReader(buf.Bytes()), "package/")
410410
if err != nil {
411411
t.Fatalf("OpenWithPrefix failed: %v", err)
412412
}
413-
defer reader.Close()
413+
defer func() { _ = reader.Close() }()
414414

415415
// List root - should see package.json and index.js directly
416416
rootFiles, err := reader.ListDir("")

tar.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ type tarFileEntry struct {
2323

2424
func openTar(content io.Reader, compression string) (Reader, error) {
2525
// Wrap with decompressor if needed
26-
var r io.Reader = content
26+
r := io.Reader(content)
2727

2828
switch compression {
2929
case "gzip":
3030
gz, err := gzip.NewReader(content)
3131
if err != nil {
3232
return nil, fmt.Errorf("opening gzip: %w", err)
3333
}
34-
defer gz.Close()
34+
defer func() { _ = gz.Close() }()
3535
r = gz
3636
case "bzip2":
3737
r = bzip2.NewReader(content)

0 commit comments

Comments
 (0)