Changeset 4372 in vbox for trunk/src/VBox/Runtime

Timestamp:

Aug 24, 2007 9:21:51 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

23921

Message:

Finally corrected the RTFileRead, RTFileReadAt, RTFileWrite and RTFileWriteAt APIs to size_t. This was long overdue.

Location:

trunk/src/VBox/Runtime

Files:

• fileio.cpp (modified) (2 diffs)
• r3/posix/fileio-posix.cpp (modified) (3 diffs)
• r3/win32/fileio-win32.cpp (modified) (2 diffs)
• testcase/tstFile.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/fileio.cpp

@@ -154 +154 @@
  *                      If NULL an error will be returned for a partial read.
  */
-RTR3DECL(int)  RTFileReadAt(RTFILE File, RTFOFF off, void *pvBuf, unsigned cbToRead, unsigned *pcbRead)
+RTR3DECL(int)  RTFileReadAt(RTFILE File, RTFOFF off, void *pvBuf, size_t cbToRead, size_t *pcbRead)
 {
     int rc = RTFileSeek(File, off, RTFILE_SEEK_BEGIN, NULL);
@@ -175 +175 @@
  *                      If NULL an error will be returned for a partial write.
  */
-RTR3DECL(int)  RTFileWriteAt(RTFILE File, RTFOFF off, const void *pvBuf, unsigned cbToWrite, unsigned *pcbWritten)
+RTR3DECL(int)  RTFileWriteAt(RTFILE File, RTFOFF off, const void *pvBuf, size_t cbToWrite, size_t *pcbWritten)
 {
     int rc = RTFileSeek(File, off, RTFILE_SEEK_BEGIN, NULL);

trunk/src/VBox/Runtime/r3/posix/fileio-posix.cpp

@@ -254 +254 @@
 
 
-RTR3DECL(int)  RTFileRead(RTFILE File, void *pvBuf, unsigned cbToRead, unsigned *pcbRead)
+RTR3DECL(int)  RTFileRead(RTFILE File, void *pvBuf, size_t cbToRead, size_t *pcbRead)
 {
     if (cbToRead <= 0)
@@ -278 +278 @@
                     if (cbReadPart == 0)
                         return VERR_EOF;
-                    else
-                        return RTErrConvertFromErrno(errno);
+                    return RTErrConvertFromErrno(errno);
                 }
                 cbRead += cbReadPart;
@@ -291 +290 @@
 
 
-RTR3DECL(int)  RTFileWrite(RTFILE File, const void *pvBuf, unsigned cbToWrite, unsigned *pcbWritten)
+RTR3DECL(int)  RTFileWrite(RTFILE File, const void *pvBuf, size_t cbToWrite, size_t *pcbWritten)
 {
     if (cbToWrite <= 0)

trunk/src/VBox/Runtime/r3/win32/fileio-win32.cpp

@@ -284 +284 @@
 
 
-RTR3DECL(int)  RTFileRead(RTFILE File, void *pvBuf, unsigned cbToRead, unsigned *pcbRead)
+RTR3DECL(int)  RTFileRead(RTFILE File, void *pvBuf, size_t cbToRead, size_t *pcbRead)
 {
     if (cbToRead <= 0)
@@ -314 +314 @@
 
 
-RTR3DECL(int)  RTFileWrite(RTFILE File, const void *pvBuf, unsigned cbToWrite, unsigned *pcbWritten)
+RTR3DECL(int)  RTFileWrite(RTFILE File, const void *pvBuf, size_t cbToWrite, size_t *pcbWritten)
 {
     if (cbToWrite <= 0)

trunk/src/VBox/Runtime/testcase/tstFile.cpp

@@ -75 +75 @@
         }
         static const char szTestBuf[] = "Sausages and bacon for breakfast again!";
-        unsigned cbWritten = 0;
+        size_t cbWritten = 0;
         while (cbWritten < sizeof(szTestBuf))
         {
-            unsigned cbWrittenPart;
+            size_t cbWrittenPart;
             rc = RTFileWrite(File, &szTestBuf[cbWritten], sizeof(szTestBuf) - cbWritten, &cbWrittenPart);
             if (RT_FAILURE(rc))
@@ -101 +101 @@
             {
                 char        szReadBuf[sizeof(szTestBuf)];
-                unsigned    cbRead = 0;
+                size_t      cbRead = 0;
                 while (cbRead < sizeof(szTestBuf))
                 {
-                    unsigned cbReadPart;
+                    size_t cbReadPart;
                     rc = RTFileRead(File, &szReadBuf[cbRead], sizeof(szTestBuf) - cbRead, &cbReadPart);
                     if (RT_FAILURE(rc))
@@ -147 +147 @@
             else
             {
-                unsigned cbWritten = 0;
+                size_t cbWritten = 0;
                 while (cbWritten < sizeof(szTestBuf))
                 {
-                    unsigned cbWrittenPart;
+                    size_t cbWrittenPart;
                     rc = RTFileWrite(File, &szTestBuf[cbWritten], sizeof(szTestBuf) - cbWritten, &cbWrittenPart);
                     if (RT_FAILURE(rc))
@@ -172 +172 @@
                     {
                         char        szReadBuf[sizeof(szTestBuf)];
-                        unsigned    cbRead = 0;
+                        size_t      cbRead = 0;
                         while (cbRead < sizeof(szTestBuf))
                         {
-                            unsigned cbReadPart;
+                            size_t cbReadPart;
                             rc = RTFileRead(File, &szReadBuf[cbRead], sizeof(szTestBuf) - cbRead, &cbReadPart);
                             if (RT_FAILURE(rc))