svn commit: samba r6501 - in branches/SAMBA_3_0: examples/libsmbclient testsuite/libsmbclient/src/getdents testsuite/libsmbclient/src/lseekdir testsuite/libsmbclient/src/telldir

[derrell at samba.org]

Author: derrell
Date: 2005-04-27 14:05:02 +0000 (Wed, 27 Apr 2005)
New Revision: 6501

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6501

Log:
correct deprecated lvalue casts in testsuite/libsmbclient
Modified:
   branches/SAMBA_3_0/examples/libsmbclient/testutime.c
   branches/SAMBA_3_0/testsuite/libsmbclient/src/getdents/getdents_3.c
   branches/SAMBA_3_0/testsuite/libsmbclient/src/lseekdir/lseekdir_5.c
   branches/SAMBA_3_0/testsuite/libsmbclient/src/lseekdir/lseekdir_6.c
   branches/SAMBA_3_0/testsuite/libsmbclient/src/telldir/telldir_5.c


Changeset:
Modified: branches/SAMBA_3_0/examples/libsmbclient/testutime.c
===================================================================
--- branches/SAMBA_3_0/examples/libsmbclient/testutime.c	2005-04-27 03:45:13 UTC (rev 6500)
+++ branches/SAMBA_3_0/examples/libsmbclient/testutime.c	2005-04-27 14:05:02 UTC (rev 6501)
@@ -16,6 +16,7 @@
     char            ctime[32];
     char            atime[32];
     char *          pSmbPath = NULL;
+    struct tm       tm;
     struct stat     st;
     struct utimbuf  utimbuf;
     
@@ -53,7 +54,7 @@
            st.st_ctime, ctime_r(&st.st_ctime, ctime),
            st.st_atime, ctime_r(&st.st_atime, atime)); 
     
-    utimbuf.actime = st.st_atime - 120;  /* unchangable.  this one wont change */
+    utimbuf.actime = st.st_atime - 120;  /* unchangable (wont change) */
     utimbuf.modtime = st.st_mtime - 120; /* this one should succeed */
     if (smbc_utime(pSmbPath, &utimbuf) < 0)
     {

Modified: branches/SAMBA_3_0/testsuite/libsmbclient/src/getdents/getdents_3.c
===================================================================
--- branches/SAMBA_3_0/testsuite/libsmbclient/src/getdents/getdents_3.c	2005-04-27 03:45:13 UTC (rev 6500)
+++ branches/SAMBA_3_0/testsuite/libsmbclient/src/getdents/getdents_3.c	2005-04-27 14:05:02 UTC (rev 6501)
@@ -135,8 +135,8 @@
 
 			}
 
-			(char *)dirptr += direntsize;
-			(char *)diramount -= direntsize;
+			dirptr = (struct smbc_dirent *) ((char *) dirptr + direntsize);
+			diramount -= direntsize;
 			j++;
 
 		}

Modified: branches/SAMBA_3_0/testsuite/libsmbclient/src/lseekdir/lseekdir_5.c
===================================================================
--- branches/SAMBA_3_0/testsuite/libsmbclient/src/lseekdir/lseekdir_5.c	2005-04-27 03:45:13 UTC (rev 6500)
+++ branches/SAMBA_3_0/testsuite/libsmbclient/src/lseekdir/lseekdir_5.c	2005-04-27 14:05:02 UTC (rev 6501)
@@ -101,7 +101,7 @@
 				break;
 			}
 
-			(char*)dirsize += dirptr->dirlen;
+			dirsize += dirptr->dirlen;
 
 		}
 		

Modified: branches/SAMBA_3_0/testsuite/libsmbclient/src/lseekdir/lseekdir_6.c
===================================================================
--- branches/SAMBA_3_0/testsuite/libsmbclient/src/lseekdir/lseekdir_6.c	2005-04-27 03:45:13 UTC (rev 6500)
+++ branches/SAMBA_3_0/testsuite/libsmbclient/src/lseekdir/lseekdir_6.c	2005-04-27 14:05:02 UTC (rev 6501)
@@ -102,7 +102,7 @@
 				break;
 			}
 
-			(char*)dirsize += dirptr->dirlen;
+			dirsize += dirptr->dirlen;
 
 		}
 		
@@ -112,7 +112,9 @@
 
 		if ( offset != dirsize )
 		{
-			/* printf("offset: %i dirsize: %i\n",offset,dirsize); */
+/*
+			printf("offset: %i dirsize: %i\n", offset, dirsize);
+*/
 			err = 1;
 		}	
 

Modified: branches/SAMBA_3_0/testsuite/libsmbclient/src/telldir/telldir_5.c
===================================================================
--- branches/SAMBA_3_0/testsuite/libsmbclient/src/telldir/telldir_5.c	2005-04-27 03:45:13 UTC (rev 6500)
+++ branches/SAMBA_3_0/testsuite/libsmbclient/src/telldir/telldir_5.c	2005-04-27 14:05:02 UTC (rev 6501)
@@ -102,7 +102,7 @@
 				break;
 			}
 
-			(char*)dirsize += dirptr->dirlen;
+			dirsize += dirptr->dirlen;
 
 		}
 		
@@ -110,7 +110,9 @@
 
 		if ( offset != dirsize )
 		{
-			/* printf("offset: %i dirsize: %i\n",offset,dirsize); */
+/*
+                        printf("offset: %i dirsize: %i\n", offset, dirsize);
+*/
 			err = 1;
 		}