diff options
author | Jordan Whited <jordan@tailscale.com> | 2023-03-16 13:27:51 -0700 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2023-03-17 15:18:04 +0100 |
commit | 1417a47c8fa816f427ac56ebe79a90a97a01aef5 (patch) | |
tree | 9530f2932814c081e4f1a17732221f86ca7f7e27 /tun/tun_linux.go | |
parent | 7f511c3bb16dac4b881c4d450b61e6b2efdacc70 (diff) |
tun: replace ErrorBatch() with errors.Join()
Reviewed-by: Maisem Ali <maisem@tailscale.com>
Signed-off-by: Jordan Whited <jordan@tailscale.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'tun/tun_linux.go')
-rw-r--r-- | tun/tun_linux.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tun/tun_linux.go b/tun/tun_linux.go index 7a96d47..12cd49f 100644 --- a/tun/tun_linux.go +++ b/tun/tun_linux.go @@ -338,7 +338,7 @@ func (tun *NativeTun) Write(bufs [][]byte, offset int) (int, error) { tun.writeOpMu.Unlock() }() var ( - errs []error + errs error total int ) tun.toWrite = tun.toWrite[:0] @@ -359,12 +359,12 @@ func (tun *NativeTun) Write(bufs [][]byte, offset int) (int, error) { return total, os.ErrClosed } if err != nil { - errs = append(errs, err) + errs = errors.Join(errs, err) } else { total += n } } - return total, ErrorBatch(errs) + return total, errs } // handleVirtioRead splits in into bufs, leaving offset bytes at the front of |