Changeset 2974 for trunk/kLdr/kLdrRdrFile.c

Timestamp:

Feb 14, 2007, 11:12:44 AM (19 years ago)

Author:

bird

Message:

off_t -> KLDRFOFF.

File:

• trunk/kLdr/kLdrRdrFile.c (modified) (11 diffs)

trunk/kLdr/kLdrRdrFile.c

@@ -207 +207 @@
 #endif
     /** The current file offset. */
-    off_t               off;
+    KLDRFOFF            off;
     /** The file size. */
-    off_t               cb;
+    KLDRFOFF            cb;
     /** Array where we stuff the mapping area data. */
     KLDRRDRFILEPREP     aPreps[4];
@@ -237 +237 @@
 static size_t   kldrRdrFilePageSize(PKLDRRDR pRdr);
 static const char *kldrRdrFileName(PKLDRRDR pRdr);
-static off_t    kldrRdrFileTell(PKLDRRDR pRdr);
-static off_t    kldrRdrFileSize(PKLDRRDR pRdr);
+static KLDRFOFF kldrRdrFileTell(PKLDRRDR pRdr);
+static KLDRFOFF kldrRdrFileSize(PKLDRRDR pRdr);
 static int      kldrRdrFileAllUnmap(PKLDRRDR pRdr, const void *pvBits);
 static int      kldrRdrFileAllMap(PKLDRRDR pRdr, const void **ppvBits);
-static int      kldrRdrFileRead(PKLDRRDR pRdr, void *pvBuf, size_t cb, off_t off);
+static int      kldrRdrFileRead(PKLDRRDR pRdr, void *pvBuf, size_t cb, KLDRFOFF off);
 static int      kldrRdrFileDestroy(PKLDRRDR pRdr);
 static int      kldrRdrFileCreate(PPKLDRRDR ppRdr, const char *pszFilename);
@@ -836 +836 @@
 
 /** @copydoc KLDRRDR::pfnTell */
-static off_t kldrRdrFileTell(PKLDRRDR pRdr)
+static KLDRFOFF kldrRdrFileTell(PKLDRRDR pRdr)
 {
     PKLDRRDRFILE pRdrFile = (PKLDRRDRFILE)pRdr;
@@ -862 +862 @@
         if (rc)
             return -1;
-        pRdrFile->off = ((off_t)offHigh << 32) | offLow;
+        pRdrFile->off = ((KLDRFOFF)offHigh << 32) | offLow;
 
 #else
@@ -873 +873 @@
 
 /** @copydoc KLDRRDR::pfnSize */
-static off_t kldrRdrFileSize(PKLDRRDR pRdr)
+static KLDRFOFF kldrRdrFileSize(PKLDRRDR pRdr)
 {
     PKLDRRDRFILE pRdrFile = (PKLDRRDRFILE)pRdr;
@@ -915 +915 @@
     {
         int rc;
-        off_t cb = pRdrFile->Core.pOps->pfnSize(pRdr);
+        KLDRFOFF cb = pRdrFile->Core.pOps->pfnSize(pRdr);
 
         pRdrFile->pvMapping = kldrHlpAlloc(cb);
@@ -941 +941 @@
 
 /** @copydoc KLDRRDR::pfnRead */
-static int kldrRdrFileRead(PKLDRRDR pRdr, void *pvBuf, size_t cb, off_t off)
+static int kldrRdrFileRead(PKLDRRDR pRdr, void *pvBuf, size_t cb, KLDRFOFF off)
 {
     PKLDRRDRFILE pRdrFile = (PKLDRRDRFILE)pRdr;
@@ -965 +965 @@
         LONG offLow;
 
-        offHigh = sizeof(off_t) == 4 ? 0 : (off >> 32);
+        offHigh = sizeof(KLDRFOFF) == 4 ? 0 : (off >> 32);
         offLow = SetFilePointer(pRdrFile->File, (LONG)off, &offHigh, FILE_BEGIN);
         if (    offLow != (LONG)off
-            ||  offHigh != (LONG)(sizeof(off_t) == 4 ? 0 : (off >> 32)))
+            ||  offHigh != (LONG)(sizeof(KLDRFOFF) == 4 ? 0 : (off >> 32)))
         {
             int rc = GetLastError();
@@ -1070 +1070 @@
     APIRET          rc;
     HFILE           File = 0;
-    off_t           cb;
+    KLDRFOFF        cb;
     char            szFilename[CCHMAXPATH];
 
@@ -1109 +1109 @@
     int                 rc;
     HANDLE              File;
-    off_t               cb;
+    KLDRFOFF            cb;
     char                szFilename[MAX_PATH];
 
@@ -1134 +1134 @@
         return rc;
     }
-    if (sizeof(off_t) == 4)
+    if (sizeof(KLDRFOFF) == 4)
         cb = High ? 0x7fffffff : Low;
     else
-        cb = ((off_t)High << 32) | Low;
+        cb = ((KLDRFOFF)High << 32) | Low;
 
 #else