DEVEL15-tiger-fix-largefile-20060820

FIXES 37890

don't make uio offset an int.
at the same time, fix resid similarly, and fix osi_file.c to accomodate that

(cherry picked from commit b6f97376880bb38463b372d92b09a977957e0872)

diff --git a/src/afs/DARWIN/osi_file.c b/src/afs/DARWIN/osi_file.c
index 7d8fc61..c5b4a60 100644 (file)
--- a/src/afs/DARWIN/osi_file.c
+++ b/src/afs/DARWIN/osi_file.c
@@ -292,7 +292,7 @@ afs_osi_Read(register struct osi_file *afile, int offset, void *aptr,
             afs_int32 asize)
 {
     struct AFS_UCRED *oldCred;
-    unsigned int resid;
+    afs_size_t resid;
     register afs_int32 code;
 #ifdef AFS_DARWIN80_ENV
     uio_t uio;
@@ -343,7 +343,7 @@ afs_osi_Write(register struct osi_file *afile, afs_int32 offset, void *aptr,
              afs_int32 asize)
 {
     struct AFS_UCRED *oldCred;
-    unsigned int resid;
+    afs_size_t resid;
     register afs_int32 code;
 #ifdef AFS_DARWIN80_ENV
     uio_t uio;

diff --git a/src/afs/afs_osi.h b/src/afs/afs_osi.h
index c8228f1..e65cb28 100644 (file)
--- a/src/afs/afs_osi.h
+++ b/src/afs/afs_osi.h
@@ -397,8 +397,8 @@ typedef struct timeval osi_timeval_t;
 #endif /* AFS_GLOBAL_SUNLOCK */
 
 #ifdef AFS_DARWIN80_ENV
-#define AFS_UIO_OFFSET(uio) (int)uio_offset(uio)
-#define AFS_UIO_RESID(uio) (int)uio_resid(uio)
+#define AFS_UIO_OFFSET(uio) uio_offset(uio)
+#define AFS_UIO_RESID(uio) uio_resid(uio)
 #define AFS_UIO_SETOFFSET(uio, off) uio_setoffset(uio, off)
 #define AFS_UIO_SETRESID(uio, val) uio_setresid(uio, val)
 #else