mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-25 03:08:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

glfw: Take a byte pointer instead of a uintptr at the callback

Browse Source 
Make 'go vet' happy on Windows.
This commit is contained in:
Hajime Hoshi 2019-06-27 22:47:00 +09:00
parent 9a0cefedce
commit 51951d6087
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/glfw/load_windows.go
View File

@ -91,15 +91,14 @@ func (d *dll) unload() error {
return nil return nil
} }
func uintptrToString(ptr uintptr) string { func bytePtrToString(ptr *byte) string {
var bs []byte var bs []byte
for { for i := uintptr(0); ; i++ {
b := *(*byte)(unsafe.Pointer(ptr)) b := *(*byte)(unsafe.Pointer(uintptr(unsafe.Pointer(ptr)) + i))
if b == 0 { if b == 0 {
break break
} }
bs = append(bs, b) bs = append(bs, b)
ptr++
} }
return string(bs) return string(bs)
} }
@ -154,11 +153,11 @@ func acceptError(codes ...ErrorCode) error {
return err return err
} }
func goGLFWErrorCallback(code uintptr, desc uintptr) uintptr { func goGLFWErrorCallback(code uintptr, desc *byte) uintptr {
flushErrors() flushErrors()
err := &glfwError{ err := &glfwError{
code: ErrorCode(code), code: ErrorCode(code),
desc: uintptrToString(desc), desc: bytePtrToString(desc),
} }
select { select {
case lastErr <- err: case lastErr <- err: