s4: fixed some shadowed variable warnings
authorAndrew Tridgell <tridge@samba.org>
Tue, 8 Sep 2009 01:46:08 +0000 (11:46 +1000)
committerAndrew Tridgell <tridge@samba.org>
Tue, 8 Sep 2009 01:52:44 +0000 (11:52 +1000)
source4/ntvfs/cifs/vfs_cifs.c
source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c
source4/ntvfs/smb2/vfs_smb2.c

index 1cb6a46615a0f3b779b913074e4ca675b23c3d7a..ffcd5f13e4f66df8746b0af8843e606fb1d2cf91 100644 (file)
@@ -165,9 +165,9 @@ static NTSTATUS cvfs_connect(struct ntvfs_module_context *ntvfs,
        }
 
        if (strncmp(sharename, "\\\\", 2) == 0) {
-               char *p = strchr(sharename+2, '\\');
-               if (p) {
-                       sharename = p + 1;
+               char *str = strchr(sharename+2, '\\');
+               if (str) {
+                       sharename = str + 1;
                }
        }
 
index 7b7c17a9be1a1e5019e77a8f91aa9c478a6050c8..4e67b22e2323da7e9da0299e55bf40d0c6d7a94d 100644 (file)
@@ -71,9 +71,9 @@ static NTSTATUS cifspsx_connect(struct ntvfs_module_context *ntvfs,
        }
 
        if (strncmp(sharename, "\\\\", 2) == 0) {
-               char *p = strchr(sharename+2, '\\');
-               if (p) {
-                       sharename = p + 1;
+               char *str = strchr(sharename+2, '\\');
+               if (str) {
+                       sharename = str + 1;
                }
        }
 
index 6fc0d42b025bf27b46fe7b63233390b44233b096..ff02eed994318b0931f38a08f12f12e5f8b368d6 100644 (file)
@@ -182,9 +182,9 @@ static NTSTATUS cvfs_connect(struct ntvfs_module_context *ntvfs,
        }
 
        if (strncmp(sharename, "\\\\", 2) == 0) {
-               char *p = strchr(sharename+2, '\\');
-               if (p) {
-                       sharename = p + 1;
+               char *str = strchr(sharename+2, '\\');
+               if (str) {
+                       sharename = str + 1;
                }
        }