From 50b16891c4e557d80fd4bfd858660e7331be2d3e Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 8 Sep 2009 11:46:08 +1000 Subject: [PATCH] s4: fixed some shadowed variable warnings --- source4/ntvfs/cifs/vfs_cifs.c | 6 +++--- source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c | 6 +++--- source4/ntvfs/smb2/vfs_smb2.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c index 1cb6a46615a..ffcd5f13e4f 100644 --- a/source4/ntvfs/cifs/vfs_cifs.c +++ b/source4/ntvfs/cifs/vfs_cifs.c @@ -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; } } diff --git a/source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c b/source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c index 7b7c17a9be1..4e67b22e232 100644 --- a/source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c +++ b/source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c @@ -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; } } diff --git a/source4/ntvfs/smb2/vfs_smb2.c b/source4/ntvfs/smb2/vfs_smb2.c index 6fc0d42b025..ff02eed9943 100644 --- a/source4/ntvfs/smb2/vfs_smb2.c +++ b/source4/ntvfs/smb2/vfs_smb2.c @@ -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; } } -- 2.11.4.GIT