From 218294f11ee4d988112263e1f2660acf443afdd9 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Wed, 7 Sep 2022 17:23:03 +0200 Subject: [PATCH] internal/syscall/windows: use unsafe.Slice instead of unsafeheader package Follow CL 428777. Change-Id: I5ce49322e92c5d6539bb08248e3366187c30dcd8 Reviewed-on: https://go-review.googlesource.com/c/go/+/428780 Run-TryBot: Tobias Klauser Reviewed-by: Bryan Mills TryBot-Result: Gopher Robot Reviewed-by: Ian Lance Taylor Auto-Submit: Tobias Klauser --- src/internal/syscall/windows/syscall_windows.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/internal/syscall/windows/syscall_windows.go b/src/internal/syscall/windows/syscall_windows.go index de7cda2094..39ff25fcb7 100644 --- a/src/internal/syscall/windows/syscall_windows.go +++ b/src/internal/syscall/windows/syscall_windows.go @@ -5,7 +5,6 @@ package windows import ( - "internal/unsafeheader" "sync" "syscall" "unicode/utf16" @@ -26,11 +25,7 @@ func UTF16PtrToString(p *uint16) string { n++ } // Turn *uint16 into []uint16. - var s []uint16 - hdr := (*unsafeheader.Slice)(unsafe.Pointer(&s)) - hdr.Data = unsafe.Pointer(p) - hdr.Cap = n - hdr.Len = n + s := unsafe.Slice((*uint16)(unsafe.Pointer(p)), n) // Decode []uint16 into string. return string(utf16.Decode(s)) } -- 2.50.0