VirtualBox

Changeset 8569 in vbox for trunk/src/VBox/Devices


Ignore:
Timestamp:
May 5, 2008 12:32:51 PM (17 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
30484
Message:

AssertBreak -> AssertBreakStmt.

Location:
trunk/src/VBox/Devices/Storage
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/Storage/DrvHostBase.cpp

    r8155 r8569  
    11631163        memcpy(&cdb[0], pbCmd, cbCmd);
    11641164        IOReturn irc = (*ppScsiTaskI)->SetCommandDescriptorBlock(ppScsiTaskI, cdb, cbCmd);
    1165         AssertBreak(irc == kIOReturnSuccess,);
     1165        AssertBreakVoid(irc == kIOReturnSuccess);
    11661166
    11671167        /* Setup the buffer. */
    … …  
    11761176                                                          : kSCSIDataTransfer_FromInitiatorToTarget);
    11771177        }
    1178         AssertBreak(irc == kIOReturnSuccess,);
     1178        AssertBreakVoid(irc == kIOReturnSuccess);
    11791179
    11801180        /* Set the timeout. */
    11811181        irc = (*ppScsiTaskI)->SetTimeoutDuration(ppScsiTaskI, cTimeoutMillies ? cTimeoutMillies : 30000 /*ms*/);
    1182         AssertBreak(irc == kIOReturnSuccess,);
     1182        AssertBreakVoid(irc == kIOReturnSuccess);
    11831183
    11841184        /* Execute the command and get the response. */
    … …  
    11881188        UInt64 cbReturned = 0;
    11891189        irc = (*ppScsiTaskI)->ExecuteTaskSync(ppScsiTaskI, &SenseData, &TaskStatus, &cbReturned);
    1190         AssertBreak(irc == kIOReturnSuccess,);
     1190        AssertBreakVoid(irc == kIOReturnSuccess);
    11911191        if (pcbBuf)
    11921192            *pcbBuf = cbReturned;
    11931193
    11941194        irc = (*ppScsiTaskI)->GetSCSIServiceResponse(ppScsiTaskI, &ServiceResponse);
    1195         AssertBreak(irc == kIOReturnSuccess,);
    1196         AssertBreak(ServiceResponse == kSCSIServiceResponse_TASK_COMPLETE,);
     1195        AssertBreakVoid(irc == kIOReturnSuccess);
     1196        AssertBreakVoid(ServiceResponse == kSCSIServiceResponse_TASK_COMPLETE);
    11971197
    11981198        if (TaskStatus == kSCSITaskStatus_GOOD)

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

    r8565 r8569  
    564564        {
    565565            void *pvTmp = RTMemTmpAlloc(cbPreRead + cbThisWrite + cbPostRead);
    566             AssertBreak(VALID_PTR(pvTmp), rc = VERR_NO_MEMORY);
     566            AssertBreakStmt(VALID_PTR(pvTmp), rc = VERR_NO_MEMORY);
    567567
    568568            if (!(pImage->uOpenFlags & VD_OPEN_FLAGS_HONOR_SAME))
    … …  
    821821    {
    822822        /* sanity check */
    823         AssertBreak(VALID_PTR(pDisk), );
     823        AssertPtrBreakVoid(pDisk);
    824824        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    825 
    826         if (pDisk)
    827         {
    828             VDCloseAll(pDisk);
    829             RTMemFree(pDisk);
    830         }
     825        VDCloseAll(pDisk);
     826        RTMemFree(pDisk);
    831827    } while (0);
    832828    LogFlowFunc(("returns\n"));
    … …  
    965961                            /* Report the format name. */
    966962                            RTPathStripExt(pPluginDirEntry->szName);
    967                             AssertBreak(strlen(pPluginDirEntry->szName) > VBOX_HDDFORMAT_PLUGIN_PREFIX_LENGTH,
    968                                         rc = VERR_INVALID_NAME);
     963                            AssertBreakStmt(strlen(pPluginDirEntry->szName) > VBOX_HDDFORMAT_PLUGIN_PREFIX_LENGTH,
     964                                            rc = VERR_INVALID_NAME);
    969965
    970966                            char *pszFormat = NULL;
    … …  
    10331029    {
    10341030        /* sanity check */
    1035         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     1031        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    10361032        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    10371033
    … …  
    12471243    {
    12481244        /* sanity check */
    1249         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     1245        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    12501246        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    12511247
    … …  
    14401436    {
    14411437        /* sanity check */
    1442         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     1438        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    14431439        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    14441440
    … …  
    15931589    {
    15941590        /* sanity check */
    1595         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     1591        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    15961592        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    15971593
    … …  
    16031599            break;
    16041600        }
    1605         AssertBreak(pImageFrom != pImageTo, rc = VERR_INVALID_PARAMETER);
     1601        AssertBreakStmt(pImageFrom != pImageTo, rc = VERR_INVALID_PARAMETER);
    16061602
    16071603        /* Make sure destination image is writable. */
    … …  
    18281824
    18291825        PVDIMAGE pImageFrom = vdGetImageByNumber(pDiskFrom, nImage);
    1830         AssertBreak(VALID_PTR(pImageFrom), rc = VERR_VDI_IMAGE_NOT_FOUND);
     1826        AssertPtrBreakStmt(pImageFrom, rc = VERR_VDI_IMAGE_NOT_FOUND);
    18311827        AssertMsgBreakStmt(VALID_PTR(pDiskTo), ("pDiskTo=%#p\n", pDiskTo),
    18321828                           rc = VERR_INVALID_PARAMETER);
    … …  
    19371933
    19381934        pImageTo = pDiskTo->pLast;
    1939         AssertBreak(VALID_PTR(pImageTo), rc = VERR_VDI_IMAGE_NOT_FOUND);
     1935        AssertPtrBreakStmt(pImageTo, rc = VERR_VDI_IMAGE_NOT_FOUND);
    19401936
    19411937        /* Allocate tmp buffer. */
    … …  
    20482044    {
    20492045        /* sanity check */
    2050         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     2046        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    20512047        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    20522048
    20532049        PVDIMAGE pImage = pDisk->pLast;
    2054         AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_NOT_OPENED);
     2050        AssertPtrBreakStmt(pImage, rc = VERR_VDI_NOT_OPENED);
    20552051        unsigned uOpenFlags = pImage->Backend->pfnGetOpenFlags(pImage->pvBackendData);
    20562052        /* Remove image from list of opened images. */
    … …  
    21392135    {
    21402136        /* sanity check */
    2141         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     2137        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    21422138        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    21432139
    … …  
    21892185    {
    21902186        /* sanity check */
    2191         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     2187        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    21922188        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    21932189
    … …  
    22052201
    22062202        PVDIMAGE pImage = pDisk->pLast;
    2207         AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_NOT_OPENED);
     2203        AssertPtrBreakStmt(pImage, rc = VERR_VDI_NOT_OPENED);
    22082204
    22092205        rc = vdReadHelper(pDisk, pImage, uOffset, pvBuf, cbRead);
    … …  
    22342230    {
    22352231        /* sanity check */
    2236         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     2232        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    22372233        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    22382234
    … …  
    22502246
    22512247        PVDIMAGE pImage = pDisk->pLast;
    2252         AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_NOT_OPENED);
     2248        AssertPtrBreakStmt(pImage, rc = VERR_VDI_NOT_OPENED);
    22532249
    22542250        vdSetModifiedFlag(pDisk);
    … …  
    22752271    {
    22762272        /* sanity check */
    2277         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     2273        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    22782274        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    22792275
    22802276        PVDIMAGE pImage = pDisk->pLast;
    2281         AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_NOT_OPENED);
     2277        AssertPtrBreakStmt(pImage, rc = VERR_VDI_NOT_OPENED);
    22822278
    22832279        vdResetModifiedFlag(pDisk);
    … …  
    23032299    {
    23042300        /* sanity check */
    2305         AssertBreak(VALID_PTR(pDisk), cImages = 0);
     2301        AssertPtrBreakStmt(pDisk, cImages = 0);
    23062302        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    23072303
    … …  
    23282324    {
    23292325        /* sanity check */
    2330         AssertBreak(VALID_PTR(pDisk), fReadOnly = false);
     2326        AssertPtrBreakStmt(pDisk, fReadOnly = false);
    23312327        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    23322328
    23332329        PVDIMAGE pImage = pDisk->pLast;
    2334         AssertBreak(VALID_PTR(pImage), fReadOnly = true);
     2330        AssertPtrBreakStmt(pImage, fReadOnly = true);
    23352331
    23362332        unsigned uOpenFlags;
    … …  
    23592355    {
    23602356        /* sanity check */
    2361         AssertBreak(VALID_PTR(pDisk), cbSize = 0);
     2357        AssertPtrBreakStmt(pDisk, cbSize = 0);
    23622358        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    23632359
    23642360        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2365         AssertBreak(VALID_PTR(pImage), cbSize = 0);
     2361        AssertPtrBreakStmt(pImage, cbSize = 0);
    23662362        cbSize = pImage->Backend->pfnGetSize(pImage->pvBackendData);
    23672363    } while (0);
    … …  
    23872383    {
    23882384        /* sanity check */
    2389         AssertBreak(VALID_PTR(pDisk), cbSize = 0);
     2385        AssertPtrBreakStmt(pDisk, cbSize = 0);
    23902386        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    23912387
    23922388        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2393         AssertBreak(VALID_PTR(pImage), cbSize = 0);
     2389        AssertPtrBreakStmt(pImage, cbSize = 0);
    23942390        cbSize = pImage->Backend->pfnGetFileSize(pImage->pvBackendData);
    23952391    } while (0);
    … …  
    24192415    {
    24202416        /* sanity check */
    2421         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     2417        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    24222418        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    24232419
    … …  
    24282424
    24292425        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2430         AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
     2426        AssertPtrBreakStmt(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
    24312427
    24322428        if (pImage == pDisk->pLast)
    … …  
    24722468    {
    24732469        /* sanity check */
    2474         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     2470        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    24752471        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    24762472
    … …  
    24862482
    24872483        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2488         AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
     2484        AssertPtrBreakStmt(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
    24892485
    24902486        if (pImage == pDisk->pLast)
    … …  
    25652561    {
    25662562        /* sanity check */
    2567         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     2563        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    25682564        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    25692565
    … …  
    25742570
    25752571        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2576         AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
     2572        AssertPtrBreakStmt(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
    25772573
    25782574        if (pImage == pDisk->pLast)
    … …  
    26182614    {
    26192615        /* sanity check */
    2620         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     2616        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    26212617        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    26222618
    … …  
    26322628
    26332629        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2634         AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
     2630        AssertPtrBreakStmt(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
    26352631
    26362632        if (pImage == pDisk->pLast)
    … …  
    27102706    {
    27112707        /* sanity check */
    2712         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     2708        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    27132709        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    27142710
    … …  
    27192715
    27202716        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2721         AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
     2717        AssertPtrBreakStmt(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
    27222718
    27232719        *puVersion = pImage->Backend->pfnGetVersion(pImage->pvBackendData);
    … …  
    27472743    {
    27482744        /* sanity check */
    2749         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     2745        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    27502746        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    27512747
    … …  
    27562752
    27572753        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2758         AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
     2754        AssertPtrBreakStmt(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
    27592755
    27602756        rc = pImage->Backend->pfnGetImageType(pImage->pvBackendData,
    … …  
    27852781    {
    27862782        /* sanity check */
    2787         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     2783        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    27882784        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    27892785
    … …  
    27942790
    27952791        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2796         AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
     2792        AssertPtrBreakStmt(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
    27972793
    27982794        *puImageFlags = pImage->Backend->pfnGetImageFlags(pImage->pvBackendData);
    … …  
    28222818    {
    28232819        /* sanity check */
    2824         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     2820        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    28252821        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    28262822
    … …  
    28312827
    28322828        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2833         AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
     2829        AssertPtrBreakStmt(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
    28342830
    28352831        *puOpenFlags = pImage->Backend->pfnGetOpenFlags(pImage->pvBackendData);
    … …  
    28602856    {
    28612857        /* sanity check */
    2862         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     2858        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    28632859        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    28642860
    … …  
    28692865
    28702866        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2871         AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
     2867        AssertPtrBreakStmt(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
    28722868
    28732869        rc = pImage->Backend->pfnSetOpenFlags(pImage->pvBackendData,
    … …  
    29022898    {
    29032899        /* sanity check */
    2904         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     2900        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    29052901        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    29062902
    … …  
    29142910
    29152911        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2916         AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
     2912        AssertPtrBreakStmt(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
    29172913
    29182914        size_t cb = strlen(pImage->pszFilename);
    … …  
    29552951    {
    29562952        /* sanity check */
    2957         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     2953        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    29582954        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    29592955
    … …  
    29672963
    29682964        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    2969         AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
     2965        AssertPtrBreakStmt(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
    29702966
    29712967        rc = pImage->Backend->pfnGetComment(pImage->pvBackendData, pszComment,
    … …  
    29962992    {
    29972993        /* sanity check */
    2998         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     2994        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    29992995        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    30002996
    … …  
    30053001
    30063002        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    3007         AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
     3003        AssertPtrBreakStmt(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
    30083004
    30093005        rc = pImage->Backend->pfnSetComment(pImage->pvBackendData, pszComment);
    … …  
    30323028    {
    30333029        /* sanity check */
    3034         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     3030        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    30353031        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    30363032
    … …  
    30413037
    30423038        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    3043         AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
     3039        AssertPtrBreakStmt(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
    30443040
    30453041        rc = pImage->Backend->pfnGetUuid(pImage->pvBackendData, pUuid);
    … …  
    30683064    {
    30693065        /* sanity check */
    3070         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     3066        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    30713067        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    30723068
    … …  
    30763072
    30773073        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    3078         AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
     3074        AssertPtrBreakStmt(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
    30793075
    30803076        RTUUID Uuid;
    … …  
    31083104    {
    31093105        /* sanity check */
    3110         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     3106        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    31113107        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    31123108
    … …  
    31173113
    31183114        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    3119         AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
     3115        AssertPtrBreakStmt(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
    31203116
    31213117        rc = pImage->Backend->pfnGetModificationUuid(pImage->pvBackendData,
    … …  
    31453141    {
    31463142        /* sanity check */
    3147         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     3143        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    31483144        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    31493145
    … …  
    31543150
    31553151        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    3156         AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
     3152        AssertPtrBreakStmt(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
    31573153
    31583154        RTUUID Uuid;
    … …  
    31883184    {
    31893185        /* sanity check */
    3190         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     3186        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    31913187        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    31923188
    … …  
    31973193
    31983194        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    3199         AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
     3195        AssertPtrBreakStmt(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
    32003196
    32013197        rc = pImage->Backend->pfnGetParentUuid(pImage->pvBackendData, pUuid);
    … …  
    32243220    {
    32253221        /* sanity check */
    3226         AssertBreak(VALID_PTR(pDisk), rc = VERR_INVALID_PARAMETER);
     3222        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
    32273223        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    32283224
    … …  
    32333229
    32343230        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
    3235         AssertBreak(VALID_PTR(pImage), rc = VERR_VDI_IMAGE_NOT_FOUND);
     3231        AssertPtrBreakStmt(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
    32363232
    32373233        RTUUID Uuid;
    … …  
    32593255    {
    32603256        /* sanity check */
    3261         AssertBreak(VALID_PTR(pDisk), );
     3257        AssertPtrBreakVoid(pDisk);
    32623258        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
    32633259
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