VirtualBox

Changeset 7199 in vbox


Ignore:
Timestamp:
Feb 28, 2008 2:03:34 PM (17 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
28504
Message:

Fixed assorted nasty bugs introduced by the previous big cleanup. And clean up a little more.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r7161 r7199  
    481481        {
    482482            void *pvTmp = RTMemTmpAlloc(cbPreRead + cbThisWrite + cbPostRead);
    483             AssertBreak(!pvTmp, rc = VERR_NO_MEMORY);
     483            AssertBreak(VALID_PTR(pvTmp), rc = VERR_NO_MEMORY);
    484484
    485485            if (!(pImage->uOpenFlags & VD_OPEN_FLAGS_HONOR_SAME))
    … …  
    806806                            /* Report the format name. */
    807807                            RTPathStripExt(pPluginDirEntry->szName);
    808                             AssertBreak(strlen(pPluginDirEntry->szName) >= VBOX_HDDFORMAT_PLUGIN_PREFIX_LENGTH,
     808                            AssertBreak(strlen(pPluginDirEntry->szName) <= VBOX_HDDFORMAT_PLUGIN_PREFIX_LENGTH,
    809809                                        rc = VERR_INVALID_NAME);
    810810
    … …  
    11001100
    11011101        /* Check state. */
    1102         if (pDisk->cImages != 0)
    1103             AssertMsgFailedBreak(("Create base image cannot be done with other images open\n"),
    1104                                  rc = VERR_VDI_INVALID_STATE);
     1102        AssertMsgBreak(pDisk->cImages == 0,
     1103                       ("Create base image cannot be done with other images open\n"),
     1104                       rc = VERR_VDI_INVALID_STATE);
    11051105
    11061106        /* Set up image descriptor. */
    … …  
    12431243
    12441244        /* Check state. */
    1245         if (pDisk->cImages == 0)
    1246             AssertMsgFailedBreak(("Create diff image cannot be done without other images open\n"),
    1247                                  rc = VERR_VDI_INVALID_STATE);
     1245        AssertMsgBreak(pDisk->cImages != 0,
     1246                       ("Create diff image cannot be done without other images open\n"),
     1247                       rc = VERR_VDI_INVALID_STATE);
    12481248
    12491249        /* Set up image descriptor. */
    … …  
    15581558
    15591559        PVDIMAGE pImage = pDisk->pLast;
    1560         if (RT_UNLIKELY(!pImage))
    1561         {
    1562             Assert(pImage);
    1563             rc = VERR_VDI_NOT_OPENED;
    1564             break;
    1565         }
     1560        AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_NOT_OPENED);
    15661561        unsigned uOpenFlags = pDisk->Backend->pfnGetOpenFlags(pImage->pvBackendData);
    15671562        /* Remove image from list of opened images. */
    … …  
    16491644
    16501645        PVDIMAGE pImage = pDisk->pLast;
    1651         while (pImage)
     1646        while (VALID_PTR(pImage))
    16521647        {
    16531648            PVDIMAGE pPrev = pImage->pPrev;
    … …  
    16631658            pImage = pPrev;
    16641659        }
    1665         Assert(pDisk->pLast == NULL);
     1660        Assert(!VALID_PTR(pDisk->pLast));
    16661661    } while (0);
    16671662
    … …  
    17061701
    17071702        PVDIMAGE pImage = pDisk->pLast;
    1708         AssertBreak(pImage, rc = VERR_VDI_NOT_OPENED);
     1703        AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_NOT_OPENED);
    17091704
    17101705        rc = vdReadHelper(pDisk, pImage, uOffset, pvBuf, cbRead);
    … …  
    17511746
    17521747        PVDIMAGE pImage = pDisk->pLast;
    1753         AssertBreak(pImage, rc = VERR_VDI_NOT_OPENED);
     1748        AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_NOT_OPENED);
    17541749
    17551750        vdSetModifiedFlag(pDisk);
    … …  
    17801775
    17811776        PVDIMAGE pImage = pDisk->pLast;
    1782         AssertBreak(pImage, rc = VERR_VDI_NOT_OPENED);
     1777        AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_NOT_OPENED);
    17831778
    17841779        vdResetModifiedFlag(pDisk);
    … …  
    18331828
    18341829        PVDIMAGE pImage = pDisk->pLast;
    1835         AssertBreak(pImage, fReadOnly = true);
     1830        AssertBreak(VALID_PTR(pImage), fReadOnly = true);
    18361831
    18371832        unsigned uOpenFlags;
    … …  
    18641859
    18651860        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    1866         AssertBreak(pImage, cbSize = 0);
     1861        AssertBreak(VALID_PTR(pImage), cbSize = 0);
    18671862        cbSize = pDisk->Backend->pfnGetSize(pImage->pvBackendData);
    18681863    } while (0);
    … …  
    18921887
    18931888        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    1894         AssertBreak(pImage, cbSize = 0);
     1889        AssertBreak(VALID_PTR(pImage), cbSize = 0);
    18951890        cbSize = pDisk->Backend->pfnGetFileSize(pImage->pvBackendData);
    18961891    } while (0);
    … …  
    19291924
    19301925        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    1931         AssertBreak(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
     1926        AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
    19321927
    19331928        if (pImage == pDisk->pLast)
    … …  
    19901985
    19911986        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    1992         AssertBreak(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
     1987        AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
    19931988
    19941989        if (pImage == pDisk->pLast)
    … …  
    20782073
    20792074        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2080         AssertBreak(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
     2075        AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
    20812076
    20822077        if (pImage == pDisk->pLast)
    … …  
    21282123        AssertMsgBreak(   VALID_PTR(pLCHSGeometry)
    21292124                       && pLCHSGeometry->cCylinders <= 1024
    2130                        && pLCHSGeometry->cCylinders != 0
    21312125                       && pLCHSGeometry->cHeads <= 255
    2132                        && pLCHSGeometry->cHeads != 0
    2133                        && pLCHSGeometry->cSectors <= 63
    2134                        && pLCHSGeometry->cSectors != 0,
     2126                       && pLCHSGeometry->cSectors <= 63,
    21352127                       ("pLCHSGeometry=%#p LCHS=%u/%u/%u\n", pLCHSGeometry,
    21362128                        pLCHSGeometry->cCylinders, pLCHSGeometry->cHeads,
    … …  
    21392131
    21402132        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2141         AssertBreak(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
     2133        AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
    21422134
    21432135        if (pImage == pDisk->pLast)
    … …  
    22262218
    22272219        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2228         AssertBreak(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
     2220        AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
    22292221
    22302222        *puVersion = pDisk->Backend->pfnGetVersion(pImage->pvBackendData);
    … …  
    22632255
    22642256        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2265         AssertBreak(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
     2257        AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
    22662258
    22672259        rc = pDisk->Backend->pfnGetImageType(pImage->pvBackendData,
    … …  
    23012293
    23022294        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2303         AssertBreak(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
     2295        AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
    23042296
    23052297        *puImageFlags = pDisk->Backend->pfnGetImageFlags(pImage->pvBackendData);
    … …  
    23382330
    23392331        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2340         AssertBreak(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
     2332        AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
    23412333
    23422334        *puOpenFlags = pDisk->Backend->pfnGetOpenFlags(pImage->pvBackendData);
    … …  
    23762368
    23772369        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2378         AssertBreak(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
     2370        AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
    23792371
    23802372        rc = pDisk->Backend->pfnSetOpenFlags(pImage->pvBackendData,
    … …  
    24212413
    24222414        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2423         AssertBreak(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
     2415        AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
    24242416
    24252417        size_t cb = strlen(pImage->pszFilename);
    … …  
    24742466
    24752467        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2476         AssertBreak(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
     2468        AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
    24772469
    24782470        rc = pDisk->Backend->pfnGetComment(pImage->pvBackendData, pszComment,
    … …  
    25122504
    25132505        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2514         AssertBreak(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
     2506        AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
    25152507
    25162508        rc = pDisk->Backend->pfnSetComment(pImage->pvBackendData, pszComment);
    … …  
    25482540
    25492541        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2550         AssertBreak(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
     2542        AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
    25512543
    25522544        rc = pDisk->Backend->pfnGetUuid(pImage->pvBackendData, pUuid);
    … …  
    25832575
    25842576        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2585         AssertBreak(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
     2577        AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
    25862578
    25872579        RTUUID Uuid;
    … …  
    26242616
    26252617        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2626         AssertBreak(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
     2618        AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
    26272619
    26282620        rc = pDisk->Backend->pfnGetModificationUuid(pImage->pvBackendData,
    … …  
    26612653
    26622654        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2663         AssertBreak(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
     2655        AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
    26642656
    26652657        RTUUID Uuid;
    … …  
    27042696
    27052697        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2706         AssertBreak(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
     2698        AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
    27072699
    27082700        rc = pDisk->Backend->pfnGetParentUuid(pImage->pvBackendData, pUuid);
    … …  
    27402732
    27412733        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2742         AssertBreak(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
     2734        AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
    27432735
    27442736        RTUUID Uuid;
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette