Changeset 8579

Timestamp:

05/05/08 15:54:26 (8 months ago)

Author:

vboxsync

Message:

AssertBreakVoid? -> AssertBreak?

Files:

• trunk/include/iprt/assert.h (modified) (2 diffs)
• trunk/src/VBox/Devices/Storage/DrvHostBase.cpp (modified) (3 diffs)
• trunk/src/VBox/Main/MachineImpl.cpp (modified) (3 diffs)
• trunk/src/VBox/Main/darwin/iokit.cpp (modified) (3 diffs)
• trunk/src/VBox/Runtime/common/time/time.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMAll/TMAllVirtual.cpp (modified) (1 diff)

trunk/include/iprt/assert.h

@@ -292 +292 @@
-
-
+/** @def AssertBreak
+ * Assert that an expression is true and breaks if it isn't.
+ * In RT_STRICT mode it will hit a breakpoint before returning.
+ *
+ * @param   expr    Expression which should be true.
+ */
+#ifdef RT_STRICT
+# define AssertBreak(expr) \
+    if (RT_UNLIKELY(!(expr))) \
+    { \
+        AssertMsg1(#expr, __LINE__, __FILE__, __PRETTY_FUNCTION__); \
+        AssertBreakpoint(); \
+        break; \
+    } else do {} while (0)
+#else
+# define AssertBreak(expr) \
+    if (RT_UNLIKELY(!(expr))) \
+        break; \
+    else do {} while (0)
+#endif
+
-/** @def AssertBreakStmt
- * Assert that an expression is true and breaks if it isn't.
@@ -313 +334 @@
-        break; \
-    } else do {} while (0)
-#endif
-
-/** @def AssertBreakVoid
- * Assert that an expression is true and breaks if it isn't.
- * In RT_STRICT mode it will hit a breakpoint before returning.
- *
- * @param   expr    Expression which should be true.
- * @todo Rename to AssertBreak.
- * @todo broken, use if.
- */
-#ifdef RT_STRICT
-# define AssertBreakVoid(expr) \
-    if (RT_UNLIKELY(!(expr))) \
-    { \
-        AssertMsg1(#expr, __LINE__, __FILE__, __PRETTY_FUNCTION__); \
-        AssertBreakpoint(); \
-        break; \
-    } else do {} while (0)
-#else
-# define AssertBreakVoid(expr) \
-    if (RT_UNLIKELY(!(expr))) \
-        break; \
-    else do {} while (0)
-#endif
-

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

@@ -1163 +1163 @@
-        memcpy(&cdb[0], pbCmd, cbCmd);
-        IOReturn irc = (*ppScsiTaskI)->SetCommandDescriptorBlock(ppScsiTaskI, cdb, cbCmd);
-Void
+
-
-        /* Setup the buffer. */
@@ -1176 +1176 @@
-                                                          : kSCSIDataTransfer_FromInitiatorToTarget);
-        }
-Void
+
-
-        /* Set the timeout. */
-        irc = (*ppScsiTaskI)->SetTimeoutDuration(ppScsiTaskI, cTimeoutMillies ? cTimeoutMillies : 30000 /*ms*/);
-Void
+
-
-        /* Execute the command and get the response. */
@@ -1188 +1188 @@
-        UInt64 cbReturned = 0;
-        irc = (*ppScsiTaskI)->ExecuteTaskSync(ppScsiTaskI, &SenseData, &TaskStatus, &cbReturned);
-Void
+
-        if (pcbBuf)
-            *pcbBuf = cbReturned;
-
-        irc = (*ppScsiTaskI)->GetSCSIServiceResponse(ppScsiTaskI, &ServiceResponse);
-Void
-Void
+
+
-
-        if (TaskStatus == kSCSITaskStatus_GOOD)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -4409 +4409 @@
-            /* slot unicity is guaranteed by XML Schema */
-            uint32_t slot = (*it).value <uint32_t> ("slot");
-Void
+
-
-            rc = mNetworkAdapters [slot]->loadSettings (*it);
@@ -4429 +4429 @@
-            /* slot unicity is guaranteed by XML Schema */
-            uint32_t slot = (*it).value <uint32_t> ("slot");
-Void
+
-
-            rc = mSerialPorts [slot]->loadSettings (*it);
@@ -4449 +4449 @@
-            /* slot unicity is guaranteed by XML Schema */
-            uint32_t slot = (*it).value <uint32_t> ("slot");
-Void
+
-
-            rc = mParallelPorts [slot]->loadSettings (*it);

trunk/src/VBox/Main/darwin/iokit.cpp

@@ -821 +821 @@
-            do /* loop for breaking out of on failure. */
-            {
-Void
+
-
-                /*
@@ -829 +829 @@
-                pCur->enmState = USBDEVICESTATE_USED_BY_HOST_CAPTURABLE;    /* just a default, we'll try harder in a bit. */
-
-Void
+
-                /* skip hubs */
-                if (pCur->bDeviceClass == 0x09 /* hub, find a define! */)
-                    break;
-Void
-Void
-Void
-Void
-Void
+
+
+
+
+
-                uint32_t u32LocationId;
-Void
+
-                uint64_t u64SessionId;
-Void
+
-                char szAddress[64];
-                RTStrPrintf(szAddress, sizeof(szAddress), "p=0x%04RX16;v=0x%04RX16;s=0x%016RX64;l=0x%08RX32",
-                            pCur->idProduct, pCur->idVendor, u64SessionId, u32LocationId);
-                pCur->pszAddress = RTStrDup(szAddress);
-Void
+
-                pCur->bBus = u32LocationId >> 24;
-Void
+
-                uint8_t bSpeed;
-Void
+
-                Assert(bSpeed <= 2);
-                pCur->enmSpeed = bSpeed == 2 ? USBDEVICESPEED_HIGH
@@ -1027 +1027 @@
-                SInt32 i32 = (int16_t)u64Value;
-                CFNumberRef Num = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &i32);
-Void
+
-                CFDictionarySetValue(RefMatchingDict, chValue == 'p' ? CFSTR(kUSBProductID) : CFSTR(kUSBVendorID), Num);
-                CFRelease(Num);

trunk/src/VBox/Runtime/common/time/time.cpp

@@ -468 +468 @@
-            {
-                /* If you change one, zero the other to make clear what you mean. */
-Void
-Void
-    
-    
+
+
+
+
-                uint16_t u16YearDay = pTime->u8MonthDay - 1
-                                    + (fLeapYear
-                                       ? g_aiDayOfYearLeap[pTime->u8Month - 1]
-                                       : g_aiDayOfYear[pTime->u8Month - 1]);
-Void
+
-                fRecalc = false;
-            } while (0);

trunk/src/VBox/VMM/VMMAll/TMAllVirtual.cpp

@@ -256 +256 @@
-        if (ASMAtomicCmpXchgU64(&pVM->tm.s.u64VirtualRawPrev, u64NanoTS, u64PrevNanoTS))
-            break;
-Void
+
-        if (cTries < 25 && !VM_IS_EMT(pVM)) /* give up early */
-            break;