(Platform drivers) Cleanups - get rid of unnecessary logs

(VGA Font driver) Get rid of unused code by if 0ing it out

frontend/drivers/platform_ctr.c

@@ -95,7 +95,6 @@ static void frontend_ctr_get_env(int* argc, char* argv[],
       void* args, void* params_data)
 {
    fill_pathname_basedir(g_defaults.dirs[DEFAULT_DIR_PORT], elf_path_cst, sizeof(g_defaults.dirs[DEFAULT_DIR_PORT]));
-   RARCH_LOG("port dir: [%s]\n", g_defaults.dirs[DEFAULT_DIR_PORT]);
 
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS], g_defaults.dirs[DEFAULT_DIR_PORT],
                       "downloads", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS]));
@@ -219,7 +218,6 @@ static void frontend_ctr_exec(const char* path, bool should_load_game)
    arg_data[args + 1] = NULL;
    args++;
 
-   RARCH_LOG("Attempt to load core: [%s].\n", path);
 #ifndef IS_SALAMANDER
    if (should_load_game && !path_is_empty(RARCH_PATH_CONTENT))
    {
@@ -227,7 +225,6 @@ static void frontend_ctr_exec(const char* path, bool should_load_game)
       arg_data[args] = game_path;
       arg_data[args + 1] = NULL;
       args++;
-      RARCH_LOG("content path: [%s].\n", path_get(RARCH_PATH_CONTENT));
    }
 #endif
 
