Skip to content

Commit 7774e0e

Browse files
xaionaro@dx.centerxaionaro@dx.center
xaionaro@dx.center
authored and
xaionaro@dx.center
committed
fix(examples): eliminate go vet unsafe.Pointer warnings
Add C helper functions _getVM/_getClazz that return uintptr_t, avoiding the C-pointer-to-unsafe.Pointer conversion that go vet flags as "possible misuse of unsafe.Pointer". Use VMFromUintptr/ObjectFromUintptr instead of VMFromPtr/ObjectFromPtr. Affects all 55+ example binaries.
1 parent 7673924 commit 7774e0e

55 files changed

Lines changed: 274 additions & 164 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎examples/accounts/main.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ static void _onResume(ANativeActivity* a) { goOnResume(a); }
1111
extern void goOnNativeWindowCreated(ANativeActivity*, ANativeWindow*);
1212
static void _onWindowCreated(ANativeActivity* a, ANativeWindow* w) { goOnNativeWindowCreated(a, w); }
1313
static void _setCallbacks(ANativeActivity* a) { a->callbacks->onResume = _onResume; a->callbacks->onNativeWindowCreated = _onWindowCreated; }
14+
static uintptr_t _getVM(ANativeActivity* a) { return (uintptr_t)a->vm; }
15+
static uintptr_t _getClazz(ANativeActivity* a) { return (uintptr_t)a->clazz; }
1416
*/
1517
import "C"
1618
import (
@@ -30,16 +32,16 @@ func init() { ui.Register(run) }
3032
//export ANativeActivity_onCreate
3133
func ANativeActivity_onCreate(activity *C.ANativeActivity, savedState unsafe.Pointer, savedStateSize C.size_t) {
3234
ui.OnCreate(
33-
jni.VMFromPtr(unsafe.Pointer(activity.vm)),
34-
jni.ObjectFromPtr(unsafe.Pointer(activity.clazz)),
35+
jni.VMFromUintptr(uintptr(C._getVM(activity))),
36+
jni.ObjectFromUintptr(uintptr(C._getClazz(activity))),
3537
)
3638
C._setCallbacks(activity)
3739
}
3840

3941
//export goOnResume
4042
func goOnResume(activity *C.ANativeActivity) {
4143
ui.OnResume(
42-
jni.ObjectFromPtr(unsafe.Pointer(activity.clazz)),
44+
jni.ObjectFromUintptr(uintptr(C._getClazz(activity))),
4345
)
4446
}
4547

‎examples/alarm/main.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ static void _onResume(ANativeActivity* a) { goOnResume(a); }
1212
extern void goOnNativeWindowCreated(ANativeActivity*, ANativeWindow*);
1313
static void _onWindowCreated(ANativeActivity* a, ANativeWindow* w) { goOnNativeWindowCreated(a, w); }
1414
static void _setCallbacks(ANativeActivity* a) { a->callbacks->onResume = _onResume; a->callbacks->onNativeWindowCreated = _onWindowCreated; }
15+
static uintptr_t _getVM(ANativeActivity* a) { return (uintptr_t)a->vm; }
16+
static uintptr_t _getClazz(ANativeActivity* a) { return (uintptr_t)a->clazz; }
1517
*/
1618
import "C"
1719
import (
@@ -50,16 +52,16 @@ func init() { ui.Register(run) }
5052
func ANativeActivity_onCreate(activity *C.ANativeActivity, savedState unsafe.Pointer, savedStateSize C.size_t) {
5153
println("ANativeActivity_onCreate called")
5254
ui.OnCreate(
53-
jni.VMFromPtr(unsafe.Pointer(activity.vm)),
54-
jni.ObjectFromPtr(unsafe.Pointer(activity.clazz)),
55+
jni.VMFromUintptr(uintptr(C._getVM(activity))),
56+
jni.ObjectFromUintptr(uintptr(C._getClazz(activity))),
5557
)
5658
C._setCallbacks(activity)
5759
}
5860

5961
//export goOnResume
6062
func goOnResume(activity *C.ANativeActivity) {
6163
ui.OnResume(
62-
jni.ObjectFromPtr(unsafe.Pointer(activity.clazz)),
64+
jni.ObjectFromUintptr(uintptr(C._getClazz(activity))),
6365
)
6466
}
6567

‎examples/app_framework/main.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ static void _onResume(ANativeActivity* a) { goOnResume(a); }
1414
extern void goOnNativeWindowCreated(ANativeActivity*, ANativeWindow*);
1515
static void _onWindowCreated(ANativeActivity* a, ANativeWindow* w) { goOnNativeWindowCreated(a, w); }
1616
static void _setCallbacks(ANativeActivity* a) { a->callbacks->onResume = _onResume; a->callbacks->onNativeWindowCreated = _onWindowCreated; }
17+
static uintptr_t _getVM(ANativeActivity* a) { return (uintptr_t)a->vm; }
18+
static uintptr_t _getClazz(ANativeActivity* a) { return (uintptr_t)a->clazz; }
1719
*/
1820
import "C"
1921
import (
@@ -33,16 +35,16 @@ func init() { ui.Register(run) }
3335
//export ANativeActivity_onCreate
3436
func ANativeActivity_onCreate(activity *C.ANativeActivity, savedState unsafe.Pointer, savedStateSize C.size_t) {
3537
ui.OnCreate(
36-
jni.VMFromPtr(unsafe.Pointer(activity.vm)),
37-
jni.ObjectFromPtr(unsafe.Pointer(activity.clazz)),
38+
jni.VMFromUintptr(uintptr(C._getVM(activity))),
39+
jni.ObjectFromUintptr(uintptr(C._getClazz(activity))),
3840
)
3941
C._setCallbacks(activity)
4042
}
4143

4244
//export goOnResume
4345
func goOnResume(activity *C.ANativeActivity) {
4446
ui.OnResume(
45-
jni.ObjectFromPtr(unsafe.Pointer(activity.clazz)),
47+
jni.ObjectFromUintptr(uintptr(C._getClazz(activity))),
4648
)
4749
}
4850

‎examples/audiomanager/main.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ static void _onResume(ANativeActivity* a) { goOnResume(a); }
1212
extern void goOnNativeWindowCreated(ANativeActivity*, ANativeWindow*);
1313
static void _onWindowCreated(ANativeActivity* a, ANativeWindow* w) { goOnNativeWindowCreated(a, w); }
1414
static void _setCallbacks(ANativeActivity* a) { a->callbacks->onResume = _onResume; a->callbacks->onNativeWindowCreated = _onWindowCreated; }
15+
static uintptr_t _getVM(ANativeActivity* a) { return (uintptr_t)a->vm; }
16+
static uintptr_t _getClazz(ANativeActivity* a) { return (uintptr_t)a->clazz; }
1517
*/
1618
import "C"
1719
import (
@@ -31,16 +33,16 @@ func init() { ui.Register(run) }
3133
//export ANativeActivity_onCreate
3234
func ANativeActivity_onCreate(activity *C.ANativeActivity, savedState unsafe.Pointer, savedStateSize C.size_t) {
3335
ui.OnCreate(
34-
jni.VMFromPtr(unsafe.Pointer(activity.vm)),
35-
jni.ObjectFromPtr(unsafe.Pointer(activity.clazz)),
36+
jni.VMFromUintptr(uintptr(C._getVM(activity))),
37+
jni.ObjectFromUintptr(uintptr(C._getClazz(activity))),
3638
)
3739
C._setCallbacks(activity)
3840
}
3941

4042
//export goOnResume
4143
func goOnResume(activity *C.ANativeActivity) {
4244
ui.OnResume(
43-
jni.ObjectFromPtr(unsafe.Pointer(activity.clazz)),
45+
jni.ObjectFromUintptr(uintptr(C._getClazz(activity))),
4446
)
4547
}
4648

‎examples/battery/main.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ static void _onResume(ANativeActivity* a) { goOnResume(a); }
1313
extern void goOnNativeWindowCreated(ANativeActivity*, ANativeWindow*);
1414
static void _onWindowCreated(ANativeActivity* a, ANativeWindow* w) { goOnNativeWindowCreated(a, w); }
1515
static void _setCallbacks(ANativeActivity* a) { a->callbacks->onResume = _onResume; a->callbacks->onNativeWindowCreated = _onWindowCreated; }
16+
static uintptr_t _getVM(ANativeActivity* a) { return (uintptr_t)a->vm; }
17+
static uintptr_t _getClazz(ANativeActivity* a) { return (uintptr_t)a->clazz; }
1618
*/
1719
import "C"
1820
import (
@@ -32,16 +34,16 @@ func init() { ui.Register(run) }
3234
//export ANativeActivity_onCreate
3335
func ANativeActivity_onCreate(activity *C.ANativeActivity, savedState unsafe.Pointer, savedStateSize C.size_t) {
3436
ui.OnCreate(
35-
jni.VMFromPtr(unsafe.Pointer(activity.vm)),
36-
jni.ObjectFromPtr(unsafe.Pointer(activity.clazz)),
37+
jni.VMFromUintptr(uintptr(C._getVM(activity))),
38+
jni.ObjectFromUintptr(uintptr(C._getClazz(activity))),
3739
)
3840
C._setCallbacks(activity)
3941
}
4042

4143
//export goOnResume
4244
func goOnResume(activity *C.ANativeActivity) {
4345
ui.OnResume(
44-
jni.ObjectFromPtr(unsafe.Pointer(activity.clazz)),
46+
jni.ObjectFromUintptr(uintptr(C._getClazz(activity))),
4547
)
4648
}
4749

‎examples/biometric/main.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ static void _onResume(ANativeActivity* a) { goOnResume(a); }
1313
extern void goOnNativeWindowCreated(ANativeActivity*, ANativeWindow*);
1414
static void _onWindowCreated(ANativeActivity* a, ANativeWindow* w) { goOnNativeWindowCreated(a, w); }
1515
static void _setCallbacks(ANativeActivity* a) { a->callbacks->onResume = _onResume; a->callbacks->onNativeWindowCreated = _onWindowCreated; }
16+
static uintptr_t _getVM(ANativeActivity* a) { return (uintptr_t)a->vm; }
17+
static uintptr_t _getClazz(ANativeActivity* a) { return (uintptr_t)a->clazz; }
1618
*/
1719
import "C"
1820
import (
@@ -32,16 +34,16 @@ func init() { ui.Register(run) }
3234
//export ANativeActivity_onCreate
3335
func ANativeActivity_onCreate(activity *C.ANativeActivity, savedState unsafe.Pointer, savedStateSize C.size_t) {
3436
ui.OnCreate(
35-
jni.VMFromPtr(unsafe.Pointer(activity.vm)),
36-
jni.ObjectFromPtr(unsafe.Pointer(activity.clazz)),
37+
jni.VMFromUintptr(uintptr(C._getVM(activity))),
38+
jni.ObjectFromUintptr(uintptr(C._getClazz(activity))),
3739
)
3840
C._setCallbacks(activity)
3941
}
4042

4143
//export goOnResume
4244
func goOnResume(activity *C.ANativeActivity) {
4345
ui.OnResume(
44-
jni.ObjectFromPtr(unsafe.Pointer(activity.clazz)),
46+
jni.ObjectFromUintptr(uintptr(C._getClazz(activity))),
4547
)
4648
}
4749

‎examples/bluetooth/main.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ static void _onResume(ANativeActivity* a) { goOnResume(a); }
3636
extern void goOnNativeWindowCreated(ANativeActivity*, ANativeWindow*);
3737
static void _onWindowCreated(ANativeActivity* a, ANativeWindow* w) { goOnNativeWindowCreated(a, w); }
3838
static void _setCallbacks(ANativeActivity* a) { a->callbacks->onResume = _onResume; a->callbacks->onNativeWindowCreated = _onWindowCreated; }
39+
static uintptr_t _getVM(ANativeActivity* a) { return (uintptr_t)a->vm; }
40+
static uintptr_t _getClazz(ANativeActivity* a) { return (uintptr_t)a->clazz; }
3941
*/
4042
import "C"
4143
import (
@@ -55,16 +57,16 @@ func init() { ui.Register(run) }
5557
//export ANativeActivity_onCreate
5658
func ANativeActivity_onCreate(activity *C.ANativeActivity, savedState unsafe.Pointer, savedStateSize C.size_t) {
5759
ui.OnCreate(
58-
jni.VMFromPtr(unsafe.Pointer(activity.vm)),
59-
jni.ObjectFromPtr(unsafe.Pointer(activity.clazz)),
60+
jni.VMFromUintptr(uintptr(C._getVM(activity))),
61+
jni.ObjectFromUintptr(uintptr(C._getClazz(activity))),
6062
)
6163
C._setCallbacks(activity)
6264
}
6365

6466
//export goOnResume
6567
func goOnResume(activity *C.ANativeActivity) {
6668
ui.OnResume(
67-
jni.ObjectFromPtr(unsafe.Pointer(activity.clazz)),
69+
jni.ObjectFromUintptr(uintptr(C._getClazz(activity))),
6870
)
6971
}
7072

‎examples/build_info/main.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ static void _onResume(ANativeActivity* a) { goOnResume(a); }
1515
extern void goOnNativeWindowCreated(ANativeActivity*, ANativeWindow*);
1616
static void _onWindowCreated(ANativeActivity* a, ANativeWindow* w) { goOnNativeWindowCreated(a, w); }
1717
static void _setCallbacks(ANativeActivity* a) { a->callbacks->onResume = _onResume; a->callbacks->onNativeWindowCreated = _onWindowCreated; }
18+
static uintptr_t _getVM(ANativeActivity* a) { return (uintptr_t)a->vm; }
19+
static uintptr_t _getClazz(ANativeActivity* a) { return (uintptr_t)a->clazz; }
1820
*/
1921
import "C"
2022
import (
@@ -34,16 +36,16 @@ func init() { ui.Register(run) }
3436
//export ANativeActivity_onCreate
3537
func ANativeActivity_onCreate(activity *C.ANativeActivity, savedState unsafe.Pointer, savedStateSize C.size_t) {
3638
ui.OnCreate(
37-
jni.VMFromPtr(unsafe.Pointer(activity.vm)),
38-
jni.ObjectFromPtr(unsafe.Pointer(activity.clazz)),
39+
jni.VMFromUintptr(uintptr(C._getVM(activity))),
40+
jni.ObjectFromUintptr(uintptr(C._getClazz(activity))),
3941
)
4042
C._setCallbacks(activity)
4143
}
4244

4345
//export goOnResume
4446
func goOnResume(activity *C.ANativeActivity) {
4547
ui.OnResume(
46-
jni.ObjectFromPtr(unsafe.Pointer(activity.clazz)),
48+
jni.ObjectFromUintptr(uintptr(C._getClazz(activity))),
4749
)
4850
}
4951

‎examples/camera/main.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ static void _onResume(ANativeActivity* a) { goOnResume(a); }
1111
extern void goOnNativeWindowCreated(ANativeActivity*, ANativeWindow*);
1212
static void _onWindowCreated(ANativeActivity* a, ANativeWindow* w) { goOnNativeWindowCreated(a, w); }
1313
static void _setCallbacks(ANativeActivity* a) { a->callbacks->onResume = _onResume; a->callbacks->onNativeWindowCreated = _onWindowCreated; }
14+
static uintptr_t _getVM(ANativeActivity* a) { return (uintptr_t)a->vm; }
15+
static uintptr_t _getClazz(ANativeActivity* a) { return (uintptr_t)a->clazz; }
1416
*/
1517
import "C"
1618
import (
@@ -30,16 +32,16 @@ func init() { ui.Register(run) }
3032
//export ANativeActivity_onCreate
3133
func ANativeActivity_onCreate(activity *C.ANativeActivity, savedState unsafe.Pointer, savedStateSize C.size_t) {
3234
ui.OnCreate(
33-
jni.VMFromPtr(unsafe.Pointer(activity.vm)),
34-
jni.ObjectFromPtr(unsafe.Pointer(activity.clazz)),
35+
jni.VMFromUintptr(uintptr(C._getVM(activity))),
36+
jni.ObjectFromUintptr(uintptr(C._getClazz(activity))),
3537
)
3638
C._setCallbacks(activity)
3739
}
3840

3941
//export goOnResume
4042
func goOnResume(activity *C.ANativeActivity) {
4143
ui.OnResume(
42-
jni.ObjectFromPtr(unsafe.Pointer(activity.clazz)),
44+
jni.ObjectFromUintptr(uintptr(C._getClazz(activity))),
4345
)
4446
}
4547

‎examples/camera_display/main.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ package main
1414
1515
extern void goOnResume(ANativeActivity*);
1616
static void _onResume(ANativeActivity* a) { goOnResume(a); }
17+
static uintptr_t _getVM(ANativeActivity* a) { return (uintptr_t)a->vm; }
18+
static uintptr_t _getClazz(ANativeActivity* a) { return (uintptr_t)a->clazz; }
1719
static void _setCallbacks(ANativeActivity* a) {
1820
a->callbacks->onResume = _onResume;
1921
}
@@ -45,8 +47,8 @@ var (
4547

4648
//export ANativeActivity_onCreate
4749
func ANativeActivity_onCreate(activity *C.ANativeActivity, savedState unsafe.Pointer, savedStateSize C.size_t) {
48-
vm := jni.VMFromPtr(unsafe.Pointer(activity.vm))
49-
actObj := jni.ObjectFromPtr(unsafe.Pointer(activity.clazz))
50+
vm := jni.VMFromUintptr(uintptr(C._getVM(activity)))
51+
actObj := jni.ObjectFromUintptr(uintptr(C._getClazz(activity)))
5052

5153
mu.Lock()
5254
globalVM = vm

0 commit comments

Comments
 (0)