From 14270babe5c808e09dcf8c2b256bd443445ad10e Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 27 Mar 2015 17:10:09 +0100
Subject: [PATCH] (input_autodetect.c) Cleanups pt. 2

---
 input/input_autodetect.c | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/input/input_autodetect.c b/input/input_autodetect.c
index 72e5846205..7d45b829c2 100644
--- a/input/input_autodetect.c
+++ b/input/input_autodetect.c
@@ -98,6 +98,18 @@ found:
    return true;
 }
 
+static bool input_autoconfigure_joypad_from_conf(
+      config_file_t *conf,
+      autoconfig_params_t *params,
+      bool block_osd_spam)
+{
+   bool ret = input_try_autoconfigure_joypad_from_conf(conf,
+         params, block_osd_spam);
+
+   config_file_free(conf);
+   return ret;
+}
+
 void input_config_autoconfigure_joypad(autoconfig_params_t *params)
 {
    size_t i;
@@ -134,11 +146,9 @@ void input_config_autoconfigure_joypad(autoconfig_params_t *params)
    {
       config_file_t *conf = (config_file_t*)
          config_file_new_from_string(input_builtin_autoconfs[i]);
-      bool success = input_try_autoconfigure_joypad_from_conf(conf,
-            params, block_osd_spam);
 
-      config_file_free(conf);
-      if (success)
+      if (input_autoconfigure_joypad_from_conf(conf,
+            params, block_osd_spam))
          break;
    }
 #endif
@@ -154,15 +164,12 @@ void input_config_autoconfigure_joypad(autoconfig_params_t *params)
 
    for (i = 0; i < list->size; i++)
    {
-      bool success;
       config_file_t *conf = config_file_new(list->elems[i].data);
       if (!conf)
          continue;
 
-      success = input_try_autoconfigure_joypad_from_conf(conf,
-            params, block_osd_spam);
-      config_file_free(conf);
-      if (success)
+      if (input_autoconfigure_joypad_from_conf(conf,
+               params, block_osd_spam))
          break;
    }