[gnome-commander/Implement_CppCheck_suggestions] Rename variable to fix shadow warning



commit 29af0de632e7006ae39774f1d0a8f436eda4db90
Author: Uwe Scholz <u scholz83 gmx de>
Date:   Wed Mar 20 23:25:58 2019 +0100

    Rename variable to fix shadow warning

 src/gnome-cmd-con.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/gnome-cmd-con.cc b/src/gnome-cmd-con.cc
index 8c59fbba..845723a6 100644
--- a/src/gnome-cmd-con.cc
+++ b/src/gnome-cmd-con.cc
@@ -586,9 +586,9 @@ std::string &gnome_cmd_con_make_smb_uri (std::string &s, gboolean use_auth, std:
     if (!domain.empty())
         user = domain + ';' + user;
 
-    const gchar *join = !folder.empty() && folder[0] != '/' ? "/" : "";
+    const gchar *joinSign = !folder.empty() && folder[0] != '/' ? "/" : "";
 
-    folder = share + join + folder;
+    folder = share + joinSign + folder;
     folder = stringify (gnome_vfs_escape_path_string (folder.c_str()));
 
     s = "smb://";


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