Skip to content

Commit 69763d6

Browse files
xaionaro@dx.centerxaionaro@dx.center
authored andcommitted
refactor: use ObjectFromUintptr/VMFromUintptr in all examples
Replace unsafe.Pointer(activity.clazz) and unsafe.Pointer(activity.vm) with the new uintptr-based constructors across all 55 examples. Fixes go vet "possible misuse of unsafe.Pointer" warnings caused by CGo mapping jobject to uintptr.
1 parent 1123565 commit 69763d6

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

object_ref.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ func ObjectFromRef(ref capi.Object) *Object {
1818
}
1919

2020
// ObjectFromPtr wraps a raw C jobject pointer in an Object, mirroring
21-
// VMFromPtr. Use this from NativeActivity callbacks to avoid importing
22-
// the capi package:
21+
// VMFromPtr. Prefer ObjectFromUintptr for NativeActivity callbacks to
22+
// avoid go vet "possible misuse of unsafe.Pointer" warnings:
2323
//
24-
// jni.ObjectFromPtr(unsafe.Pointer(activity.clazz))
24+
// jni.ObjectFromUintptr(uintptr(activity.clazz))
2525
func ObjectFromPtr(ptr unsafe.Pointer) *Object {
2626
return &Object{ref: capi.Object(uintptr(ptr))}
2727
}

tools/transform_examples.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,16 +287,16 @@ static void _onResume(ANativeActivity* a) { goOnResume(a); }\
287287
print "//export ANativeActivity_onCreate"
288288
print "func ANativeActivity_onCreate(activity *C.ANativeActivity, savedState unsafe.Pointer, savedStateSize C.size_t) {"
289289
print "\tui.OnCreate("
290-
print "\t\tjni.VMFromPtr(unsafe.Pointer(activity.vm)),"
291-
print "\t\tjni.ObjectFromRef(capi.Object(uintptr(unsafe.Pointer(activity.clazz)))),"
290+
print "\t\tjni.VMFromUintptr(uintptr(activity.vm)),"
291+
print "\t\tjni.ObjectFromUintptr(uintptr(activity.clazz)),"
292292
print "\t)"
293293
print "\tactivity.callbacks.onResume = C._onResume"
294294
print "}"
295295
print ""
296296
print "//export goOnResume"
297297
print "func goOnResume(activity *C.ANativeActivity) {"
298298
print "\tui.OnResume("
299-
print "\t\tjni.ObjectFromRef(capi.Object(uintptr(unsafe.Pointer(activity.clazz)))),"
299+
print "\t\tjni.ObjectFromUintptr(uintptr(activity.clazz)),"
300300
print "\t)"
301301
print "}"
302302
}

0 commit comments

Comments
 (0)