summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-09-12 21:47:42 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:03:36 -0500
commit88034b9c2845a38833f300b812202c2a4ca3d2fd (patch)
tree64f43c6577d569c96b31abedbe62a180280a291f
parentaa882646854325aa201b66d0ba27026946ce8dcb (diff)
downloadsamba-88034b9c2845a38833f300b812202c2a4ca3d2fd.tar.gz
samba-88034b9c2845a38833f300b812202c2a4ca3d2fd.tar.xz
samba-88034b9c2845a38833f300b812202c2a4ca3d2fd.zip
r10186: More 64-bit warning fixes.
Jeremy.
-rw-r--r--source/smbd/statcache.c4
-rw-r--r--source/smbd/vfs-wrap.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/source/smbd/statcache.c b/source/smbd/statcache.c
index 97ecd4152c8..548d7c4a487 100644
--- a/source/smbd/statcache.c
+++ b/source/smbd/statcache.c
@@ -136,8 +136,8 @@ void stat_cache_add( const char *full_orig_name, const char *orig_translated_pat
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);
diff --git a/source/smbd/vfs-wrap.c b/source/smbd/vfs-wrap.c
index 2129cf85417..9ae1592a8e1 100644
--- a/source/smbd/vfs-wrap.c
+++ b/source/smbd/vfs-wrap.c
@@ -1063,7 +1063,7 @@ int vfswrap_aio_write(struct vfs_handle_struct *handle, struct files_struct *fsp
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);
}