[gnome-commander: 150/170] Moved free- and unref statements up, variable renaming

[Uwe Scholz <uwescholz src gnome org>]

commit bce96af52630d7f14fe3c3dd3af7d9de5dfc6f9f
Author: Uwe Scholz <u scholz83 gmx de>
Date:   Wed Jul 15 21:44:39 2020 +0200

    Moved free- and unref statements up, variable renaming

 src/gnome-cmd-dir.cc | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)
---
diff --git a/src/gnome-cmd-dir.cc b/src/gnome-cmd-dir.cc
index c207db18..9f3ee0b9 100644
--- a/src/gnome-cmd-dir.cc
+++ b/src/gnome-cmd-dir.cc
@@ -301,28 +301,27 @@ GnomeCmdDir *gnome_cmd_dir_new (GnomeCmdCon *con, GnomeCmdPath *path)
     g_return_val_if_fail (GNOME_CMD_IS_CON (con), nullptr);
     g_return_val_if_fail (path!=nullptr, nullptr);
 
-    GnomeVFSURI *uri = gnome_cmd_con_create_uri (con, path);
-    if (!uri) return nullptr;
+    auto gnomeVFSUri = gnome_cmd_con_create_uri (con, path);
+    if (!gnomeVFSUri) return nullptr;
 
-    gchar *uri_str = gnome_vfs_uri_to_string (uri, GNOME_VFS_URI_HIDE_PASSWORD);
+    gchar *uri_str = gnome_vfs_uri_to_string (gnomeVFSUri, GNOME_VFS_URI_HIDE_PASSWORD);
 
     GnomeCmdDir *dir = gnome_cmd_con_cache_lookup (con, uri_str);
+    g_free (uri_str);
     if (dir)
     {
-        g_free (uri_str);
         return dir;
     }
 
-    GnomeVFSFileInfoOptions infoOpts = (GnomeVFSFileInfoOptions) (GNOME_VFS_FILE_INFO_FOLLOW_LINKS |
-                                                                  GNOME_VFS_FILE_INFO_GET_MIME_TYPE |
-                                                                  GNOME_VFS_FILE_INFO_FORCE_FAST_MIME_TYPE);
-    GnomeVFSFileInfo *info = gnome_vfs_file_info_new ();
-    GnomeVFSResult res = gnome_vfs_get_file_info_uri (uri, info, infoOpts);
+    auto infoOpts = (GnomeVFSFileInfoOptions) (GNOME_VFS_FILE_INFO_FOLLOW_LINKS | 
GNOME_VFS_FILE_INFO_GET_MIME_TYPE | GNOME_VFS_FILE_INFO_FORCE_FAST_MIME_TYPE);
+    auto gnomeVFSFileInfo = gnome_vfs_file_info_new ();
+    auto gnomeVFSResult = gnome_vfs_get_file_info_uri (gnomeVFSUri, gnomeVFSFileInfo, infoOpts);
+    gnome_vfs_uri_unref (gnomeVFSUri);
 
-    if (res == GNOME_VFS_OK)
+    if (gnomeVFSResult == GNOME_VFS_OK)
     {
         dir = static_cast<GnomeCmdDir*> (g_object_new (GNOME_CMD_TYPE_DIR, nullptr));
-        gnome_cmd_file_setup (GNOME_CMD_FILE (dir), info, nullptr);
+        gnome_cmd_file_setup (GNOME_CMD_FILE (dir), gnomeVFSFileInfo, nullptr);
 
         dir->priv->con = con;
         gnome_cmd_dir_set_path (dir, path);
@@ -332,13 +331,10 @@ GnomeCmdDir *gnome_cmd_dir_new (GnomeCmdCon *con, GnomeCmdPath *path)
     }
     else
     {
-        gnome_cmd_show_message (*main_win, path->get_display_path(), gnome_vfs_result_to_string (res));
-        gnome_vfs_file_info_unref (info);
+        gnome_cmd_show_message (*main_win, path->get_display_path(), gnome_vfs_result_to_string 
(gnomeVFSResult));
+        gnome_vfs_file_info_unref (gnomeVFSFileInfo);
     }
 
-    gnome_vfs_uri_unref (uri);
-    g_free (uri_str);
-
     return dir;
 }