[gnome-commander/ConvertWarningsToErrors] plugins/fileroller/file-roller-plugin.cc: Fix gcc warnings about variable shadowing



commit 75ae3342453703a6aa8bd928a01632ccd30b836b
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Fri Apr 28 22:18:29 2017 +0200

    plugins/fileroller/file-roller-plugin.cc: Fix gcc warnings about variable shadowing

 plugins/fileroller/file-roller-plugin.cc |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/plugins/fileroller/file-roller-plugin.cc b/plugins/fileroller/file-roller-plugin.cc
index c3ae918..f96cf5d 100644
--- a/plugins/fileroller/file-roller-plugin.cc
+++ b/plugins/fileroller/file-roller-plugin.cc
@@ -201,15 +201,15 @@ inline void do_add_to_archive (const gchar *name, GnomeCmdState *state)
     for (files = state->active_dir_selected_files; files; files = files->next)
     {
         GnomeVFSURI *uri = GNOME_CMD_FILE_INFO (files->data)->uri;
-        gchar *uri_str = gnome_vfs_uri_to_string (uri, GNOME_VFS_URI_HIDE_PASSWORD);
-        gchar *path = gnome_vfs_get_local_path_from_uri (uri_str);
+        gchar *uri_str_file = gnome_vfs_uri_to_string (uri, GNOME_VFS_URI_HIDE_PASSWORD);
+        gchar *path = gnome_vfs_get_local_path_from_uri (uri_str_file);
         gchar *tmp = cmd;
-        gchar *arg = g_shell_quote (path);
-        cmd = g_strdup_printf ("%s %s", tmp, arg);
-        g_free (arg);
+        gchar *arg_file = g_shell_quote (path);
+        cmd = g_strdup_printf ("%s %s", tmp, arg_file);
+        g_free (arg_file);
         g_free (path);
         g_free (tmp);
-        g_free (uri_str);
+        g_free (uri_str_file);
     }
 
     g_printerr ("add: %s\n", cmd);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]