r7902: Fix the build

(This used to be commit 6d431eb676e1df4cfdcbeaed5fa81adfbfc77325)

6 files changed, 30 insertions, 30 deletions

diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c
index 04d87c421f..d4420884dd 100644
--- a/source3/modules/vfs_catia.c
+++ b/source3/modules/vfs_catia.c
@@ -105,13 +105,13 @@ static int catia_open(vfs_handle_struct *handle, connection_struct *conn,
 }
 
 static int catia_rename(vfs_handle_struct *handle, connection_struct *conn,
-			const char *old, const char *new)
+			const char *oldname, const char *newname)
 {
         pstring oname, nname;
 
-        pstrcpy(oname, old);
+        pstrcpy(oname, oldname);
         to_unix(oname);
-        pstrcpy(nname, new);
+        pstrcpy(nname, newname);
         to_unix(nname);
 
         DEBUG(10, ("converted old name: %s\n", oname));
diff --git a/source3/torture/cmd_vfs.c b/source3/torture/cmd_vfs.c
index 132e0776ab..2c97748544 100644
--- a/source3/torture/cmd_vfs.c
+++ b/source3/torture/cmd_vfs.c
@@ -129,7 +129,7 @@ static NTSTATUS cmd_opendir(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc
 		return NT_STATUS_OK;
 	}
 
-	vfs->currentdir = SMB_VFS_OPENDIR(vfs->conn, argv[1]);
+	vfs->currentdir = SMB_VFS_OPENDIR(vfs->conn, argv[1], NULL, 0);
 	if (vfs->currentdir == NULL) {
 		printf("opendir error=%d (%s)\n", errno, strerror(errno));
 		return NT_STATUS_UNSUCCESSFUL;
@@ -142,7 +142,7 @@ static NTSTATUS cmd_opendir(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc
 
 static NTSTATUS cmd_readdir(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, const char **argv)
 {
-	struct dirent *dent;
+	SMB_STRUCT_DIRENT *dent;
 
 	if (vfs->currentdir == NULL) {
 		printf("readdir: error=-1 (no open directory)\n");
diff --git a/source3/torture/nbio.c b/source3/torture/nbio.c
index 16e0b4a191..e00fce02db 100644
--- a/source3/torture/nbio.c
+++ b/source3/torture/nbio.c
@@ -232,7 +232,7 @@ void nb_rename(const char *oldname, const char *newname)
 {
 	if (!cli_rename(c, oldname, newname)) {
 		printf("ERROR: rename %s %s failed (%s)\n", 
-		       old, new, cli_errstr(c));
+		       oldname, newname, cli_errstr(c));
 		exit(1);
 	}
 }
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index ef9497d9ad..f59da14b79 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -210,16 +210,16 @@ static BOOL check_error(int line, struct cli_state *c,
 			uint8 eclass, uint32 ecode, NTSTATUS nterr)
 {
         if (cli_is_dos_error(c)) {
-                uint8 class;
+                uint8 cclass;
                 uint32 num;
 
                 /* Check DOS error */
 
-                cli_dos_error(c, &class, &num);
+                cli_dos_error(c, &cclass, &num);
 
-                if (eclass != class || ecode != num) {
+                if (eclass != cclass || ecode != num) {
                         printf("unexpected error code class=%d code=%d\n", 
-                               (int)class, (int)num);
+                               (int)cclass, (int)num);
                         printf(" expected %d/%d %s (line=%d)\n", 
                                (int)eclass, (int)ecode, nt_errstr(nterr), line);
                         return False;
@@ -2114,7 +2114,7 @@ test how many open files this server supports on the one socket
 static BOOL run_maxfidtest(int dummy)
 {
 	struct cli_state *cli;
-	const char *template = "\\maxfid.%d.%d";
+	const char *ftemplate = "\\maxfid.%d.%d";
 	fstring fname;
 	int fnums[0x11000], i;
 	int retries=4;
@@ -2130,7 +2130,7 @@ static BOOL run_maxfidtest(int dummy)
 	cli_sockopt(cli, sockops);
 
 	for (i=0; i<0x11000; i++) {
-		slprintf(fname,sizeof(fname)-1,template, i,(int)getpid());
+		slprintf(fname,sizeof(fname)-1,ftemplate, i,(int)getpid());
 		if ((fnums[i] = cli_open(cli, fname, 
 					O_RDWR|O_CREAT|O_TRUNC, DENY_NONE)) ==
 		    -1) {
@@ -2146,7 +2146,7 @@ static BOOL run_maxfidtest(int dummy)
 
 	printf("cleaning up\n");
 	for (;i>=0;i--) {
-		slprintf(fname,sizeof(fname)-1,template, i,(int)getpid());
+		slprintf(fname,sizeof(fname)-1,ftemplate, i,(int)getpid());
 		cli_close(cli, fnums[i]);
 		if (!cli_unlink(cli, fname)) {
 			printf("unlink of %s failed (%s)\n", 
diff --git a/source3/ubiqx/debugparse.c b/source3/ubiqx/debugparse.c
index 195fc245bc..c5fe3e2ee8 100644
--- a/source3/ubiqx/debugparse.c
+++ b/source3/ubiqx/debugparse.c
@@ -262,16 +262,16 @@ void dbg_test( void )
   int  i;
   int  linecount  = 1;
   dbg_Token old   = dbg_null,
-            new   = dbg_null,
+            newtok= dbg_null,
             state = dbg_null;
 
   while( fgets( bufr, DBG_BSIZE, stdin ) )
     {
     for( i = 0; bufr[i]; i++ )
       {
-      old = new;
-      new = dbg_char2token( &state, bufr[i] );
-      switch( new )
+      old = newtok;
+      newtok = dbg_char2token( &state, bufr[i] );
+      switch( newtok )
         {
         case dbg_header:
           if( linecount > 1 )
@@ -283,8 +283,8 @@ void dbg_test( void )
         case dbg_ignore:
           break;
         default:
-          if( old != new )
-            (void)printf( "\n[%05d]%12s: ", linecount, dbg_token2string(new) );
+          if( old != newtok )
+            (void)printf( "\n[%05d]%12s: ", linecount, dbg_token2string(newtok) );
           (void)putchar( bufr[i] );
         }
       }
diff --git a/source3/utils/debug2html.c b/source3/utils/debug2html.c
index f9a1f43f46..bec4d81ae2 100644
--- a/source3/utils/debug2html.c
+++ b/source3/utils/debug2html.c
@@ -69,7 +69,7 @@
  * Functions...
  */
 
-static dbg_Token modechange( dbg_Token new, dbg_Token mode )
+static dbg_Token modechange( dbg_Token newmode, dbg_Token mode )
   /* ------------------------------------------------------------------------ **
    * Handle a switch between header and message printing.
    *
@@ -89,7 +89,7 @@ static dbg_Token modechange( dbg_Token new, dbg_Token mode )
    * ------------------------------------------------------------------------ **
    */
   {
-  switch( new )
+  switch( newmode )
     {
     case dbg_null:
     case dbg_ignore:
@@ -114,7 +114,7 @@ static dbg_Token modechange( dbg_Token new, dbg_Token mode )
   return( mode );
   } /* modechange */
 
-static void newblock( dbg_Token old, dbg_Token new )
+static void newblock( dbg_Token old, dbg_Token newtok )
   /* ------------------------------------------------------------------------ **
    * Handle the transition between tokens.
    *
@@ -147,7 +147,7 @@ static void newblock( dbg_Token old, dbg_Token new )
       break;
     }
 
-  switch( new )
+  switch( newtok )
     {
     case dbg_timestamp:
       (void)printf( "<B>[" );
@@ -223,7 +223,7 @@ int main( int argc, char *argv[] )
   int       len;
   char      bufr[DBG_BSIZE];
   dbg_Token old   = dbg_null,
-            new   = dbg_null,
+            newtok = dbg_null,
             state = dbg_null,
             mode  = dbg_null;
 
@@ -236,14 +236,14 @@ int main( int argc, char *argv[] )
     {
     for( i = 0; i < len; i++ )
       {
-      old = new;
-      new = dbg_char2token( &state, bufr[i] );
-      if( new != old )
+      old = newtok;
+      newtok = dbg_char2token( &state, bufr[i] );
+      if( newtok != old )
         {
-        mode = modechange( new, mode );
-        newblock( old, new );
+        mode = modechange( newtok, mode );
+        newblock( old, newtok );
         }
-      charprint( new, bufr[i] );
+      charprint( newtok, bufr[i] );
       }
     }
   (void)modechange( dbg_eof, mode );