From 7a8ee799259c7c0e3d5d6b3d34ce05195f53d4cb Mon Sep 17 00:00:00 2001
From: Derrell Lipman <derrell@samba.org>
Date: Wed, 27 Apr 2005 14:05:02 +0000
Subject: r6501: correct deprecated lvalue casts in testsuite/libsmbclient
 (This used to be commit 6d22c3c3434812d3a6ab7f216bec34cdb3b622a0)

---
 examples/libsmbclient/testutime.c                | 3 ++-
 testsuite/libsmbclient/src/getdents/getdents_3.c | 4 ++--
 testsuite/libsmbclient/src/lseekdir/lseekdir_5.c | 2 +-
 testsuite/libsmbclient/src/lseekdir/lseekdir_6.c | 6 ++++--
 testsuite/libsmbclient/src/telldir/telldir_5.c   | 6 ++++--
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/examples/libsmbclient/testutime.c b/examples/libsmbclient/testutime.c
index 3a1540c654..e94777a0d6 100644
--- a/examples/libsmbclient/testutime.c
+++ b/examples/libsmbclient/testutime.c
@@ -16,6 +16,7 @@ int main(int argc, char * argv[])
     char            ctime[32];
     char            atime[32];
     char *          pSmbPath = NULL;
+    struct tm       tm;
     struct stat     st;
     struct utimbuf  utimbuf;
     
@@ -53,7 +54,7 @@ int main(int argc, char * argv[])
            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)
     {
diff --git a/testsuite/libsmbclient/src/getdents/getdents_3.c b/testsuite/libsmbclient/src/getdents/getdents_3.c
index 58c8f709a9..cea0ae21c4 100644
--- a/testsuite/libsmbclient/src/getdents/getdents_3.c
+++ b/testsuite/libsmbclient/src/getdents/getdents_3.c
@@ -135,8 +135,8 @@ int main(int argc, char** argv)
 
 			}
 
-			(char *)dirptr += direntsize;
-			(char *)diramount -= direntsize;
+			dirptr = (struct smbc_dirent *) ((char *) dirptr + direntsize);
+			diramount -= direntsize;
 			j++;
 
 		}
diff --git a/testsuite/libsmbclient/src/lseekdir/lseekdir_5.c b/testsuite/libsmbclient/src/lseekdir/lseekdir_5.c
index 08af806f5f..86b8e342d8 100644
--- a/testsuite/libsmbclient/src/lseekdir/lseekdir_5.c
+++ b/testsuite/libsmbclient/src/lseekdir/lseekdir_5.c
@@ -101,7 +101,7 @@ int main(int argc, char** argv)
 				break;
 			}
 
-			(char*)dirsize += dirptr->dirlen;
+			dirsize += dirptr->dirlen;
 
 		}
 		
diff --git a/testsuite/libsmbclient/src/lseekdir/lseekdir_6.c b/testsuite/libsmbclient/src/lseekdir/lseekdir_6.c
index 543cbafe14..25bbc8d9bd 100644
--- a/testsuite/libsmbclient/src/lseekdir/lseekdir_6.c
+++ b/testsuite/libsmbclient/src/lseekdir/lseekdir_6.c
@@ -102,7 +102,7 @@ int main(int argc, char** argv)
 				break;
 			}
 
-			(char*)dirsize += dirptr->dirlen;
+			dirsize += dirptr->dirlen;
 
 		}
 		
@@ -112,7 +112,9 @@ int main(int argc, char** argv)
 
 		if ( offset != dirsize )
 		{
-			/* printf("offset: %i dirsize: %i\n",offset,dirsize); */
+/*
+			printf("offset: %i dirsize: %i\n", offset, dirsize);
+*/
 			err = 1;
 		}	
 
diff --git a/testsuite/libsmbclient/src/telldir/telldir_5.c b/testsuite/libsmbclient/src/telldir/telldir_5.c
index 9172b2d1ab..f851e145e8 100644
--- a/testsuite/libsmbclient/src/telldir/telldir_5.c
+++ b/testsuite/libsmbclient/src/telldir/telldir_5.c
@@ -102,7 +102,7 @@ int main(int argc, char** argv)
 				break;
 			}
 
-			(char*)dirsize += dirptr->dirlen;
+			dirsize += dirptr->dirlen;
 
 		}
 		
@@ -110,7 +110,9 @@ int main(int argc, char** argv)
 
 		if ( offset != dirsize )
 		{
-			/* printf("offset: %i dirsize: %i\n",offset,dirsize); */
+/*
+                        printf("offset: %i dirsize: %i\n", offset, dirsize);
+*/
 			err = 1;
 		}	
 
-- 
cgit