VirtualBox

Changeset 14062

Show
Ignore:
Timestamp:
11/11/08 00:23:05 (2 months ago)
Author:
vboxsync
Message:

RTDirRead/RTDirReadEx: sizes are size_t not unsigned.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r13580 r14062  
    691691 
    692692        PRTDIRENTRYEX pPluginDirEntry = NULL; 
    693         unsigned cbPluginDirEntry = sizeof(RTDIRENTRY); 
     693        size_t cbPluginDirEntry = sizeof(RTDIRENTRY); 
    694694        pPluginDirEntry = (PRTDIRENTRYEX)RTMemAllocZ(sizeof(RTDIRENTRY)); 
    695695        if (!pPluginDirEntry) 
    …… 
    985985 
    986986        PRTDIRENTRYEX pPluginDirEntry = NULL; 
    987         unsigned cbPluginDirEntry = sizeof(RTDIRENTRY); 
     987        size_t cbPluginDirEntry = sizeof(RTDIRENTRY); 
    988988        pPluginDirEntry = (PRTDIRENTRYEX)RTMemAllocZ(sizeof(RTDIRENTRY)); 
    989989        if (!pPluginDirEntry) 

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

    r13835 r14062  
    126126} 
    127127 
    128 int rtDirReadEx(PRTDIR pDir, PRTDIRENTRYEX pDirEntry, unsigned *pcbDirEntry, RTFSOBJATTRADD enmAdditionalAttribs) 
     128int rtDirReadEx(PRTDIR pDir, PRTDIRENTRYEX pDirEntry, size_t *pcbDirEntry, RTFSOBJATTRADD enmAdditionalAttribs) 
    129129{ 
    130130    switch(iDirList) 
    …… 
    226226    for(;;) 
    227227    { 
    228         uint32_t cbDirEntrySize = cbDirEntry; 
     228        size_t cbDirEntrySize = cbDirEntry; 
    229229 
    230230        rc = RTDirReadEx(hSearch, pDirEntry, &cbDirEntrySize, RTFSOBJATTRADD_NOTHING); 

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

    r13838 r14062  
    135135    for(;;) 
    136136    { 
    137         uint32_t cbDirEntrySize = cbDirEntry; 
     137        size_t cbDirEntrySize = cbDirEntry; 
    138138 
    139139        rc = RTDirReadEx(hSearch, pDirEntry, &cbDirEntrySize, RTFSOBJATTRADD_NOTHING); 
    …… 
    13181318    while(cbBufferOrg) 
    13191319    { 
    1320         uint32_t cbDirEntrySize = cbDirEntry; 
     1320        size_t cbDirEntrySize = cbDirEntry; 
    13211321        uint32_t cbNeeded; 
    13221322 

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

    r9355 r14062  
    274274 
    275275 
    276 RTDECL(int) RTDirRead(PRTDIR pDir, PRTDIRENTRY pDirEntry, unsigned *pcbDirEntry) 
     276RTDECL(int) RTDirRead(PRTDIR pDir, PRTDIRENTRY pDirEntry, size_t *pcbDirEntry) 
    277277{ 
    278278    /* 
    …… 
    283283    AssertMsgReturn(VALID_PTR(pDirEntry), ("%p\n", pDirEntry), VERR_INVALID_POINTER); 
    284284 
    285     unsigned cbDirEntry = sizeof(*pDirEntry); 
     285    size_t cbDirEntry = sizeof(*pDirEntry); 
    286286    if (pcbDirEntry) 
    287287    { 
    288288        AssertMsgReturn(VALID_PTR(pcbDirEntry), ("%p\n", pcbDirEntry), VERR_INVALID_POINTER); 
    289289        cbDirEntry = *pcbDirEntry; 
    290         AssertMsgReturn(cbDirEntry >= (unsigned)RT_OFFSETOF(RTDIRENTRY, szName[2]), 
     290        AssertMsgReturn(cbDirEntry >= RT_UOFFSETOF(RTDIRENTRY, szName[2]), 
    291291                        ("Invalid *pcbDirEntry=%d (min %d)\n", *pcbDirEntry, RT_OFFSETOF(RTDIRENTRYEX, szName[2])), 
    292292                        VERR_INVALID_PARAMETER); 
    …… 
    378378 
    379379 
    380 RTDECL(int) RTDirReadEx(PRTDIR pDir, PRTDIRENTRYEX pDirEntry, unsigned *pcbDirEntry, RTFSOBJATTRADD enmAdditionalAttribs) 
     380RTDECL(int) RTDirReadEx(PRTDIR pDir, PRTDIRENTRYEX pDirEntry, size_t *pcbDirEntry, RTFSOBJATTRADD enmAdditionalAttribs) 
    381381{ 
    382382    /* 
    …… 
    390390                    ("Invalid enmAdditionalAttribs=%p\n", enmAdditionalAttribs), 
    391391                    VERR_INVALID_PARAMETER); 
    392     unsigned cbDirEntry = sizeof(*pDirEntry); 
     392    size_t cbDirEntry = sizeof(*pDirEntry); 
    393393    if (pcbDirEntry) 
    394394    { 

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

    r13104 r14062  
    240240 
    241241 
    242 RTDECL(int) RTDirRead(PRTDIR pDir, PRTDIRENTRY pDirEntry, unsigned *pcbDirEntry) 
     242RTDECL(int) RTDirRead(PRTDIR pDir, PRTDIRENTRY pDirEntry, size_t *pcbDirEntry) 
    243243{ 
    244244    /* 
    …… 
    255255        return VERR_INVALID_PARAMETER; 
    256256    } 
    257     unsigned cbDirEntry = sizeof(*pDirEntry); 
     257    size_t cbDirEntry = sizeof(*pDirEntry); 
    258258    if (pcbDirEntry) 
    259259    { 
    260260        cbDirEntry = *pcbDirEntry; 
    261         if (cbDirEntry < (unsigned)RT_OFFSETOF(RTDIRENTRY, szName[2])) 
     261        if (cbDirEntry < RT_UOFFSETOF(RTDIRENTRY, szName[2])) 
    262262        { 
    263263            AssertMsgFailed(("Invalid *pcbDirEntry=%d (min %d)\n", *pcbDirEntry, RT_OFFSETOF(RTDIRENTRY, szName[2]))); 
    …… 
    336336 
    337337 
    338 RTDECL(int) RTDirReadEx(PRTDIR pDir, PRTDIRENTRYEX pDirEntry, unsigned *pcbDirEntry, RTFSOBJATTRADD enmAdditionalAttribs) 
     338RTDECL(int) RTDirReadEx(PRTDIR pDir, PRTDIRENTRYEX pDirEntry, size_t *pcbDirEntry, RTFSOBJATTRADD enmAdditionalAttribs) 
    339339{ 
    340340    /* 
    …… 
    357357        return VERR_INVALID_PARAMETER; 
    358358    } 
    359     unsigned cbDirEntry = sizeof(*pDirEntry); 
     359    size_t cbDirEntry = sizeof(*pDirEntry); 
    360360    if (pcbDirEntry) 
    361361    { 
    362362        cbDirEntry = *pcbDirEntry; 
    363         if (cbDirEntry < (unsigned)RT_OFFSETOF(RTDIRENTRYEX, szName[2])) 
     363        if (cbDirEntry < RT_UOFFSETOF(RTDIRENTRYEX, szName[2])) 
    364364        { 
    365365            AssertMsgFailed(("Invalid *pcbDirEntry=%d (min %d)\n", *pcbDirEntry, RT_OFFSETOF(RTDIRENTRYEX, szName[2]))); 

© 2008 Sun Microsystems, Inc.
Contact – Privacy policy