Changeset 60054 in vbox

Timestamp:

Mar 15, 2016 9:46:31 PM (9 years ago)

Author:

vboxsync

Message:

never use AssertStmt(..., continue) but use AssertContinue(...) (look at the implementation of AssertStmt)

Location:

trunk/src/VBox

Files:

• Main/src-server/MachineImpl.cpp (modified) (2 diffs)
• Main/src-server/Performance.cpp (modified) (1 diff)
• Runtime/generic/http-curl.cpp (modified) (3 diffs)
• Runtime/r3/darwin/RTCrStoreCreateSnapshotById-darwin.cpp (modified) (1 diff)
• Runtime/r3/win/process-win.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -9614 +9614 @@
         const ComObjPtr<MediumAttachment> &pAtt = *it;
         // should never happen, but deal with NULL pointers in the list.
-        AssertStmt(!pAtt.isNull(), continue);
+        AssertContinue(!pAtt.isNull());
 
         // getControllerName() needs caller+read lock
@@ -12135 +12135 @@
         MediumAttachment* pAttach = *it;
         /* just in case */
-        AssertStmt(pAttach, continue);
+        AssertContinue(pAttach);
 
         AutoCaller localAutoCallerA(pAttach);

trunk/src/VBox/Main/src-server/Performance.cpp

@@ -1075 +1075 @@
 
         /* just in case */
-        AssertStmt(!pMedium.isNull(), continue);
+        AssertContinue(!pMedium.isNull());
 
         AutoCaller localAutoCaller(pMedium);

trunk/src/VBox/Runtime/generic/http-curl.cpp

@@ -1049 +1049 @@
 {
     CFStringRef hStrProxyType = (CFStringRef)CFDictionaryGetValue(hDictProxy, kCFProxyTypeKey);
-    AssertStmt(hStrProxyType, continue);
+    AssertContinue(hStrProxyType);
 
     /*
@@ -1160 +1160 @@
     {
         CFDictionaryRef hDictProxy = (CFDictionaryRef)CFArrayGetValueAtIndex(hArrayProxies, i);
-        AssertStmt(hDictProxy, continue);
+        AssertContinue(hDictProxy);
 
         rcRet = rtHttpDarwinTryConfigProxy(pThis, hDictProxy, hUrlTarget, fIgnorePacType);
@@ -1208 +1208 @@
         {
             CFStringRef hStr = (CFStringRef)CFArrayGetValueAtIndex(hArray, i);
-            AssertStmt(hStr, continue);
-            AssertStmt(CFStringGetCString(hStr, szTmp, sizeof(szTmp), kCFStringEncodingUTF8), continue);
+            AssertContinue(hStr);
+            AssertContinue(CFStringGetCString(hStr, szTmp, sizeof(szTmp), kCFStringEncodingUTF8));
             RTStrToLower(szTmp);
 

trunk/src/VBox/Runtime/r3/darwin/RTCrStoreCreateSnapshotById-darwin.cpp

@@ -62 +62 @@
         {
             CFDictionaryRef hDict = (CFDictionaryRef)CFArrayGetValueAtIndex(hTrustSettings, i);
-            AssertStmt(CFGetTypeID(hDict) == CFDictionaryGetTypeID(), continue);
+            AssertContinue(CFGetTypeID(hDict) == CFDictionaryGetTypeID());
 
             CFNumberRef hNum = (CFNumberRef)CFDictionaryGetValue(hDict, kSecTrustSettingsResult);
             if (hNum)
             {
-                AssertStmt(CFGetTypeID(hNum) == CFNumberGetTypeID(), continue);
+                AssertContinue(CFGetTypeID(hNum) == CFNumberGetTypeID());
                 SInt32 iNum;
                 if (CFNumberGetValue(hNum, kCFNumberSInt32Type, &iNum))

trunk/src/VBox/Runtime/r3/win/process-win.cpp

@@ -777 +777 @@
             uNew.TokPriv.PrivilegeCount = 1;
             uNew.TokPriv.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
-            AssertStmt(LookupPrivilegeValue(NULL, s_aPrivileges[i].pszName, &uNew.TokPriv.Privileges[0].Luid), continue);
+            AssertContinue(LookupPrivilegeValue(NULL, s_aPrivileges[i].pszName, &uNew.TokPriv.Privileges[0].Luid));
             uOld = uNew;
             SetLastError(NO_ERROR);
@@ -1086 +1086 @@
     {
         PACE_HEADER pAceHdr;
-        AssertStmt(GetAce(pDstAcl, i, (PVOID *)&pAceHdr), continue);
+        AssertContinue(GetAce(pDstAcl, i, (PVOID *)&pAceHdr));
         if (   pAceHdr->AceSize == cbAllowedAce
             && memcmp(pAceHdr, &AceBuf.Core, cbAllowedAce) == 0)