VirtualBox
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/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    { 

© 2008 Sun Microsystems, Inc.
Contact – Privacy policy