svn commit: samba r10186 - in branches/SAMBA_3_0/source/smbd: .

jra at samba.org jra at samba.org
Mon Sep 12 21:47:42 GMT 2005


Author: jra
Date: 2005-09-12 21:47:42 +0000 (Mon, 12 Sep 2005)
New Revision: 10186

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

Log:
More 64-bit warning fixes.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/smbd/statcache.c
   branches/SAMBA_3_0/source/smbd/vfs-wrap.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/statcache.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/statcache.c	2005-09-12 21:40:40 UTC (rev 10185)
+++ branches/SAMBA_3_0/source/smbd/statcache.c	2005-09-12 21:47:42 UTC (rev 10186)
@@ -136,8 +136,8 @@
 	if (tdb_store_bystring(tdb_stat_cache, original_path, data_val, TDB_REPLACE) != 0) {
 		DEBUG(0,("stat_cache_add: Error storing entry %s -> %s\n", original_path, translated_path));
 	} else {
-		DEBUG(5,("stat_cache_add: Added entry (%x:size%x) %s -> %s\n",
-			(unsigned int)data_val.dptr, data_val.dsize, original_path, translated_path));
+		DEBUG(5,("stat_cache_add: Added entry (%lx:size%x) %s -> %s\n",
+			(unsigned long)data_val.dptr, (unsigned int)data_val.dsize, original_path, translated_path));
 	}
 
 	SAFE_FREE(original_path);

Modified: branches/SAMBA_3_0/source/smbd/vfs-wrap.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/vfs-wrap.c	2005-09-12 21:40:40 UTC (rev 10185)
+++ branches/SAMBA_3_0/source/smbd/vfs-wrap.c	2005-09-12 21:47:42 UTC (rev 10186)
@@ -1063,7 +1063,7 @@
 	return sys_aio_write(aiocb);
 }
 
-int vfswrap_aio_return(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb)
+ssize_t vfswrap_aio_return(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb)
 {
 	return sys_aio_return(aiocb);
 }



More information about the samba-cvs mailing list