Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

misc/jni: reduce duplication in mapping struct

Browse Source 
'name' was in fact unused when reading fields or methods, so it can be merged with 'method'.
Also changed the type of 'mandatory' to bool.
This commit is contained in:
sfan5
2024-02-25 17:15:49 +01:00
parent 5b1eaf3ff1
commit d955dfab29
3 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
misc/jni.c
View File

@@ -280,7 +280,7 @@ int mp_jni_init_jfields(JNIEnv *env, void *jfields,
switch (type) {
case MP_JNI_FIELD: {
jfieldID field_id = (*env)->GetFieldID(env, last_clazz,
jfields_mapping[i].method, jfields_mapping[i].signature);
jfields_mapping[i].name, jfields_mapping[i].signature);
CHECK_EXC_MANDATORY();
*(jfieldID*)jfield = field_id;
@@ -289,7 +289,7 @@ int mp_jni_init_jfields(JNIEnv *env, void *jfields,
case MP_JNI_STATIC_FIELD_AS_INT:
case MP_JNI_STATIC_FIELD: {
jfieldID field_id = (*env)->GetStaticFieldID(env, last_clazz,
jfields_mapping[i].method, jfields_mapping[i].signature);
jfields_mapping[i].name, jfields_mapping[i].signature);
CHECK_EXC_MANDATORY();
if (type == MP_JNI_STATIC_FIELD_AS_INT) {
@@ -305,7 +305,7 @@ int mp_jni_init_jfields(JNIEnv *env, void *jfields,
}
case MP_JNI_METHOD: {
jmethodID method_id = (*env)->GetMethodID(env, last_clazz,
jfields_mapping[i].method, jfields_mapping[i].signature);
jfields_mapping[i].name, jfields_mapping[i].signature);
CHECK_EXC_MANDATORY();
*(jmethodID*)jfield = method_id;
@@ -313,7 +313,7 @@ int mp_jni_init_jfields(JNIEnv *env, void *jfields,
}
case MP_JNI_STATIC_METHOD: {
jmethodID method_id = (*env)->GetStaticMethodID(env, last_clazz,
jfields_mapping[i].method, jfields_mapping[i].signature);
jfields_mapping[i].name, jfields_mapping[i].signature);
CHECK_EXC_MANDATORY();
*(jmethodID*)jfield = method_id;