atl/android_translation_layer
0
0
Fork 0
mirror of https://gitlab.com/android_translation_layer/android_translation_layer.git synced 2025-10-27 11:48:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix some gcc-reported warnings

Browse Source
This commit is contained in:
Mis012
2024-04-19 23:18:17 +02:00
parent 21627aecad
commit 98d17ac25e
7 changed files with 50 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/api-impl-jni/android_app_NativeActivity.c
View File

@@ -364,7 +364,7 @@ void Java_android_app_NativeActivity_unloadNativeCode(JNIEnv* env, jobject clazz
{
printf("STUB - unloadNativeCode_native\n");
/*if (handle != 0) {
struct NativeCode* code = (struct NativeCode*)handle;
struct NativeCode* code = (struct NativeCode*)_PTR(handle);
NativeCode_destroy(code);
}*/
}
@@ -372,7 +372,7 @@ void Java_android_app_NativeActivity_unloadNativeCode(JNIEnv* env, jobject clazz
void Java_android_app_NativeActivity_onStartNative(JNIEnv* env, jobject clazz, jlong handle)
{
if (handle != 0) {
struct NativeCode* code = (struct NativeCode*)handle;
struct NativeCode* code = (struct NativeCode*)_PTR(handle);
if (code->callbacks.onStart != NULL) {
code->callbacks.onStart((ANativeActivity *)code);
}
@@ -382,7 +382,7 @@ void Java_android_app_NativeActivity_onStartNative(JNIEnv* env, jobject clazz, j
void Java_android_app_NativeActivity_onResumeNative(JNIEnv* env, jobject clazz, jlong handle)
{
if (handle != 0) {
struct NativeCode* code = (struct NativeCode*)handle;
struct NativeCode* code = (struct NativeCode*)_PTR(handle);
if (code->callbacks.onResume != NULL) {
code->callbacks.onResume((ANativeActivity *)code);
}
@@ -396,7 +396,7 @@ jbyteArray Java_android_app_NativeActivity_onSaveInstanceStateNative(JNIEnv* env
jbyteArray array = NULL;
if (handle != 0) {
struct NativeCode* code = (struct NativeCode*)handle;
struct NativeCode* code = (struct NativeCode*)_PTR(handle);
if (code->callbacks.onSaveInstanceState != NULL) {
size_t len = 0;
jbyte* state = (jbyte*)code->callbacks.onSaveInstanceState((ANativeActivity *)code, &len);
@@ -418,7 +418,7 @@ jbyteArray Java_android_app_NativeActivity_onSaveInstanceStateNative(JNIEnv* env
void Java_android_app_NativeActivity_onPauseNative(JNIEnv* env, jobject clazz, jlong handle)
{
if (handle != 0) {
struct NativeCode* code = (struct NativeCode*)handle;
struct NativeCode* code = (struct NativeCode*)_PTR(handle);
if (code->callbacks.onPause != NULL) {
code->callbacks.onPause((ANativeActivity *)code);
}
@@ -428,7 +428,7 @@ void Java_android_app_NativeActivity_onPauseNative(JNIEnv* env, jobject clazz, j
void Java_android_app_NativeActivity_onStopNative(JNIEnv* env, jobject clazz, jlong handle)
{
if (handle != 0) {
struct NativeCode* code = (struct NativeCode*)handle;
struct NativeCode* code = (struct NativeCode*)_PTR(handle);
if (code->callbacks.onStop != NULL) {
code->callbacks.onStop((ANativeActivity *)code);
}
@@ -439,7 +439,7 @@ void Java_android_app_NativeActivity_onConfigurationChangedNative(JNIEnv* env, j
{
printf("STUB - onConfigurationChanged_native\n");
/* if (handle != 0) {
struct NativeCode* code = (struct NativeCode*)handle;
struct NativeCode* code = (struct NativeCode*)_PTR(handle);
if (code->callbacks.onConfigurationChanged != NULL) {
code->callbacks.onConfigurationChanged((ANativeActivity *)code);
}
@@ -450,7 +450,7 @@ void Java_android_app_NativeActivity_onLowMemoryNative(JNIEnv* env, jobject claz
{
printf("STUB - onLowMemory_native\n");
/* if (handle != 0) {
struct NativeCode* code = (struct NativeCode*)handle;
struct NativeCode* code = (struct NativeCode*)_PTR(handle);
if (code->callbacks.onLowMemory != NULL) {
code->callbacks.onLowMemory((ANativeActivity *)code);
}
@@ -460,7 +460,7 @@ void Java_android_app_NativeActivity_onLowMemoryNative(JNIEnv* env, jobject claz
void Java_android_app_NativeActivity_onWindowFocusChangedNative(JNIEnv* env, jobject clazz, jlong handle, jboolean focused)
{
if (handle != 0) {
struct NativeCode* code = (struct NativeCode*)handle;
struct NativeCode* code = (struct NativeCode*)_PTR(handle);
if (code->callbacks.onWindowFocusChanged != NULL) {
code->callbacks.onWindowFocusChanged((ANativeActivity *)code, focused ? 1 : 0);
}
@@ -471,7 +471,7 @@ void Java_android_app_NativeActivity_onSurfaceCreatedNative(JNIEnv* env, jobject
{
printf("STUB - onSurfaceCreated_native\n");
/* if (handle != 0) {
struct NativeCode* code = (struct NativeCode*)handle;
struct NativeCode* code = (struct NativeCode*)_PTR(handle);
code->setSurface(surface);
if (code->nativeWindow != NULL && code->callbacks.onNativeWindowCreated != NULL) {
code->callbacks.onNativeWindowCreated((ANativeActivity *)code, code->nativeWindow.get());
@@ -483,7 +483,7 @@ void Java_android_app_NativeActivity_onSurfaceChangedNative(JNIEnv* env, jobject
jint format, jint width, jint height)
{
if (handle != 0) {
struct NativeCode *code = (struct NativeCode *)handle;
struct NativeCode *code = (struct NativeCode*)_PTR(handle);
ANativeWindow *oldNativeWindow = code->nativeWindow;
NativeCode_setSurface(code, surface);
if (oldNativeWindow != code->nativeWindow) {
@@ -514,7 +514,7 @@ void Java_android_app_NativeActivity_onSurfaceRedrawNeededNative(JNIEnv* env, jo
{
printf("STUB - onSurfaceRedrawNeeded_native\n");
/* if (handle != 0) {
struct NativeCode* code = (struct NativeCode*)handle;
struct NativeCode* code = (struct NativeCode*)_PTR(handle);
if (code->nativeWindow != NULL && code->callbacks.onNativeWindowRedrawNeeded != NULL) {
code->callbacks.onNativeWindowRedrawNeeded((ANativeActivity *)code, code->nativeWindow.get());
}
@@ -525,7 +525,7 @@ void Java_android_app_NativeActivity_onSurfaceDestroyedNative(JNIEnv* env, jobje
{
printf("STUB - onSurfaceDestroyed_native\n");
/* if (handle != 0) {
struct NativeCode* code = (struct NativeCode*)handle;
struct NativeCode* code = (struct NativeCode*)_PTR(handle);
if (code->nativeWindow != NULL && code->callbacks.onNativeWindowDestroyed != NULL) {
code->callbacks.onNativeWindowDestroyed(code,
code->nativeWindow.get());
@@ -538,9 +538,9 @@ void Java_android_app_NativeActivity_onInputQueueCreatedNative(JNIEnv* env, jobj
{
printf("STUB - onInputChannelCreated_native\n");
if (handle != 0) {
struct NativeCode* code = (struct NativeCode*)handle;
struct NativeCode* code = (struct NativeCode*)_PTR(handle);
if (code->callbacks.onInputQueueCreated != NULL) {
code->callbacks.onInputQueueCreated((ANativeActivity *)code, (AInputQueue *)queue);
code->callbacks.onInputQueueCreated((ANativeActivity *)code, (AInputQueue *)_PTR(queue));
}
}
}
@@ -549,7 +549,7 @@ void Java_android_app_NativeActivity_onInputQueueDestroyedNative(JNIEnv* env, jo
{
printf("STUB - onInputChannelDestroyed_native\n");
/* if (handle != 0) {
struct NativeCode* code = (struct NativeCode*)handle;
struct NativeCode* code = (struct NativeCode*)_PTR(handle);
if (code->callbacks.onInputQueueDestroyed != NULL) {
AInputQueue* queue = reinterpret_cast<AInputQueue*>(queuePtr);
code->callbacks.onInputQueueDestroyed((ANativeActivity *)code, queue);
@@ -562,7 +562,7 @@ void Java_android_app_NativeActivity_onContentRectChangedNative(JNIEnv* env, job
{
printf("STUB - onContentRectChanged_native\n");
/* if (handle != 0) {
struct NativeCode* code = (struct NativeCode*)handle;
struct NativeCode* code = (struct NativeCode*)_PTR(handle);
if (code->callbacks.onContentRectChanged != NULL) {
ARect rect;
rect.left = x;

11
src/api-impl-jni/android_content_res_AssetManager.c
View File

@@ -411,10 +411,9 @@ JNIEXPORT void JNICALL Java_android_content_res_AssetManager_setConfiguration(
JNIEXPORT jobjectArray JNICALL Java_android_content_res_AssetManager_list(JNIEnv *env, jobject this, jstring _path)
{
DIR *d;
int fd;
struct dirent *dir;
char* path_rel = _CSTRING(_path);
const char* path_rel = _CSTRING(_path);
char *app_data_dir = get_app_data_dir();
char *path_abs = malloc(strlen(app_data_dir) + strlen(ASSET_DIR) + strlen(path_rel) + 1);
@@ -423,7 +422,7 @@ JNIEXPORT jobjectArray JNICALL Java_android_content_res_AssetManager_list(JNIEnv
strcat(path_abs, path_rel);
d = opendir(path_abs);
GArray *assets = g_array_new(false, false, sizeof(const char *));
int i = 0;
if (d)
@@ -436,15 +435,15 @@ JNIEXPORT jobjectArray JNICALL Java_android_content_res_AssetManager_list(JNIEnv
}
closedir(d);
}
jobjectArray array = (*env)->NewObjectArray(env, assets->len, (*env)->FindClass(env, "java/lang/String"), NULL);
for (i = 0; i < assets->len; i++)
{
const char *asset = g_array_index(assets, const char *, i);
(*env)->SetObjectArrayElement(env, array, i, (*env)->NewString(env, asset, strlen(asset)));
(*env)->SetObjectArrayElement(env, array, i, (*env)->NewStringUTF(env, asset));
}
g_array_free(assets, TRUE);
return array;
}

2
src/api-impl-jni/egl/com_google_android_gles_jni_EGLImpl.c
View File

@@ -61,7 +61,7 @@ JNIEXPORT jboolean JNICALL Java_com_google_android_gles_1jni_EGLImpl_native_1egl
jint* num_config_base = get_int_array_crit(env, num_config);
ret = eglChooseConfig(_PTR(egl_display), attrib_base, egl_configs ? _PTR(configs_base) : NULL, config_size, num_config_base);
printf(".. eglChooseConfig: egl_display: %ld, egl_configs: %p, _PTR(configs_base): %p, config_size: %d, num_config_base[0]: %d\n", egl_display, egl_configs, _PTR(configs_base), config_size, num_config_base[0]);
printf(".. eglChooseConfig: egl_display: %w64x, egl_configs: %p, _PTR(configs_base): %p, config_size: %d, num_config_base[0]: %d\n", egl_display, egl_configs, _PTR(configs_base), config_size, num_config_base[0]);
release_int_array_crit(env, attrib_list, attrib_base);
release_long_array_crit(env, egl_configs, configs_base);