internal/unsafe: fix vet warnings about SliceHeader use

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2020-12-10 18:33:02 +01:00
parent 679bf092cb
commit 2dce8a0155
+11 -11
View File
@@ -12,11 +12,12 @@ func BytesView(s interface{}) []byte {
v := reflect.ValueOf(s) v := reflect.ValueOf(s)
first := v.Index(0) first := v.Index(0)
sz := int(first.Type().Size()) sz := int(first.Type().Size())
return *(*[]byte)(unsafe.Pointer(&reflect.SliceHeader{ var res []byte
Data: uintptr(unsafe.Pointer((*reflect.SliceHeader)(unsafe.Pointer(first.UnsafeAddr())))), h := (*reflect.SliceHeader)(unsafe.Pointer(&res))
Len: v.Len() * sz, h.Data = first.UnsafeAddr()
Cap: v.Cap() * sz, h.Cap = v.Cap() * sz
})) h.Len = v.Len() * sz
return res
} }
// SliceOf returns a slice from a (native) pointer. // SliceOf returns a slice from a (native) pointer.
@@ -24,12 +25,11 @@ func SliceOf(s uintptr) []byte {
if s == 0 { if s == 0 {
return nil return nil
} }
sh := reflect.SliceHeader{ var res []byte
Data: s, h := (*reflect.SliceHeader)(unsafe.Pointer(&res))
Len: 1 << 30, h.Data = s
Cap: 1 << 30, h.Cap = 1 << 30
} return res
return *(*[]byte)(unsafe.Pointer(&sh))
} }
// GoString convert a NUL-terminated C string // GoString convert a NUL-terminated C string