[gnome-commander] src/gnome-cmd-smb-path.cc: Fix gcc warnings about variable shadowing
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] src/gnome-cmd-smb-path.cc: Fix gcc warnings about variable shadowing
- Date: Fri, 28 Apr 2017 21:45:44 +0000 (UTC)
commit 7cc19e33df48348bae59aaf28f8f919bd8e77af9
Author: Uwe Scholz <uwescholz src gnome org>
Date: Fri Apr 28 19:18:38 2017 +0200
src/gnome-cmd-smb-path.cc: Fix gcc warnings about variable shadowing
src/gnome-cmd-smb-path.cc | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/src/gnome-cmd-smb-path.cc b/src/gnome-cmd-smb-path.cc
index 2df0b9d..fa229d3 100644
--- a/src/gnome-cmd-smb-path.cc
+++ b/src/gnome-cmd-smb-path.cc
@@ -29,20 +29,20 @@
using namespace std;
-inline void GnomeCmdSmbPath::set_resources(const gchar *workgroup, const gchar *resource, const gchar *path)
+inline void GnomeCmdSmbPath::set_resources(const gchar *set_res_workgroup, const gchar *set_res_resource,
const gchar *set_res_path)
{
- this->workgroup = g_strdup (workgroup);
+ this->workgroup = g_strdup (set_res_workgroup);
- if (workgroup)
+ if (set_res_workgroup)
{
- if (resource)
+ if (set_res_resource)
{
- this->resource = g_strdup (resource);
- this->resource_path = g_strdup (path);
- this->path = g_strconcat (G_DIR_SEPARATOR_S, resource, path, NULL);
+ this->resource = g_strdup (set_res_resource);
+ this->resource_path = g_strdup (set_res_path);
+ this->path = g_strconcat (G_DIR_SEPARATOR_S, set_res_resource, set_res_path, NULL);
}
else
- this->path = g_strconcat (G_DIR_SEPARATOR_S, workgroup, NULL);
+ this->path = g_strconcat (G_DIR_SEPARATOR_S, set_res_workgroup, NULL);
}
else
this->path = g_strdup (G_DIR_SEPARATOR_S);
@@ -143,9 +143,9 @@ GnomeCmdPath *GnomeCmdSmbPath::get_parent()
}
-GnomeCmdSmbPath::GnomeCmdSmbPath(const gchar *workgroup, const gchar *resource, const gchar *resource_path):
resource(0), resource_path(0)
+GnomeCmdSmbPath::GnomeCmdSmbPath(const gchar *constr_workgroup, const gchar *constr_resource, const gchar
*constr_resource_path): resource(0), resource_path(0)
{
- set_resources(workgroup,resource,resource_path);
+ set_resources(constr_workgroup,constr_resource,constr_resource_path);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]