clitar.c: #ifdef'ed out all the bits that were giving 'defined but not used'

          messages.
nttrans.c: More updates.
smb.h: Removed stuff that didn't belong in the smb_passwd struct. Persuaded Luke
       to use a new structure.
web/swat.c: Fixed gcc complaints about shadowing global 'string'.
Jeremy.
(This used to be commit 61c1dbb9785ed1e6fe40f93c7cc65024884df6f5)

1 files changed, 5 insertions, 5 deletions

diff --git a/source3/web/swat.c b/source3/web/swat.c
index e95ac5abd4..b96c7d0ec7 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -48,16 +48,16 @@ int i;
 	return(i);
 }
 
-static char *fix_backslash(char *string)
+static char *fix_backslash(char *str)
 {
 static char newstring[1024];
 char *p = newstring;
 
 	*p = '\0';
-        while (*string) {
-                if (*string == '\\') {*p++ = '\\';*p++ = '\\';}
-                else *p++ = *string;
-                ++string;
+        while (*str) {
+                if (*str == '\\') {*p++ = '\\';*p++ = '\\';}
+                else *p++ = *str;
+                ++str;
                 *p = '\0';
         }
 	return newstring;