From 7856c4e940288d618d105455991d26bcc79e6cee Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 28 Nov 2015 18:39:43 +0100
Subject: [PATCH] (Android) Cleanups

---
 input/drivers/android_input.c | 14 +++---
 input/drivers/dinput.c        | 94 +++++++++++++++++------------------
 2 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c
index 3f91427c94..2e84b15065 100644
--- a/input/drivers/android_input.c
+++ b/input/drivers/android_input.c
@@ -291,7 +291,7 @@ error:
    return false;
 }
 
-static void engine_handle_cmd(void)
+static void android_input_poll_main_cmd(void)
 {
    bool is_paused;
    int8_t cmd;
@@ -786,7 +786,7 @@ static int android_input_get_id(android_input_t *android, AInputEvent *event)
    return id;
 }
 
-static void android_input_handle_input(void *data)
+static void android_input_poll_input(void *data)
 {
    AInputEvent *event = NULL;
    android_input_t    *android     = (android_input_t*)data;
@@ -831,7 +831,7 @@ static void android_input_handle_input(void *data)
    }
 }
 
-static void android_input_handle_user(void *data)
+static void android_input_poll_user(void *data)
 {
    android_input_t    *android     = (android_input_t*)data;
    struct android_app *android_app = (struct android_app*)g_android;
@@ -870,13 +870,13 @@ static void android_input_poll(void *data)
       switch (ident)
       {
          case LOOPER_ID_INPUT:
-            android_input_handle_input(data);
+            android_input_poll_input(data);
             break;
          case LOOPER_ID_USER:
-            android_input_handle_user(data);
+            android_input_poll_user(data);
             break;
          case LOOPER_ID_MAIN:
-            engine_handle_cmd();
+            android_input_poll_main_cmd();
             break;
       }
    }
@@ -888,7 +888,7 @@ bool android_run_events(void *data)
    int id = ALooper_pollOnce(-1, NULL, NULL, NULL);
 
    if (id == LOOPER_ID_MAIN)
-      engine_handle_cmd();
+      android_input_poll_main_cmd();
 
    /* Check if we are exiting. */
    if (system->shutdown)
diff --git a/input/drivers/dinput.c b/input/drivers/dinput.c
index 37b4969621..08ad537ebc 100644
--- a/input/drivers/dinput.c
+++ b/input/drivers/dinput.c
@@ -583,62 +583,62 @@ bool dinput_handle_message(void *dinput, UINT message, WPARAM wParam, LPARAM lPa
    switch (message)
    {
       case WM_MOUSEMOVE:
-	 di->window_pos_x = GET_X_LPARAM(lParam);
-	 di->window_pos_y = GET_Y_LPARAM(lParam);
+         di->window_pos_x = GET_X_LPARAM(lParam);
+         di->window_pos_y = GET_Y_LPARAM(lParam);
          break;
       case WM_POINTERDOWN:
-      {
-         struct pointer_status *new_pointer =
-            (struct pointer_status *)malloc(sizeof(struct pointer_status));
-
-         if (!new_pointer)
          {
-            RARCH_ERR("dinput_handle_message: pointer allocation in WM_POINTERDOWN failed.\n");
-            return false;
-         }
+            struct pointer_status *new_pointer =
+               (struct pointer_status *)malloc(sizeof(struct pointer_status));
 
-         new_pointer->pointer_id = GET_POINTERID_WPARAM(wParam);
-         dinput_pointer_store_pos(new_pointer, lParam);
-         dinput_add_pointer(di, new_pointer);
-         return true;
-      }
+            if (!new_pointer)
+            {
+               RARCH_ERR("dinput_handle_message: pointer allocation in WM_POINTERDOWN failed.\n");
+               return false;
+            }
+
+            new_pointer->pointer_id = GET_POINTERID_WPARAM(wParam);
+            dinput_pointer_store_pos(new_pointer, lParam);
+            dinput_add_pointer(di, new_pointer);
+            return true;
+         }
       case WM_POINTERUP:
-      {
-         int pointer_id = GET_POINTERID_WPARAM(wParam);
-         dinput_delete_pointer(di, pointer_id);
-         return true;
-      }
+         {
+            int pointer_id = GET_POINTERID_WPARAM(wParam);
+            dinput_delete_pointer(di, pointer_id);
+            return true;
+         }
       case WM_POINTERUPDATE:
-      {
-         int pointer_id = GET_POINTERID_WPARAM(wParam);
-         struct pointer_status *pointer = dinput_find_pointer(di, pointer_id);
-         if (pointer)
-            dinput_pointer_store_pos(pointer, lParam);
-         return true;
-      }
+         {
+            int pointer_id = GET_POINTERID_WPARAM(wParam);
+            struct pointer_status *pointer = dinput_find_pointer(di, pointer_id);
+            if (pointer)
+               dinput_pointer_store_pos(pointer, lParam);
+            return true;
+         }
       case WM_DEVICECHANGE:
-      {
-         if (di->joypad)
-            di->joypad->destroy();
-         di->joypad = input_joypad_init_driver(settings->input.joypad_driver, di);
-         break;
-      }
+         {
+            if (di->joypad)
+               di->joypad->destroy();
+            di->joypad = input_joypad_init_driver(settings->input.joypad_driver, di);
+            break;
+         }
       case WM_MOUSEWHEEL:
-          {
-              if (((short) HIWORD(wParam))/120 > 0)
-                 di->mouse_wu = true;
-              if (((short) HIWORD(wParam))/120 < 0)
-                 di->mouse_wd = true;
-          }
-          break;
+         {
+            if (((short) HIWORD(wParam))/120 > 0)
+               di->mouse_wu = true;
+            if (((short) HIWORD(wParam))/120 < 0)
+               di->mouse_wd = true;
+         }
+         break;
       case WM_MOUSEHWHEEL:
-          {
-              if (((short) HIWORD(wParam))/120 > 0)
-                 di->mouse_hwu = true;
-              if (((short) HIWORD(wParam))/120 < 0)
-                 di->mouse_hwd = true;
-          }
-          break;
+         {
+            if (((short) HIWORD(wParam))/120 > 0)
+               di->mouse_hwu = true;
+            if (((short) HIWORD(wParam))/120 < 0)
+               di->mouse_hwd = true;
+         }
+         break;
    }
 
    return false;