From ab65b1e7434d552581cffd2b4863ea606f1f5668 Mon Sep 17 00:00:00 2001
From: Luis de Bethencourt <luis.bg@samsung.com>
Date: Fri, 29 May 2015 17:40:26 +0100
Subject: [PATCH] validate-utils: clean error handling in _file_get_lines ()

---
 validate/gst/validate/gst-validate-utils.c | 36 ++++++----------------
 1 file changed, 9 insertions(+), 27 deletions(-)

diff --git a/validate/gst/validate/gst-validate-utils.c b/validate/gst/validate/gst-validate-utils.c
index 82c42d4a2c..96fc0e48b8 100644
--- a/validate/gst/validate/gst-validate-utils.c
+++ b/validate/gst/validate/gst-validate-utils.c
@@ -532,11 +532,15 @@ _file_get_lines (GFile * file)
   gchar *content = NULL, *escaped_content = NULL, **lines = NULL;
 
   /* TODO Handle GCancellable */
-  if (!g_file_load_contents (file, NULL, &content, &size, NULL, &err))
-    goto failed;
-
-  if (g_strcmp0 (content, "") == 0)
-    goto failed;
+  if (!g_file_load_contents (file, NULL, &content, &size, NULL, &err)) {
+    GST_WARNING ("Failed to load contents: %d %s", err->code, err->message);
+    g_error_free (err);
+    return NULL;
+  }
+  if (g_strcmp0 (content, "") == 0) {
+    g_free (content);
+    return NULL;
+  }
 
   if (_clean_structs_lines == NULL)
     _clean_structs_lines =
@@ -549,29 +553,7 @@ _file_get_lines (GFile * file)
   lines = g_strsplit (escaped_content, "\n", 0);
   g_free (escaped_content);
 
-done:
-
   return lines;
-
-failed:
-  if (err) {
-    GST_WARNING ("Failed to load contents: %d %s", err->code, err->message);
-    g_error_free (err);
-  }
-
-  if (content)
-    g_free (content);
-  content = NULL;
-
-  if (escaped_content)
-    g_free (escaped_content);
-  escaped_content = NULL;
-
-  if (lines)
-    g_strfreev (lines);
-  lines = NULL;
-
-  goto done;
 }
 
 static gchar **