(Android) Cleanups
This commit is contained in:
parent
9326151a3f
commit
b70c1c134f
|
@ -70,7 +70,7 @@ int read_zip_file(const char *archive_path,
|
||||||
{
|
{
|
||||||
/* Get info about current file. */
|
/* Get info about current file. */
|
||||||
unz_file_info file_info;
|
unz_file_info file_info;
|
||||||
char filename[PATH_MAX_LENGTH];
|
char filename[PATH_MAX_LENGTH] = {0};
|
||||||
char last_char = ' ';
|
char last_char = ' ';
|
||||||
|
|
||||||
if (unzGetCurrentFileInfo(
|
if (unzGetCurrentFileInfo(
|
||||||
|
@ -105,7 +105,7 @@ int read_zip_file(const char *archive_path,
|
||||||
|
|
||||||
if (optional_outfile != 0)
|
if (optional_outfile != 0)
|
||||||
{
|
{
|
||||||
char read_buffer[RARCH_ZIP_SUPPORT_BUFFER_SIZE_MAX];
|
char read_buffer[RARCH_ZIP_SUPPORT_BUFFER_SIZE_MAX] = {0};
|
||||||
FILE* outsink = fopen(optional_outfile,"wb");
|
FILE* outsink = fopen(optional_outfile,"wb");
|
||||||
|
|
||||||
if (outsink == NULL)
|
if (outsink == NULL)
|
||||||
|
|
|
@ -318,8 +318,8 @@ int system_property_get(const char *name, char *value)
|
||||||
{
|
{
|
||||||
FILE *pipe;
|
FILE *pipe;
|
||||||
int length = 0;
|
int length = 0;
|
||||||
char buffer[PATH_MAX_LENGTH];
|
char buffer[PATH_MAX_LENGTH] = {0};
|
||||||
char cmd[PATH_MAX_LENGTH];
|
char cmd[PATH_MAX_LENGTH] = {0};
|
||||||
char *curpos = NULL;
|
char *curpos = NULL;
|
||||||
|
|
||||||
snprintf(cmd, sizeof(cmd), "getprop %s", name);
|
snprintf(cmd, sizeof(cmd), "getprop %s", name);
|
||||||
|
@ -361,7 +361,7 @@ static void frontend_android_get_name(char *s, size_t len)
|
||||||
|
|
||||||
static void frontend_android_get_version(int32_t *major, int32_t *minor, int32_t *rel)
|
static void frontend_android_get_version(int32_t *major, int32_t *minor, int32_t *rel)
|
||||||
{
|
{
|
||||||
char os_version_str[PROP_VALUE_MAX];
|
char os_version_str[PROP_VALUE_MAX] = {0};
|
||||||
system_property_get("ro.build.version.release", os_version_str);
|
system_property_get("ro.build.version.release", os_version_str);
|
||||||
|
|
||||||
*major = 0;
|
*major = 0;
|
||||||
|
@ -396,7 +396,7 @@ static void frontend_android_get_os(char *s, size_t len, int *major, int *minor)
|
||||||
|
|
||||||
static void frontend_android_get_version_sdk(int32_t *sdk)
|
static void frontend_android_get_version_sdk(int32_t *sdk)
|
||||||
{
|
{
|
||||||
char os_version_str[PROP_VALUE_MAX];
|
char os_version_str[PROP_VALUE_MAX] = {0};
|
||||||
system_property_get("ro.build.version.sdk", os_version_str);
|
system_property_get("ro.build.version.sdk", os_version_str);
|
||||||
|
|
||||||
*sdk = 0;
|
*sdk = 0;
|
||||||
|
@ -440,12 +440,13 @@ static void frontend_android_get_environment_settings(int *argc,
|
||||||
char *argv[], void *data, void *params_data)
|
char *argv[], void *data, void *params_data)
|
||||||
{
|
{
|
||||||
int32_t major, minor, rel;
|
int32_t major, minor, rel;
|
||||||
char device_model[PROP_VALUE_MAX], device_id[PROP_VALUE_MAX];
|
char device_model[PROP_VALUE_MAX] = {0};
|
||||||
|
char device_id[PROP_VALUE_MAX] = {0};
|
||||||
JNIEnv *env;
|
struct rarch_main_wrap *args = NULL;
|
||||||
|
JNIEnv *env = NULL;
|
||||||
jobject obj = NULL;
|
jobject obj = NULL;
|
||||||
jstring jstr = NULL;
|
jstring jstr = NULL;
|
||||||
struct android_app* android_app = (struct android_app*)data;
|
struct android_app *android_app = (struct android_app*)data;
|
||||||
|
|
||||||
if (!android_app)
|
if (!android_app)
|
||||||
return;
|
return;
|
||||||
|
@ -454,7 +455,8 @@ static void frontend_android_get_environment_settings(int *argc,
|
||||||
if (!env)
|
if (!env)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
struct rarch_main_wrap *args = (struct rarch_main_wrap*)params_data;
|
args = (struct rarch_main_wrap*)params_data;
|
||||||
|
|
||||||
if (args)
|
if (args)
|
||||||
{
|
{
|
||||||
args->touched = true;
|
args->touched = true;
|
||||||
|
@ -478,8 +480,9 @@ static void frontend_android_get_environment_settings(int *argc,
|
||||||
|
|
||||||
if (android_app->getStringExtra && jstr)
|
if (android_app->getStringExtra && jstr)
|
||||||
{
|
{
|
||||||
static char config_path[PATH_MAX_LENGTH];
|
static char config_path[PATH_MAX_LENGTH] = {0};
|
||||||
const char *argv = NULL;
|
const char *argv = NULL;
|
||||||
|
|
||||||
*config_path = '\0';
|
*config_path = '\0';
|
||||||
|
|
||||||
argv = (*env)->GetStringUTFChars(env, jstr, 0);
|
argv = (*env)->GetStringUTFChars(env, jstr, 0);
|
||||||
|
@ -500,6 +503,7 @@ static void frontend_android_get_environment_settings(int *argc,
|
||||||
if (android_app->getStringExtra && jstr)
|
if (android_app->getStringExtra && jstr)
|
||||||
{
|
{
|
||||||
const char *argv = (*env)->GetStringUTFChars(env, jstr, 0);
|
const char *argv = (*env)->GetStringUTFChars(env, jstr, 0);
|
||||||
|
|
||||||
strlcpy(android_app->current_ime, argv,
|
strlcpy(android_app->current_ime, argv,
|
||||||
sizeof(android_app->current_ime));
|
sizeof(android_app->current_ime));
|
||||||
(*env)->ReleaseStringUTFChars(env, jstr, argv);
|
(*env)->ReleaseStringUTFChars(env, jstr, argv);
|
||||||
|
@ -514,6 +518,7 @@ static void frontend_android_get_environment_settings(int *argc,
|
||||||
{
|
{
|
||||||
const char *argv = (*env)->GetStringUTFChars(env, jstr, 0);
|
const char *argv = (*env)->GetStringUTFChars(env, jstr, 0);
|
||||||
bool used = (strcmp(argv, "false") == 0) ? false : true;
|
bool used = (strcmp(argv, "false") == 0) ? false : true;
|
||||||
|
|
||||||
(*env)->ReleaseStringUTFChars(env, jstr, argv);
|
(*env)->ReleaseStringUTFChars(env, jstr, argv);
|
||||||
|
|
||||||
RARCH_LOG("USED: [%s].\n", used ? "true" : "false");
|
RARCH_LOG("USED: [%s].\n", used ? "true" : "false");
|
||||||
|
@ -644,7 +649,7 @@ static void frontend_android_get_environment_settings(int *argc,
|
||||||
|
|
||||||
static void frontend_android_deinit(void *data)
|
static void frontend_android_deinit(void *data)
|
||||||
{
|
{
|
||||||
JNIEnv *env;
|
JNIEnv *env = NULL;
|
||||||
struct android_app *android_app = (struct android_app*)data;
|
struct android_app *android_app = (struct android_app*)data;
|
||||||
|
|
||||||
if (!android_app)
|
if (!android_app)
|
||||||
|
@ -677,8 +682,8 @@ bool android_run_events(void *data);
|
||||||
|
|
||||||
static void frontend_android_init(void *data)
|
static void frontend_android_init(void *data)
|
||||||
{
|
{
|
||||||
JNIEnv *env;
|
JNIEnv *env = NULL;
|
||||||
ALooper *looper;
|
ALooper *looper = NULL;
|
||||||
jclass class = NULL;
|
jclass class = NULL;
|
||||||
jobject obj = NULL;
|
jobject obj = NULL;
|
||||||
struct android_app* android_app = (struct android_app*)data;
|
struct android_app* android_app = (struct android_app*)data;
|
||||||
|
@ -732,7 +737,7 @@ static void frontend_android_init(void *data)
|
||||||
|
|
||||||
static int frontend_android_get_rating(void)
|
static int frontend_android_get_rating(void)
|
||||||
{
|
{
|
||||||
char device_model[PROP_VALUE_MAX];
|
char device_model[PROP_VALUE_MAX] = {0};
|
||||||
frontend_android_get_name(device_model, sizeof(device_model));
|
frontend_android_get_name(device_model, sizeof(device_model));
|
||||||
|
|
||||||
RARCH_LOG("ro.product.model: (%s).\n", device_model);
|
RARCH_LOG("ro.product.model: (%s).\n", device_model);
|
||||||
|
@ -748,7 +753,7 @@ static int frontend_android_get_rating(void)
|
||||||
|
|
||||||
static enum frontend_architecture frontend_android_get_architecture(void)
|
static enum frontend_architecture frontend_android_get_architecture(void)
|
||||||
{
|
{
|
||||||
char abi[PROP_VALUE_MAX];
|
char abi[PROP_VALUE_MAX] = {0};
|
||||||
system_property_get("ro.product.cpu.abi", abi);
|
system_property_get("ro.product.cpu.abi", abi);
|
||||||
|
|
||||||
if (!strcmp(abi, "armeabi-v7a"))
|
if (!strcmp(abi, "armeabi-v7a"))
|
||||||
|
|
|
@ -169,7 +169,7 @@ static void history_playlist_push(content_playlist_t *playlist,
|
||||||
const char *path, const char *core_path,
|
const char *path, const char *core_path,
|
||||||
struct retro_system_info *info)
|
struct retro_system_info *info)
|
||||||
{
|
{
|
||||||
char tmp[PATH_MAX_LENGTH];
|
char tmp[PATH_MAX_LENGTH] = {0};
|
||||||
global_t *global = global_get_ptr();
|
global_t *global = global_get_ptr();
|
||||||
|
|
||||||
if (!playlist || global->libretro_dummy || !info)
|
if (!playlist || global->libretro_dummy || !info)
|
||||||
|
|
Loading…
Reference in New Issue