diff options
author | gVisor bot <gvisor-bot@google.com> | 2020-08-25 16:27:34 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2020-08-25 16:27:34 +0000 |
commit | 1b7a0ea386ca7ae45dc73b27cfb1afc3c27af548 (patch) | |
tree | 06523e557daf0ef090fd3dc7977b605ed7fa25eb /pkg/sentry/arch | |
parent | b4b7accd934e853384bc896b9c7e388162b8ca29 (diff) | |
parent | 46485f9d473b849e3780af8b757244dde3deacf9 (diff) |
Merge release-20200818.0-40-g46485f9d4 (automated)
Diffstat (limited to 'pkg/sentry/arch')
-rw-r--r-- | pkg/sentry/arch/arch_abi_autogen_unsafe.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkg/sentry/arch/arch_abi_autogen_unsafe.go b/pkg/sentry/arch/arch_abi_autogen_unsafe.go index 26572d6a6..5d77cd2d1 100644 --- a/pkg/sentry/arch/arch_abi_autogen_unsafe.go +++ b/pkg/sentry/arch/arch_abi_autogen_unsafe.go @@ -136,12 +136,12 @@ func (s *SignalAct) CopyIn(task marshal.Task, addr usermem.Addr) (int, error) { } // WriteTo implements io.WriterTo.WriteTo. -func (s *SignalAct) WriteTo(w io.Writer) (int64, error) { +func (s *SignalAct) WriteTo(writer io.Writer) (int64, error) { if !s.Mask.Packed() { // Type SignalAct doesn't have a packed layout in memory, fall back to MarshalBytes. buf := make([]byte, s.SizeBytes()) s.MarshalBytes(buf) - length, err := w.Write(buf) + length, err := writer.Write(buf) return int64(length), err } @@ -152,7 +152,7 @@ func (s *SignalAct) WriteTo(w io.Writer) (int64, error) { hdr.Len = s.SizeBytes() hdr.Cap = s.SizeBytes() - length, err := w.Write(buf) + length, err := writer.Write(buf) // Since we bypassed the compiler's escape analysis, indicate that s // must live until the use above. runtime.KeepAlive(s) @@ -245,7 +245,7 @@ func (s *SignalStack) CopyIn(task marshal.Task, addr usermem.Addr) (int, error) } // WriteTo implements io.WriterTo.WriteTo. -func (s *SignalStack) WriteTo(w io.Writer) (int64, error) { +func (s *SignalStack) WriteTo(writer io.Writer) (int64, error) { // Construct a slice backed by dst's underlying memory. var buf []byte hdr := (*reflect.SliceHeader)(unsafe.Pointer(&buf)) @@ -253,7 +253,7 @@ func (s *SignalStack) WriteTo(w io.Writer) (int64, error) { hdr.Len = s.SizeBytes() hdr.Cap = s.SizeBytes() - length, err := w.Write(buf) + length, err := writer.Write(buf) // Since we bypassed the compiler's escape analysis, indicate that s // must live until the use above. runtime.KeepAlive(s) @@ -355,7 +355,7 @@ func (s *SignalInfo) CopyIn(task marshal.Task, addr usermem.Addr) (int, error) { } // WriteTo implements io.WriterTo.WriteTo. -func (s *SignalInfo) WriteTo(w io.Writer) (int64, error) { +func (s *SignalInfo) WriteTo(writer io.Writer) (int64, error) { // Construct a slice backed by dst's underlying memory. var buf []byte hdr := (*reflect.SliceHeader)(unsafe.Pointer(&buf)) @@ -363,7 +363,7 @@ func (s *SignalInfo) WriteTo(w io.Writer) (int64, error) { hdr.Len = s.SizeBytes() hdr.Cap = s.SizeBytes() - length, err := w.Write(buf) + length, err := writer.Write(buf) // Since we bypassed the compiler's escape analysis, indicate that s // must live until the use above. runtime.KeepAlive(s) |