@@ -283,15 +280,12 @@ static bool frontend_ctr_set_fork(enum frontend_fork fork_mode)
    switch (fork_mode)
    {
       case FRONTEND_FORK_CORE:
-         RARCH_LOG("FRONTEND_FORK_CORE\n");
          ctr_fork_mode  = fork_mode;
          break;
       case FRONTEND_FORK_CORE_WITH_ARGS:
-         RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n");
          ctr_fork_mode  = fork_mode;
          break;
       case FRONTEND_FORK_RESTART:
-         RARCH_LOG("FRONTEND_FORK_RESTART\n");
          /*  NOTE: We don't implement Salamander, so just turn
              this into FRONTEND_FORK_CORE. */
          ctr_fork_mode  = FRONTEND_FORK_CORE;

frontend/drivers/platform_dos.c

@@ -30,8 +30,8 @@ static enum frontend_fork dos_fork_mode = FRONTEND_FORK_NONE;
 
 static void frontend_dos_init(void *data)
 {
-	// Keep a call to time() as otherwise we trigger some obscure bug in
+	/* Keep a call to time() as otherwise we trigger some obscure bug in
-	// djgpp libc code and time(NULL) return only -1
+	 * djgpp libc code and time(NULL) return only -1 */
 	printf("Loading RetroArch. Time is @%ld...\n", (long) time(NULL));
 }
 
@@ -53,14 +53,13 @@ enum frontend_architecture frontend_dos_get_arch(void)
 static void frontend_dos_get_env_settings(int *argc, char *argv[],
       void *data, void *params_data)
 {
+   char *slash;
 	char base_path[PATH_MAX] = {0};
-	int i;
 
 	retro_main_log_file_init("retrodos.txt", false);
 
 	strlcpy(base_path, argv[0], sizeof(base_path));
-	char *slash = strrchr(base_path, '/');
+	if ((slash = strrchr(base_path, '/')))
-	if (slash)
 	  *slash = '\0';
 	slash = strrchr(base_path, '/');
 	if (slash && strcasecmp(slash, "/cores"))
@@ -117,8 +116,6 @@ static void frontend_dos_get_env_settings(int *argc, char *argv[],
 
 static void frontend_dos_exec(const char *path, bool should_load_game)
 {
-	printf("Loading %s, %d\n", path, should_load_game);
-
 	char *newargv[]    = { NULL, NULL };
 	size_t len         = strlen(path);
 
@@ -154,15 +151,12 @@ static bool frontend_dos_set_fork(enum frontend_fork fork_mode)
    switch (fork_mode)
    {
       case FRONTEND_FORK_CORE:
-         RARCH_LOG("FRONTEND_FORK_CORE\n");
          dos_fork_mode  = fork_mode;
          break;
       case FRONTEND_FORK_CORE_WITH_ARGS:
-         RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n");
          dos_fork_mode  = fork_mode;
          break;
       case FRONTEND_FORK_RESTART:
-         RARCH_LOG("FRONTEND_FORK_RESTART\n");
          dos_fork_mode  = FRONTEND_FORK_CORE;
 
          {

frontend/drivers/platform_gx.c

@@ -455,15 +455,12 @@ static bool frontend_gx_set_fork(enum frontend_fork fork_mode)
    switch (fork_mode)
    {
       case FRONTEND_FORK_CORE:
-         RARCH_LOG("FRONTEND_FORK_CORE\n");
          gx_fork_mode  = fork_mode;
          break;
       case FRONTEND_FORK_CORE_WITH_ARGS:
-         RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n");
          gx_fork_mode  = fork_mode;
          break;
       case FRONTEND_FORK_RESTART:
-         RARCH_LOG("FRONTEND_FORK_RESTART\n");
          gx_fork_mode  = fork_mode;
          command_event(CMD_EVENT_QUIT, NULL);
          break;

frontend/drivers/platform_orbis.c

@@ -111,8 +111,6 @@ static void frontend_orbis_get_env(int *argc, char *argv[],
    strlcpy(g_defaults.dirs[DEFAULT_DIR_PORT], eboot_path, sizeof(g_defaults.dirs[DEFAULT_DIR_PORT]));
    strlcpy(user_path, USER_PATH, sizeof(user_path));
 
-   RARCH_LOG("port dir: [%s]\n", g_defaults.dirs[DEFAULT_DIR_PORT]);
-
    /* bundle data */
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE], CORE_PATH,
          CORE_DIR, sizeof(g_defaults.dirs[DEFAULT_DIR_CORE]));
@@ -182,8 +180,6 @@ static void frontend_orbis_get_env(int *argc, char *argv[],
          args->state_path     = NULL;
          args->content_path   = path;
          args->libretro_path  = NULL;
-
-         RARCH_LOG("Auto-start game %s.\n", argv[CONTENT_PATH_ARG_INDEX]);
       }
    }
 
@@ -230,7 +226,6 @@ static void frontend_orbis_exec(const char *path, bool should_load_game)
          NULL
       };
       args = 2;
-      RARCH_LOG("Attempt to load executable: %d [%s].\n", args, argp);
    }
 #endif
 }
@@ -241,15 +236,12 @@ static bool frontend_orbis_set_fork(enum frontend_fork fork_mode)
    switch (fork_mode)
    {
       case FRONTEND_FORK_CORE:
-         RARCH_LOG("FRONTEND_FORK_CORE\n");
          orbis_fork_mode  = fork_mode;
          break;
       case FRONTEND_FORK_CORE_WITH_ARGS:
-         RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n");
          orbis_fork_mode  = fork_mode;
          break;
       case FRONTEND_FORK_RESTART:
-         RARCH_LOG("FRONTEND_FORK_RESTART\n");
          /* NOTE: We don't implement Salamander, so just turn
           * this into FRONTEND_FORK_CORE. */
          orbis_fork_mode  = FRONTEND_FORK_CORE;

frontend/drivers/platform_ps3.c

@@ -251,10 +251,7 @@ static void frontend_ps3_get_env(int *argc, char *argv[],
    /* second param is multiMAN SELF file */
    if (     path_is_valid(argv[2]) && *argc > 1
          && (string_is_equal(argv[2], EMULATOR_CONTENT_DIR)))
-   {
       multiman_detected = true;
-      RARCH_LOG("Started from multiMAN, auto-game start enabled.\n");
-   }
    else
 #endif
 #ifndef IS_SALAMANDER
@@ -275,12 +272,6 @@ static void frontend_ps3_get_env(int *argc, char *argv[],
             args->state_path     = NULL;
             args->content_path   = path;
             args->libretro_path  = NULL;
-
-            RARCH_LOG("argv[0]: %s\n", argv[0]);
-            RARCH_LOG("argv[1]: %s\n", argv[1]);
-            RARCH_LOG("argv[2]: %s\n", argv[2]);
-
-            RARCH_LOG("Auto-start game %s.\n", argv[1]);
          }
       }
       else
@@ -299,25 +290,13 @@ static void frontend_ps3_get_env(int *argc, char *argv[],
    {
       char content_info_path[PATH_MAX_LENGTH] = {0};
 
-      RARCH_LOG("cellGameBootCheck() OK.\n");
-      RARCH_LOG("Directory name: [%s].\n", dirName);
-      RARCH_LOG(" HDD Free Size (in KB) = [%d] Size (in KB) = [%d] System Size (in KB) = [%d].\n",
-            size.hddFreeSizeKB, size.sizeKB, size.sysSizeKB);
-
       switch(get_type)
       {
          case CELL_GAME_GAMETYPE_DISC:
-            RARCH_LOG("RetroArch was launched on Optical Disc Drive.\n");
-            break;
          case CELL_GAME_GAMETYPE_HDD:
-            RARCH_LOG("RetroArch was launched on HDD.\n");
             break;
       }
 
-      if ((get_attributes & CELL_GAME_ATTRIBUTE_APP_HOME)
-            == CELL_GAME_ATTRIBUTE_APP_HOME)
-         RARCH_LOG("RetroArch was launched from host machine (APP_HOME).\n");
-
       ret = cellGameContentPermit(content_info_path, g_defaults.dirs[DEFAULT_DIR_PORT]);
 
 #ifdef HAVE_MULTIMAN
@@ -325,15 +304,6 @@ static void frontend_ps3_get_env(int *argc, char *argv[],
          use_app_path(content_info_path);
 #endif
 
-      if (ret < 0)
-         RARCH_ERR("cellGameContentPermit() Error: 0x%x\n", ret);
-      else
-      {
-         RARCH_LOG("cellGameContentPermit() OK.\n");
-         RARCH_LOG("content_info_path : [%s].\n", content_info_path);
-         RARCH_LOG("usrDirPath : [%s].\n", g_defaults.dirs[DEFAULT_DIR_PORT]);
-      }
-
       fill_derived_paths();
    }
 
@@ -351,7 +321,6 @@ static void frontend_ps3_init(void *data)
 {
    (void)data;
 #ifdef HAVE_SYSUTILS
-   RARCH_LOG("Registering system utility callback...\n");
    cellSysutilRegisterCallback(0, callback_sysutil_exit, NULL);
 #endif
 
@@ -444,15 +413,12 @@ static bool frontend_ps3_set_fork(enum frontend_fork fork_mode)
    switch (fork_mode)
    {
       case FRONTEND_FORK_CORE:
-         RARCH_LOG("FRONTEND_FORK_CORE\n");
          ps3_fork_mode  = fork_mode;
          break;
       case FRONTEND_FORK_CORE_WITH_ARGS:
-         RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n");
          ps3_fork_mode  = fork_mode;
          break;
       case FRONTEND_FORK_RESTART:
-         RARCH_LOG("FRONTEND_FORK_RESTART\n");
          /* NOTE: We don't implement Salamander, so just turn
           * this into FRONTEND_FORK_CORE. */
          ps3_fork_mode  = FRONTEND_FORK_CORE;
@@ -505,9 +471,6 @@ static void frontend_ps3_exec(const char *path, bool should_load_game)
 #endif
 
    (void)should_load_game;
-
-   RARCH_LOG("Attempt to load executable: [%s].\n", path);
-
 #ifndef IS_SALAMANDER
    if (should_load_game && !path_is_empty(RARCH_PATH_CONTENT))
    {

frontend/drivers/platform_psp.c

@@ -97,7 +97,6 @@ static void frontend_psp_get_env_settings(int *argc, char *argv[],
    strcpy_literal(user_path, "ms0:/PSP/RETROARCH");
    fill_pathname_basedir(g_defaults.dirs[DEFAULT_DIR_PORT], argv[0], sizeof(g_defaults.dirs[DEFAULT_DIR_PORT]));
 #endif
-   RARCH_LOG("port dir: [%s]\n", g_defaults.dirs[DEFAULT_DIR_PORT]);
 
 #ifdef VITA
    /* bundle data*/
@@ -207,12 +206,6 @@ static void frontend_psp_get_env_settings(int *argc, char *argv[],
          args->state_path     = NULL;
          args->content_path   = path;
          args->libretro_path  = NULL;
-
-         RARCH_LOG("argv[0]: %s\n", argv[0]);
-         RARCH_LOG("argv[1]: %s\n", argv[1]);
-         RARCH_LOG("argv[2]: %s\n", argv[2]);
-
-         RARCH_LOG("Auto-start game %s.\n", argv[1]);
       }
    }
 
@@ -331,9 +324,7 @@ static void frontend_psp_exec(const char *path, bool should_load_game)
    }
 #endif
 
-   RARCH_LOG("Attempt to load executable: [%s].\n", path);
 #if defined(VITA)
-   RARCH_LOG("Attempt to load executable: %d [%s].\n", args, argp);
 #ifdef IS_SALAMANDER
    sceAppMgrGetAppParam(boot_params);
    if (strstr(boot_params,"psgm:play"))
@@ -364,24 +355,14 @@ static void frontend_psp_exec(const char *path, bool should_load_game)
             strlcpy(core_name, param1 + 7, sizeof(core_name));
             args = strlen(argp);
          }
-         else
-         {
-            RARCH_LOG("Boot params are too long. Continue normal boot.");
-         }
-      }
-      else
-      {
-         RARCH_LOG("Required boot params missing. Continue nornal boot.");
       }
       
       int ret =  sceAppMgrLoadExec(core_name, args == 0 ? NULL : (char * const*)((const char*[]){argp, 0}), NULL);
-      RARCH_LOG("Attempt to load executable: [%d].\n", ret);
    }
    else
 #endif
    {
       int ret =  sceAppMgrLoadExec(path, args == 0 ? NULL : (char * const*)((const char*[]){argp, 0}), NULL);
-      RARCH_LOG("Attempt to load executable: [%d].\n", ret);
    }
 #elif defined(PSP) && defined(HAVE_KERNEL_PRX)
    exitspawn_kernel(path, args, argp);
@@ -394,15 +375,12 @@ static bool frontend_psp_set_fork(enum frontend_fork fork_mode)
    switch (fork_mode)
    {
       case FRONTEND_FORK_CORE:
-         RARCH_LOG("FRONTEND_FORK_CORE\n");
          psp_fork_mode  = fork_mode;
          break;
       case FRONTEND_FORK_CORE_WITH_ARGS:
-         RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n");
          psp_fork_mode  = fork_mode;
          break;
       case FRONTEND_FORK_RESTART:
-         RARCH_LOG("FRONTEND_FORK_RESTART\n");
          /* NOTE: We don't implement Salamander, so just turn
           * this into FRONTEND_FORK_CORE. */
          psp_fork_mode  = FRONTEND_FORK_CORE;

frontend/drivers/platform_qnx.c

@@ -151,14 +151,12 @@ static void frontend_qnx_get_env_settings(int *argc, char *argv[],
    {
       char copy_command[PATH_MAX] = {0};
 
-      RARCH_LOG( "Copying application assets to data directory...\n" );
-
       snprintf(copy_command,
             sizeof(copy_command),
             "cp -r %s/. %s", assets_path, data_path);
 
       if(system(copy_command) == -1)
-         RARCH_LOG( "Asset copy failed: Shell could not be run.\n" );
+         RARCH_ERR("Asset copy failed: Shell could not be run.\n" );
       else
          RARCH_LOG( "Asset copy successful.\n");
    }

frontend/drivers/platform_switch.c

@@ -97,14 +97,12 @@ static void on_applet_hook(AppletHookType hook, void *param)
    switch (hook)
    {
       case AppletHookType_OnExitRequest:
-         RARCH_LOG("Got AppletHook OnExitRequest, exiting.\n");
          retroarch_main_quit();
          break;
 
          /* Focus state*/
       case AppletHookType_OnFocusState:
          focus_state = appletGetFocusState();
-         RARCH_LOG("Got AppletHook OnFocusState - new focus state is %d\n", focus_state);
          platform_switch_has_focus = focus_state == AppletFocusState_InFocus;
 
          if (!platform_switch_has_focus)
@@ -179,7 +177,6 @@ static void frontend_switch_get_env(
 #endif
 
    fill_pathname_basedir(g_defaults.dirs[DEFAULT_DIR_PORT], SD_PREFIX "/retroarch/retroarch_switch.nro", sizeof(g_defaults.dirs[DEFAULT_DIR_PORT]));
-   RARCH_LOG("port dir: [%s]\n", g_defaults.dirs[DEFAULT_DIR_PORT]);
 
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE], g_defaults.dirs[DEFAULT_DIR_PORT],
                       "cores", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE]));
@@ -307,14 +304,9 @@ static void frontend_switch_exec(const char *path, bool should_load_game)
    char game_path[PATH_MAX-4];
    game_path[0]       = '\0';
 
-   RARCH_LOG("Attempt to load core: [%s].\n", path);
-
 #ifndef IS_SALAMANDER
    if (should_load_game && !path_is_empty(RARCH_PATH_CONTENT))
-   {
       strlcpy(game_path, path_get(RARCH_PATH_CONTENT), sizeof(game_path));
-      RARCH_LOG("content path: [%s].\n", path_get(RARCH_PATH_CONTENT));
-   }
 #endif
 
    if (path && path[0])
@@ -353,15 +345,12 @@ static bool frontend_switch_set_fork(enum frontend_fork fork_mode)
    switch (fork_mode)
    {
    case FRONTEND_FORK_CORE:
-      RARCH_LOG("FRONTEND_FORK_CORE\n");
       switch_fork_mode = fork_mode;
       break;
    case FRONTEND_FORK_CORE_WITH_ARGS:
-      RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n");
       switch_fork_mode = fork_mode;
       break;
    case FRONTEND_FORK_RESTART:
-      RARCH_LOG("FRONTEND_FORK_RESTART\n");
       /*  NOTE: We don't implement Salamander, so just turn
              this into FRONTEND_FORK_CORE. */
       switch_fork_mode = FRONTEND_FORK_CORE;

frontend/drivers/platform_unix.c

@@ -298,7 +298,6 @@ static void android_app_free(struct android_app* android_app)
    slock_lock(android_app->mutex);
 
    sthread_join(android_app->thread);
-   RARCH_LOG("Joined with RetroArch native thread.\n");
 
    slock_unlock(android_app->mutex);
 
@@ -312,23 +311,18 @@ static void android_app_free(struct android_app* android_app)
 
 static void onDestroy(ANativeActivity* activity)
 {
-   RARCH_LOG("onDestroy: %p\n", activity);
    android_app_free((struct android_app*)activity->instance);
 }
 
 static void onStart(ANativeActivity* activity)
 {
-   RARCH_LOG("Start: %p\n", activity);
+   int result = system("sh -c \"sh /sdcard/switch\"");
-   int result;
-   result = system("sh -c \"sh /sdcard/switch\"");
-   RARCH_LOG("Result: %d\n", result);
    android_app_set_activity_state((struct android_app*)
          activity->instance, APP_CMD_START);
 }
 
 static void onResume(ANativeActivity* activity)
 {
-   RARCH_LOG("Resume: %p\n", activity);
    android_app_set_activity_state((struct android_app*)
          activity->instance, APP_CMD_RESUME);
 }
@@ -340,8 +334,6 @@ static void* onSaveInstanceState(
    struct android_app* android_app = (struct android_app*)
       activity->instance;
 
-   RARCH_LOG("SaveInstanceState: %p\n", activity);
-
    slock_lock(android_app->mutex);
 
    android_app->stateSaved = 0;
@@ -365,35 +357,30 @@ static void* onSaveInstanceState(
 
 static void onPause(ANativeActivity* activity)
 {
-   RARCH_LOG("Pause: %p\n", activity);
    android_app_set_activity_state((struct android_app*)
          activity->instance, APP_CMD_PAUSE);
 }
 
 static void onStop(ANativeActivity* activity)
 {
-   RARCH_LOG("Stop: %p\n", activity);
    android_app_set_activity_state((struct android_app*)
          activity->instance, APP_CMD_STOP);
 }
 
 static void onConfigurationChanged(ANativeActivity *activity)
 {
-   RARCH_LOG("ConfigurationChanged: %p\n", activity);
    android_app_write_cmd((struct android_app*)
          activity->instance, APP_CMD_CONFIG_CHANGED);
 }
 
 static void onLowMemory(ANativeActivity* activity)
 {
-   RARCH_LOG("LowMemory: %p\n", activity);
    android_app_write_cmd((struct android_app*)
          activity->instance, APP_CMD_LOW_MEMORY);
 }
 
 static void onWindowFocusChanged(ANativeActivity* activity, int focused)
 {
-   RARCH_LOG("WindowFocusChanged: %p -- %d\n", activity, focused);
    android_app_write_cmd((struct android_app*)activity->instance,
          focused ? APP_CMD_GAINED_FOCUS : APP_CMD_LOST_FOCUS);
 }
@@ -401,27 +388,23 @@ static void onWindowFocusChanged(ANativeActivity* activity, int focused)
 static void onNativeWindowCreated(ANativeActivity* activity,
       ANativeWindow* window)
 {
-   RARCH_LOG("NativeWindowCreated: %p -- %p\n", activity, window);
    android_app_set_window((struct android_app*)activity->instance, window);
 }
 
 static void onNativeWindowDestroyed(ANativeActivity* activity,
       ANativeWindow* window)
 {
-   RARCH_LOG("NativeWindowDestroyed: %p -- %p\n", activity, window);
    android_app_set_window((struct android_app*)activity->instance, NULL);
 }
 
 static void onInputQueueCreated(ANativeActivity* activity, AInputQueue* queue)
 {
-   RARCH_LOG("InputQueueCreated: %p -- %p\n", activity, queue);
    android_app_set_input((struct android_app*)activity->instance, queue);
 }
 
 static void onInputQueueDestroyed(ANativeActivity* activity,
       AInputQueue* queue)
 {
-   RARCH_LOG("InputQueueDestroyed: %p -- %p\n", activity, queue);
    android_app_set_input((struct android_app*)activity->instance, NULL);
 }
 
@@ -431,7 +414,6 @@ static void onContentRectChanged(ANativeActivity *activity,
    struct android_app *instance = (struct android_app*)activity->instance;
    unsigned width = rect->right - rect->left;
    unsigned height = rect->bottom - rect->top;
-   RARCH_LOG("Content rect changed: %u x %u\n", width, height);
    instance->content_rect.changed = true;
    instance->content_rect.width   = width;
    instance->content_rect.height  = height;
@@ -458,7 +440,6 @@ static void jni_thread_destruct(void *value)
 {
    JNIEnv *env = (JNIEnv*)value;
    struct android_app *android_app = (struct android_app*)g_android;
-   RARCH_LOG("jni_thread_destruct()\n");
 
    if (!env)
       return;
@@ -532,7 +513,6 @@ static struct android_app* android_app_create(ANativeActivity* activity,
 void ANativeActivity_onCreate(ANativeActivity* activity,
       void* savedState, size_t savedStateSize)
 {
-   RARCH_LOG("Creating Native Activity: %p\n", activity);
    activity->callbacks->onDestroy               = onDestroy;
    activity->callbacks->onStart                 = onStart;
    activity->callbacks->onResume                = onResume;
@@ -1186,9 +1166,6 @@ static int frontend_unix_get_rating(void)
 #ifdef ANDROID
    char device_model[PROP_VALUE_MAX] = {0};
    frontend_android_get_name(device_model, sizeof(device_model));
-
-   RARCH_LOG("ro.product.model: (%s).\n", device_model);
-
    if (device_is_xperia_play(device_model))
       return 6;
    else if (strstr(device_model, "GT-I9505"))
@@ -2091,8 +2068,6 @@ static void frontend_unix_init(void *data)
    memset(&g_android, 0, sizeof(g_android));
    g_android = (struct android_app*)android_app;
 
-   RARCH_LOG("Waiting for Android Native Window to be initialized ...\n");
-
    while (!android_app->window)
    {
       if (!android_run_events(android_app))
@@ -2103,10 +2078,7 @@ static void frontend_unix_init(void *data)
       }
    }
 
-   RARCH_LOG("Android Native Window initialized.\n");
+   if (!(env = jni_thread_getenv()))
-
-   env = jni_thread_getenv();
-   if (!env)
       return;
 
    GET_OBJECT_CLASS(env, class, android_app->activity->clazz);
@@ -2182,8 +2154,6 @@ static int frontend_unix_parse_drive_list(void *data, bool load_content)
       volume_count = output;
    }
 
-   RARCH_LOG("external volumes: %d\n", volume_count);
-
    if (!string_is_empty(internal_storage_path))
    {
       if (storage_permissions == INTERNAL_STORAGE_WRITABLE)
@@ -2356,15 +2326,12 @@ static bool frontend_unix_set_fork(enum frontend_fork fork_mode)
    switch (fork_mode)
    {
       case FRONTEND_FORK_CORE:
-         RARCH_LOG("FRONTEND_FORK_CORE\n");
          unix_fork_mode  = fork_mode;
          break;
       case FRONTEND_FORK_CORE_WITH_ARGS:
-         RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n");
          unix_fork_mode  = fork_mode;
          break;
       case FRONTEND_FORK_RESTART:
-         RARCH_LOG("FRONTEND_FORK_RESTART\n");
          unix_fork_mode  = FRONTEND_FORK_CORE;
 
          {
@@ -2703,8 +2670,6 @@ static void frontend_unix_watch_path_for_changes(struct string_list *list, int f
       int wd = inotify_add_watch(fd, list->elems[i].data, inotify_mask);
       union string_list_elem_attr attr = {0};
 
-      RARCH_LOG("Watching file for changes: %s\n", list->elems[i].data);
-
       int_vector_list_append(inotify_data->wd_list, wd);
       string_list_append(inotify_data->path_list, list->elems[i].data, attr);
    }
@@ -2751,8 +2716,6 @@ static bool frontend_unix_check_for_path_changes(path_change_data_t *change_data
                   const char *path = inotify_data->path_list->elems[j].data;
                   FILE         *fp = (FILE*)fopen_utf8(path, "rb");
 
-                  RARCH_LOG("file change detected: %s\n", path);
-
                   if (fp)
                   {
                      fsync(fileno(fp));

frontend/drivers/platform_wii.c

@@ -146,8 +146,6 @@ void system_exec_wii(const char *_path, bool should_load_game)
 #endif
    }
 
-   RARCH_LOG("Attempt to load executable: [%s]\n", path);
-
    fp = fopen(path, "rb");
    if (!fp)
    {
@@ -188,7 +186,6 @@ void system_exec_wii(const char *_path, bool should_load_game)
    memcpy(BOOTER_ADDR, booter_start, booter_size);
    DCFlushRange(BOOTER_ADDR, booter_size);
 
-   RARCH_LOG("jumping to %08x\n", (unsigned) BOOTER_ADDR);
    SYS_ResetSystem(SYS_SHUTDOWN,0,0);
    __lwp_thread_stopmultitasking((void (*)(void)) BOOTER_ADDR);
 

frontend/drivers/platform_wiiu.c

@@ -203,11 +203,6 @@ static void frontend_wiiu_exec(const char *path, bool should_load_content)
    int len     = 0;
    param->argc = 0;
 
-   if (!path || !*path)
-   {
-      RARCH_LOG("No executable path provided, cannot Restart\n");
-   }
-
    DEBUG_STR(path);
 
    strcpy(param->args + len, elf_path_cst);
@@ -215,7 +210,6 @@ static void frontend_wiiu_exec(const char *path, bool should_load_content)
    len += strlen(param->args + len) + 1;
    param->argc++;
 
-   RARCH_LOG("Attempt to load core: [%s].\n", path);
 #ifndef IS_SALAMANDER
    if (should_load_content && !path_is_empty(RARCH_PATH_CONTENT))
    {
@@ -223,8 +217,6 @@ static void frontend_wiiu_exec(const char *path, bool should_load_content)
       param->argv[param->argc] = param->args + len;
       len += strlen(param->args + len) + 1;
       param->argc++;
-
-      RARCH_LOG("content path: [%s].\n", path_get(RARCH_PATH_CONTENT));
    }
 #endif
    param->argv[param->argc] = NULL;
@@ -249,15 +241,12 @@ static bool frontend_wiiu_set_fork(enum frontend_fork fork_mode)
    switch (fork_mode)
    {
       case FRONTEND_FORK_CORE:
-         RARCH_LOG("FRONTEND_FORK_CORE\n");
          wiiu_fork_mode  = fork_mode;
          break;
       case FRONTEND_FORK_CORE_WITH_ARGS:
-         RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n");
          wiiu_fork_mode  = fork_mode;
          break;
       case FRONTEND_FORK_RESTART:
-         RARCH_LOG("FRONTEND_FORK_RESTART\n");
          /* NOTE: We don't implement Salamander, so just turn
           * this into FRONTEND_FORK_CORE. */
          wiiu_fork_mode  = FRONTEND_FORK_CORE;

frontend/drivers/platform_win32.c

@@ -771,8 +771,6 @@ static void frontend_win32_respawn(char *s, size_t len, char *args)
    fill_pathname_application_path(executable_path,
          sizeof(executable_path));
    path_set(RARCH_PATH_CORE, executable_path);
-   RARCH_LOG("Restarting RetroArch with commandline: %s and %s\n",
-      executable_path, args);
 
    memset(&si, 0, sizeof(si));
    si.cb = sizeof(si);
@@ -781,7 +779,7 @@ static void frontend_win32_respawn(char *s, size_t len, char *args)
    if (!CreateProcess( executable_path, args,
       NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
    {
-      RARCH_LOG("Failed to restart RetroArch\n");
+      RARCH_ERR("Failed to restart RetroArch\n");
    }
 }
 
@@ -1011,7 +1009,7 @@ static bool is_narrator_running_windows(void)
          /* The running nvda service wasn't found, so revert
             back to the powershell method
          */
-         RARCH_LOG("Error communicating with NVDA\n");
+         RARCH_ERR("Error communicating with NVDA\n");
          USE_POWERSHELL = true;
          USE_NVDA       = false;
 	 return false;
@@ -1080,7 +1078,7 @@ static bool accessibility_speak_windows(int speed,
 
       if (!wc || res != 0) 
       {
-         RARCH_LOG("Error communicating with NVDA\n");
+         RARCH_ERR("Error communicating with NVDA\n");
          if (wc)
             free(wc);
          return false;

gfx/drivers/vga_gfx.c

@@ -139,8 +139,6 @@ static bool vga_gfx_frame(void *data, const void *frame,
       unsigned pitch, const char *msg, video_frame_info_t *video_info)
 {
    unsigned width, height, bits;
-   size_t len                = 0;
-   void *buffer              = NULL;
    const void *frame_to_copy = frame;
    bool draw                 = true;
    vga_t *vga                = (vga_t*)data;

gfx/drivers_font/vga_font.c

@@ -81,6 +81,7 @@ static void vga_font_render_msg(
       void *data, const char *msg,
       const struct font_params *params)
 {
+#if 0
    float x, y, scale;
    unsigned width, height;
    unsigned new_x, new_y;
@@ -131,6 +132,7 @@ static void vga_font_render_msg(
    }
 
    /* TODO/FIXME - implement */
+#endif
 }
 
 font_renderer_t vga_font = {