From 52d1b3fd885e6a733f821fb88662b953f7d4439a Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 12 May 2019 09:36:52 +0200
Subject: [PATCH] task_save.c - simplify dump_to_file_desperate

---
 tasks/task_save.c | 46 +++++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/tasks/task_save.c b/tasks/task_save.c
index 84050689cd..fc5d5fdda6 100644
--- a/tasks/task_save.c
+++ b/tasks/task_save.c
@@ -1472,44 +1472,52 @@ static bool dump_to_file_desperate(const void *data,
       size_t size, unsigned type)
 {
    time_t time_;
-   char *path             = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
-   char *timebuf          = (char*)malloc(256 * sizeof(char));
-   char *application_data = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
+   char *timebuf;
+   char *path;
+   bool  ret              = false;
 
-   timebuf[0] = application_data[0] = path[0] = '\0';
+   char *application_data = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
+   application_data[0]    = '\0';
 
    if (!fill_pathname_application_data(application_data,
             PATH_MAX_LENGTH * sizeof(char)))
-      goto error;
+   {
+      free(application_data);
+      return false;
+   }
 
+   time(&time_);
+
+   timebuf    = (char*)malloc(256 * sizeof(char));
+   timebuf[0] = '\0';
+
+   strftime(timebuf,
+         256 * sizeof(char),
+         "%Y-%m-%d-%H-%M-%S", localtime(&time_));
+
+   path    = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
+   path[0] = '\0';
    snprintf(path,
          PATH_MAX_LENGTH * sizeof(char),
          "%s/RetroArch-recovery-%u",
          application_data, type);
 
-   time(&time_);
-
-   strftime(timebuf,
-         256 * sizeof(char),
-         "%Y-%m-%d-%H-%M-%S", localtime(&time_));
    strlcat(path, timebuf,
          PATH_MAX_LENGTH * sizeof(char)
          );
 
-   if (!filestream_write_file(path, data, size))
-      goto error;
-
    free(application_data);
    free(timebuf);
+
+   if (!filestream_write_file(path, data, size))
+   {
+      free(path);
+      return false;
+   }
+
    RARCH_WARN("Succeeded in saving RAM data to \"%s\".\n", path);
    free(path);
    return true;
-
-error:
-   free(application_data);
-   free(timebuf);
-   free(path);
-   return false;
 }
 
 /**