From f1ea1f1845679c52707316043e5f566af2393296 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 16 Jul 2019 14:39:31 +0200
Subject: [PATCH] (Drivers joypad) Cleanups

---
 input/drivers_joypad/rwebpad_joypad.c | 20 +++++++-------------
 input/drivers_joypad/sdl_joypad.c     |  2 +-
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/input/drivers_joypad/rwebpad_joypad.c b/input/drivers_joypad/rwebpad_joypad.c
index 3159bf69a5..f624585219 100644
--- a/input/drivers_joypad/rwebpad_joypad.c
+++ b/input/drivers_joypad/rwebpad_joypad.c
@@ -49,7 +49,7 @@ static EM_BOOL rwebpad_gamepad_cb(int event_type,
 
    if (event_type == EMSCRIPTEN_EVENT_GAMEPADCONNECTED)
    {
-      if(!input_autoconfigure_connect(
+      if (!input_autoconfigure_connect(
                gamepad_event->id,    /* name */
                NULL,                 /* display name */
                rwebpad_joypad.ident, /* driver */
@@ -105,22 +105,18 @@ static bool rwebpad_joypad_init(void *data)
 static const char *rwebpad_joypad_name(unsigned pad)
 {
    static EmscriptenGamepadEvent gamepad_state;
-   EMSCRIPTEN_RESULT r;
-
-   r = emscripten_get_gamepad_status(pad, &gamepad_state);
+   EMSCRIPTEN_RESULT r = emscripten_get_gamepad_status(pad, &gamepad_state);
 
    if (r == EMSCRIPTEN_RESULT_SUCCESS)
       return gamepad_state.id;
-   else
-      return "";
+   return "";
 }
 
 static bool rwebpad_joypad_button(unsigned port_num, uint16_t joykey)
 {
    EmscriptenGamepadEvent gamepad_state;
-   EMSCRIPTEN_RESULT r;
-
-   r = emscripten_get_gamepad_status(port_num, &gamepad_state);
+   EMSCRIPTEN_RESULT r = emscripten_get_gamepad_status(
+         port_num, &gamepad_state);
 
    if (r == EMSCRIPTEN_RESULT_SUCCESS)
       if (joykey < gamepad_state.numButtons)
@@ -137,7 +133,7 @@ static void rwebpad_joypad_get_buttons(unsigned port_num, input_bits_t *state)
 
    if (r == EMSCRIPTEN_RESULT_SUCCESS)
    {
-      int i;
+      unsigned i;
 
       for (i = 0; i < gamepad_state.numButtons; i++)
       {
@@ -188,9 +184,7 @@ static void rwebpad_joypad_poll(void)
 static bool rwebpad_joypad_query_pad(unsigned pad)
 {
    EmscriptenGamepadEvent gamepad_state;
-   EMSCRIPTEN_RESULT r;
-
-   r = emscripten_get_gamepad_status(pad, &gamepad_state);
+   EMSCRIPTEN_RESULT r = emscripten_get_gamepad_status(pad, &gamepad_state);
 
    if (r == EMSCRIPTEN_RESULT_SUCCESS)
       return gamepad_state.connected == EM_TRUE;
diff --git a/input/drivers_joypad/sdl_joypad.c b/input/drivers_joypad/sdl_joypad.c
index 8a3c224ab6..d3b6544ea4 100644
--- a/input/drivers_joypad/sdl_joypad.c
+++ b/input/drivers_joypad/sdl_joypad.c
@@ -105,7 +105,7 @@ static void sdl_pad_connect(unsigned id)
 
 #ifdef HAVE_SDL2
    SDL_JoystickGUID guid;
-   uint16_t *guid_ptr;
+   uint16_t *guid_ptr         = NULL;
 
    if (SDL_IsGameController(id))
    {