svn commit: samba r3671 - in branches/SAMBA_3_0/source/modules: .

[jra at samba.org]

Author: jra
Date: 2004-11-10 23:03:26 +0000 (Wed, 10 Nov 2004)
New Revision: 3671

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

Log:
More warning fixes from Rob Foehl <rwf at loonybin.net>.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/modules/vfs_cap.c
   branches/SAMBA_3_0/source/modules/vfs_shadow_copy.c


Changeset:
Modified: branches/SAMBA_3_0/source/modules/vfs_cap.c
===================================================================
--- branches/SAMBA_3_0/source/modules/vfs_cap.c	2004-11-10 23:02:48 UTC (rev 3670)
+++ branches/SAMBA_3_0/source/modules/vfs_cap.c	2004-11-10 23:03:26 UTC (rev 3671)
@@ -45,9 +45,9 @@
 	return SMB_VFS_NEXT_OPENDIR(handle, conn, capname);
 }
 
-static struct dirent *cap_readdir(vfs_handle_struct *handle, connection_struct *conn, DIR *dirp)
+static SMB_STRUCT_DIRENT *cap_readdir(vfs_handle_struct *handle, connection_struct *conn, DIR *dirp)
 {
-        struct dirent *result;
+        SMB_STRUCT_DIRENT *result;
 	DEBUG(3,("cap: cap_readdir\n"));
 	result = SMB_VFS_NEXT_READDIR(handle, conn, dirp);
 	if (result) {

Modified: branches/SAMBA_3_0/source/modules/vfs_shadow_copy.c
===================================================================
--- branches/SAMBA_3_0/source/modules/vfs_shadow_copy.c	2004-11-10 23:02:48 UTC (rev 3670)
+++ branches/SAMBA_3_0/source/modules/vfs_shadow_copy.c	2004-11-10 23:03:26 UTC (rev 3671)
@@ -59,7 +59,7 @@
 typedef struct {
 	int pos;
 	int num;
-	struct dirent *dirs;
+	SMB_STRUCT_DIRENT *dirs;
 } shadow_copy_Dir;
 
 static BOOL shadow_copy_match_name(const char *name)
@@ -92,8 +92,8 @@
 	ZERO_STRUCTP(dirp);
 
 	while (True) {
-		struct dirent *d;
-		struct dirent *r;
+		SMB_STRUCT_DIRENT *d;
+		SMB_STRUCT_DIRENT *r;
 
 
 		d = SMB_VFS_NEXT_READDIR(handle, conn, p);
@@ -108,7 +108,7 @@
 
 		DEBUG(10,("shadow_copy_opendir: not hide [%s]\n",d->d_name));
 
-		r = (struct dirent *)Realloc(dirp->dirs,(dirp->num+1)*sizeof(struct dirent));
+		r = (SMB_STRUCT_DIRENT *)Realloc(dirp->dirs,(dirp->num+1)*sizeof(SMB_STRUCT_DIRENT));
 		if (!r) {
 			DEBUG(0,("shadow_copy_opendir: Out of memory\n"));
 			break;
@@ -122,7 +122,7 @@
 	return((DIR *)dirp);
 }
 
-struct dirent *shadow_copy_readdir(vfs_handle_struct *handle, connection_struct *conn, DIR *_dirp)
+SMB_STRUCT_DIRENT *shadow_copy_readdir(vfs_handle_struct *handle, connection_struct *conn, DIR *_dirp)
 {
 	shadow_copy_Dir *dirp = (shadow_copy_Dir *)_dirp;
 
@@ -156,7 +156,7 @@
 
 	while (True) {
 		SHADOW_COPY_LABEL *tlabels;
-		struct dirent *d;
+		SMB_STRUCT_DIRENT *d;
 
 		d = SMB_VFS_NEXT_READDIR(handle, fsp->conn, p);
 		if (d == NULL) {