Skip to content

Commit 1208bd0

Browse files
authored
fix(fs): nil interface not equal to nil (#971)
https://go.dev/doc/faq#nil_error
1 parent 6b096bc commit 1208bd0

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

internal/op/archive.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ func DriverExtract(ctx context.Context, storage driver.Driver, path string, args
371371
return link.Link, link.Obj, nil
372372
}
373373

374-
var forget utils.CloseFunc
374+
var forget any
375375
fn := func() (*extractLink, error) {
376376
link, err := driverExtract(ctx, storage, path, args)
377377
if err != nil {
@@ -380,7 +380,7 @@ func DriverExtract(ctx context.Context, storage driver.Driver, path string, args
380380
if link.Link.Expiration != nil {
381381
extractCache.Set(key, link, cache.WithEx[*extractLink](*link.Link.Expiration))
382382
}
383-
link.Add(forget)
383+
link.AddIfCloser(forget)
384384
return link, nil
385385
}
386386

@@ -392,13 +392,13 @@ func DriverExtract(ctx context.Context, storage driver.Driver, path string, args
392392
return link.Link, link.Obj, nil
393393
}
394394

395-
forget = func() error {
395+
forget = utils.CloseFunc(func() error {
396396
if forget != nil {
397397
forget = nil
398398
linkG.Forget(key)
399399
}
400400
return nil
401-
}
401+
})
402402
link, err, _ := extractG.Do(key, fn)
403403
if err == nil && !link.AcquireReference() {
404404
link, err, _ = extractG.Do(key, fn)

internal/op/fs.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ func Link(ctx context.Context, storage driver.Driver, path string, args model.Li
291291
return link, file, nil
292292
}
293293

294-
var forget utils.CloseFunc
294+
var forget any
295295
fn := func() (*model.Link, error) {
296296
link, err := storage.Link(ctx, file, args)
297297
if err != nil {
@@ -300,7 +300,7 @@ func Link(ctx context.Context, storage driver.Driver, path string, args model.Li
300300
if link.Expiration != nil {
301301
linkCache.Set(key, link, cache.WithEx[*model.Link](*link.Expiration))
302302
}
303-
link.Add(forget)
303+
link.AddIfCloser(forget)
304304
return link, nil
305305
}
306306

@@ -312,13 +312,13 @@ func Link(ctx context.Context, storage driver.Driver, path string, args model.Li
312312
return link, file, err
313313
}
314314

315-
forget = func() error {
315+
forget = utils.CloseFunc(func() error {
316316
if forget != nil {
317317
forget = nil
318318
linkG.Forget(key)
319319
}
320320
return nil
321-
}
321+
})
322322
link, err, _ := linkG.Do(key, fn)
323323
if err == nil && !link.AcquireReference() {
324324
link, err, _ = linkG.Do(key, fn)

0 commit comments

Comments
 (0)