diff options
| author | sfan5 <sfan5@live.de> | 2024-02-25 17:15:49 +0100 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2024-02-28 16:11:54 +0100 |
| commit | d955dfab294ecd24064f2d64b8af0bafc2af575c (patch) | |
| tree | ca500d883ffea77b52f5448306bff27576efa80a /misc | |
| parent | 5b1eaf3ff1d968c045c7a211d8e86ebe9cd475f2 (diff) | |
| download | mpv-d955dfab294ecd24064f2d64b8af0bafc2af575c.tar.bz2 mpv-d955dfab294ecd24064f2d64b8af0bafc2af575c.tar.xz | |
misc/jni: reduce duplication in mapping struct
'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.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/jni.c | 8 | ||||
| -rw-r--r-- | misc/jni.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/misc/jni.c b/misc/jni.c index d1f06a2d61..02440722ca 100644 --- a/misc/jni.c +++ b/misc/jni.c @@ -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; diff --git a/misc/jni.h b/misc/jni.h index 5a6ec9767e..96b293771d 100644 --- a/misc/jni.h +++ b/misc/jni.h @@ -22,6 +22,7 @@ #ifndef MP_JNI_H #define MP_JNI_H +#include <stdbool.h> #include <jni.h> #include "common/msg.h" @@ -128,11 +129,10 @@ enum MPJniFieldType { struct MPJniField { const char *name; - const char *method; const char *signature; enum MPJniFieldType type; int offset; - int mandatory; + bool mandatory; }; |