aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2024-04-02 00:10:47 +0200
committerGopher Robot <gobot@golang.org>2024-04-02 15:01:40 +0000
commite3ec1ca17e339e21ca50fbdb375b4294783bc385 (patch)
tree939d0724ec4341444f9cb999dbfb7c0906fd99ee /src
parent88b1d6115a9d984780391f11523364dbd509ae14 (diff)
downloadgo-e3ec1ca17e339e21ca50fbdb375b4294783bc385.tar.xz
os: define wrapSyscallError only on linux
wrapSyscallError by now is only used on linux in the methods defined in os/zero_copy_linux.go. Move the definition there. Change-Id: I0ca5749adaac44e8d095b8452458b647f595d3c8 Reviewed-on: https://go-review.googlesource.com/c/go/+/575595 Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Ian Lance Taylor <iant@google.com> Auto-Submit: Tobias Klauser <tobias.klauser@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/os/error_posix.go18
-rw-r--r--src/os/zero_copy_linux.go9
2 files changed, 9 insertions, 18 deletions
diff --git a/src/os/error_posix.go b/src/os/error_posix.go
deleted file mode 100644
index b159c036c1..0000000000
--- a/src/os/error_posix.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build unix || (js && wasm) || wasip1 || windows
-
-package os
-
-import "syscall"
-
-// wrapSyscallError takes an error and a syscall name. If the error is
-// a syscall.Errno, it wraps it in an os.SyscallError using the syscall name.
-func wrapSyscallError(name string, err error) error {
- if _, ok := err.(syscall.Errno); ok {
- err = NewSyscallError(name, err)
- }
- return err
-}
diff --git a/src/os/zero_copy_linux.go b/src/os/zero_copy_linux.go
index 7c45aefeee..d9cf18c22f 100644
--- a/src/os/zero_copy_linux.go
+++ b/src/os/zero_copy_linux.go
@@ -16,6 +16,15 @@ var (
pollSendFile = poll.SendFile
)
+// wrapSyscallError takes an error and a syscall name. If the error is
+// a syscall.Errno, it wraps it in an os.SyscallError using the syscall name.
+func wrapSyscallError(name string, err error) error {
+ if _, ok := err.(syscall.Errno); ok {
+ err = NewSyscallError(name, err)
+ }
+ return err
+}
+
func (f *File) writeTo(w io.Writer) (written int64, handled bool, err error) {
pfd, network := getPollFDAndNetwork(w)
// TODO(panjf2000): same as File.spliceToFile.