diff options
| author | Jeremy Allison <jra@samba.org> | 2005-09-12 21:47:42 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:03:36 -0500 |
| commit | ab59cdc5803371faa7fd2d983f3dc796afceb007 (patch) | |
| tree | a24a6441aafd37da322e432c17e392ee867a5ecd | |
| parent | f1b1adc13612cbfeeb3286f7e3992911abed5dd2 (diff) | |
| download | samba-ab59cdc5803371faa7fd2d983f3dc796afceb007.tar.gz samba-ab59cdc5803371faa7fd2d983f3dc796afceb007.tar.bz2 samba-ab59cdc5803371faa7fd2d983f3dc796afceb007.zip | |
r10186: More 64-bit warning fixes.
Jeremy.
(This used to be commit 88034b9c2845a38833f300b812202c2a4ca3d2fd)
| -rw-r--r-- | source3/smbd/statcache.c | 4 | ||||
| -rw-r--r-- | source3/smbd/vfs-wrap.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c index 97ecd4152c..548d7c4a48 100644 --- a/source3/smbd/statcache.c +++ b/source3/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/source3/smbd/vfs-wrap.c b/source3/smbd/vfs-wrap.c index 2129cf8541..9ae1592a8e 100644 --- a/source3/smbd/vfs-wrap.c +++ b/source3/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); } |