Changeset 14062 in vbox for trunk

Timestamp:

Nov 10, 2008 11:23:05 PM (16 years ago)

Author:

vboxsync

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

39118

Message:

RTDirRead/RTDirReadEx: sizes are size_t not unsigned.

Location:

trunk/src/VBox

Files:

• Devices/Storage/VBoxHDD-new.cpp (modified) (2 diffs)
• HostServices/SharedFolders/testcase/tstShflCase.cpp (modified) (2 diffs)
• HostServices/SharedFolders/vbsf.cpp (modified) (2 diffs)
• Runtime/r3/posix/dir-posix.cpp (modified) (4 diffs)
• Runtime/r3/win/dir-win.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp

@@ -691 +691 @@
 
         PRTDIRENTRYEX pPluginDirEntry = NULL;
-        unsigned cbPluginDirEntry = sizeof(RTDIRENTRY);
+        size_t cbPluginDirEntry = sizeof(RTDIRENTRY);
         pPluginDirEntry = (PRTDIRENTRYEX)RTMemAllocZ(sizeof(RTDIRENTRY));
         if (!pPluginDirEntry)
@@ -985 +985 @@
 
         PRTDIRENTRYEX pPluginDirEntry = NULL;
-        unsigned cbPluginDirEntry = sizeof(RTDIRENTRY);
+        size_t cbPluginDirEntry = sizeof(RTDIRENTRY);
         pPluginDirEntry = (PRTDIRENTRYEX)RTMemAllocZ(sizeof(RTDIRENTRY));
         if (!pPluginDirEntry)

trunk/src/VBox/HostServices/SharedFolders/testcase/tstShflCase.cpp

@@ -126 +126 @@
 }
 
-int rtDirReadEx(PRTDIR pDir, PRTDIRENTRYEX pDirEntry, unsigned *pcbDirEntry, RTFSOBJATTRADD enmAdditionalAttribs)
+int rtDirReadEx(PRTDIR pDir, PRTDIRENTRYEX pDirEntry, size_t *pcbDirEntry, RTFSOBJATTRADD enmAdditionalAttribs)
 {
     switch(iDirList)
@@ -226 +226 @@
     for(;;)
     {
-        uint32_t cbDirEntrySize = cbDirEntry;
+        size_t cbDirEntrySize = cbDirEntry;
 
         rc = RTDirReadEx(hSearch, pDirEntry, &cbDirEntrySize, RTFSOBJATTRADD_NOTHING);

trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp

@@ -135 +135 @@
     for(;;)
     {
-        uint32_t cbDirEntrySize = cbDirEntry;
+        size_t cbDirEntrySize = cbDirEntry;
 
         rc = RTDirReadEx(hSearch, pDirEntry, &cbDirEntrySize, RTFSOBJATTRADD_NOTHING);
@@ -1318 +1318 @@
     while(cbBufferOrg)
     {
-        uint32_t cbDirEntrySize = cbDirEntry;
+        size_t cbDirEntrySize = cbDirEntry;
         uint32_t cbNeeded;
 

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

@@ -274 +274 @@
 
 
-RTDECL(int) RTDirRead(PRTDIR pDir, PRTDIRENTRY pDirEntry, unsigned *pcbDirEntry)
+RTDECL(int) RTDirRead(PRTDIR pDir, PRTDIRENTRY pDirEntry, size_t *pcbDirEntry)
 {
     /*
@@ -283 +283 @@
     AssertMsgReturn(VALID_PTR(pDirEntry), ("%p\n", pDirEntry), VERR_INVALID_POINTER);
 
-    unsigned cbDirEntry = sizeof(*pDirEntry);
+    size_t cbDirEntry = sizeof(*pDirEntry);
     if (pcbDirEntry)
     {
         AssertMsgReturn(VALID_PTR(pcbDirEntry), ("%p\n", pcbDirEntry), VERR_INVALID_POINTER);
         cbDirEntry = *pcbDirEntry;
-        AssertMsgReturn(cbDirEntry >= (unsigned)RT_OFFSETOF(RTDIRENTRY, szName[2]),
+        AssertMsgReturn(cbDirEntry >= RT_UOFFSETOF(RTDIRENTRY, szName[2]),
                         ("Invalid *pcbDirEntry=%d (min %d)\n", *pcbDirEntry, RT_OFFSETOF(RTDIRENTRYEX, szName[2])),
                         VERR_INVALID_PARAMETER);
@@ -378 +378 @@
 
 
-RTDECL(int) RTDirReadEx(PRTDIR pDir, PRTDIRENTRYEX pDirEntry, unsigned *pcbDirEntry, RTFSOBJATTRADD enmAdditionalAttribs)
+RTDECL(int) RTDirReadEx(PRTDIR pDir, PRTDIRENTRYEX pDirEntry, size_t *pcbDirEntry, RTFSOBJATTRADD enmAdditionalAttribs)
 {
     /*
@@ -390 +390 @@
                     ("Invalid enmAdditionalAttribs=%p\n", enmAdditionalAttribs),
                     VERR_INVALID_PARAMETER);
-    unsigned cbDirEntry = sizeof(*pDirEntry);
+    size_t cbDirEntry = sizeof(*pDirEntry);
     if (pcbDirEntry)
     {

trunk/src/VBox/Runtime/r3/win/dir-win.cpp

@@ -240 +240 @@
 
 
-RTDECL(int) RTDirRead(PRTDIR pDir, PRTDIRENTRY pDirEntry, unsigned *pcbDirEntry)
+RTDECL(int) RTDirRead(PRTDIR pDir, PRTDIRENTRY pDirEntry, size_t *pcbDirEntry)
 {
     /*
@@ -255 +255 @@
         return VERR_INVALID_PARAMETER;
     }
-    unsigned cbDirEntry = sizeof(*pDirEntry);
+    size_t cbDirEntry = sizeof(*pDirEntry);
     if (pcbDirEntry)
     {
         cbDirEntry = *pcbDirEntry;
-        if (cbDirEntry < (unsigned)RT_OFFSETOF(RTDIRENTRY, szName[2]))
+        if (cbDirEntry < RT_UOFFSETOF(RTDIRENTRY, szName[2]))
         {
             AssertMsgFailed(("Invalid *pcbDirEntry=%d (min %d)\n", *pcbDirEntry, RT_OFFSETOF(RTDIRENTRY, szName[2])));
@@ -336 +336 @@
 
 
-RTDECL(int) RTDirReadEx(PRTDIR pDir, PRTDIRENTRYEX pDirEntry, unsigned *pcbDirEntry, RTFSOBJATTRADD enmAdditionalAttribs)
+RTDECL(int) RTDirReadEx(PRTDIR pDir, PRTDIRENTRYEX pDirEntry, size_t *pcbDirEntry, RTFSOBJATTRADD enmAdditionalAttribs)
 {
     /*
@@ -357 +357 @@
         return VERR_INVALID_PARAMETER;
     }
-    unsigned cbDirEntry = sizeof(*pDirEntry);
+    size_t cbDirEntry = sizeof(*pDirEntry);
     if (pcbDirEntry)
     {
         cbDirEntry = *pcbDirEntry;
-        if (cbDirEntry < (unsigned)RT_OFFSETOF(RTDIRENTRYEX, szName[2]))
+        if (cbDirEntry < RT_UOFFSETOF(RTDIRENTRYEX, szName[2]))
         {
             AssertMsgFailed(("Invalid *pcbDirEntry=%d (min %d)\n", *pcbDirEntry, RT_OFFSETOF(RTDIRENTRYEX, szName[2])));