9PS2) Silence some warnings

dynamic.c

@@ -510,7 +510,6 @@ bool libretro_get_system_info(const char *path,
  **/
 bool init_libretro_sym_custom(enum rarch_core_type type, struct retro_core_t *current_core, const char *lib_path, void *_lib_handle_p)
 {
-   dylib_t *lib_handle_p = (dylib_t*)_lib_handle_p;
 #ifdef HAVE_DYNAMIC
    /* the library handle for use with the SYMBOL macro */
    dylib_t lib_handle_local;
@@ -519,64 +518,67 @@ bool init_libretro_sym_custom(enum rarch_core_type type, struct retro_core_t *cu
    switch (type)
    {
       case CORE_TYPE_PLAIN:
+         {
 #ifdef HAVE_DYNAMIC
 #ifdef HAVE_RUNAHEAD
-         if (!lib_path || !lib_handle_p)
+            dylib_t *lib_handle_p = (dylib_t*)_lib_handle_p;
+            if (!lib_path || !lib_handle_p)
 #endif
-         {
+            {
-            if (!load_dynamic_core())
+               if (!load_dynamic_core())
-               return false;
+                  return false;
-            lib_handle_local = lib_handle;
+               lib_handle_local = lib_handle;
-         }
+            }
 #ifdef HAVE_RUNAHEAD
-         else
+            else
-         {
+            {
-            /* for a secondary core, we already have a
+               /* for a secondary core, we already have a
-             * primary library loaded, so we can skip
+                * primary library loaded, so we can skip
-             * some checks and just load the library */
+                * some checks and just load the library */
-            retro_assert(lib_path != NULL && lib_handle_p != NULL);
+               retro_assert(lib_path != NULL && lib_handle_p != NULL);
-            lib_handle_local = dylib_load(lib_path);
+               lib_handle_local = dylib_load(lib_path);
 
-            if (!lib_handle_local)
+               if (!lib_handle_local)
-               return false;
+                  return false;
-            *lib_handle_p = lib_handle_local;
+               *lib_handle_p = lib_handle_local;
+            }
+#endif
+#endif
+
+            SYMBOL(retro_init);
+            SYMBOL(retro_deinit);
+
+            SYMBOL(retro_api_version);
+            SYMBOL(retro_get_system_info);
+            SYMBOL(retro_get_system_av_info);
+
+            SYMBOL(retro_set_environment);
+            SYMBOL(retro_set_video_refresh);
+            SYMBOL(retro_set_audio_sample);
+            SYMBOL(retro_set_audio_sample_batch);
+            SYMBOL(retro_set_input_poll);
+            SYMBOL(retro_set_input_state);
+
+            SYMBOL(retro_set_controller_port_device);
+
+            SYMBOL(retro_reset);
+            SYMBOL(retro_run);
+
+            SYMBOL(retro_serialize_size);
+            SYMBOL(retro_serialize);
+            SYMBOL(retro_unserialize);
+
+            SYMBOL(retro_cheat_reset);
+            SYMBOL(retro_cheat_set);
+
+            SYMBOL(retro_load_game);
+            SYMBOL(retro_load_game_special);
+
+            SYMBOL(retro_unload_game);
+            SYMBOL(retro_get_region);
+            SYMBOL(retro_get_memory_data);
+            SYMBOL(retro_get_memory_size);
          }
-#endif
-#endif
-
-         SYMBOL(retro_init);
-         SYMBOL(retro_deinit);
-
-         SYMBOL(retro_api_version);
-         SYMBOL(retro_get_system_info);
-         SYMBOL(retro_get_system_av_info);
-
-         SYMBOL(retro_set_environment);
-         SYMBOL(retro_set_video_refresh);
-         SYMBOL(retro_set_audio_sample);
-         SYMBOL(retro_set_audio_sample_batch);
-         SYMBOL(retro_set_input_poll);
-         SYMBOL(retro_set_input_state);
-
-         SYMBOL(retro_set_controller_port_device);
-
-         SYMBOL(retro_reset);
-         SYMBOL(retro_run);
-
-         SYMBOL(retro_serialize_size);
-         SYMBOL(retro_serialize);
-         SYMBOL(retro_unserialize);
-
-         SYMBOL(retro_cheat_reset);
-         SYMBOL(retro_cheat_set);
-
-         SYMBOL(retro_load_game);
-         SYMBOL(retro_load_game_special);
-
-         SYMBOL(retro_unload_game);
-         SYMBOL(retro_get_region);
-         SYMBOL(retro_get_memory_data);
-         SYMBOL(retro_get_memory_size);
          break;
       case CORE_TYPE_DUMMY:
          SYMBOL_DUMMY(retro_init);

input/drivers_joypad/ps2_joypad.c

@@ -37,13 +37,15 @@ static const char *ps2_joypad_name(unsigned pad)
 
 static bool ps2_joypad_init(void *data)
 {
-   unsigned ret, port;
+   unsigned ret  = 0;
-   bool init = true;
+   unsigned port = 0;
+   bool init     = true;
 
    printf("PortMax: %d\n", padGetPortMax());
    printf("SlotMax: %d\n", padGetSlotMax(port));
 
-   for (port = 0; port < PS2_MAX_PADS; port++) {
+   for (port = 0; port < PS2_MAX_PADS; port++)
+   {
       bool auto_configure = input_autoconfigure_connect( ps2_joypad_name(port),
                                                          NULL,
                                                          ps2_joypad.ident,

input/input_driver.c

@@ -664,7 +664,10 @@ void input_poll(void)
 int16_t input_state(unsigned port, unsigned device,
       unsigned idx, unsigned id)
 {
-   int16_t res = 0, res_overlay = 0;
+   int16_t res         = 0;
+#ifdef HAVE_OVERLAY
+   int16_t res_overlay = 0;
+#endif
 
    /* used to reset input state of a button when the gamepad mapper
       is in action for that button*/
@@ -709,7 +712,8 @@ int16_t input_state(unsigned port, unsigned device,
 
 #ifdef HAVE_OVERLAY
       if (overlay_ptr)
-         input_state_overlay(overlay_ptr, &res_overlay, port, device, idx, id);
+         input_state_overlay(overlay_ptr,
+               &res_overlay, port, device, idx, id);
 #endif
 
 #ifdef HAVE_NETWORKGAMEPAD