Changeset 62564 in vbox for trunk/src/VBox/Runtime/common/misc
- Timestamp:
- Jul 26, 2016 2:43:03 PM (9 years ago)
- svn:sync-xref-src-repo-rev:
- 109133
- Location:
- trunk/src/VBox/Runtime/common/misc
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Runtime/common/misc/json.cpp
r62461 r62564 432 432 if ( !rtJsonTokenizerIsEos(pTokenizer) 433 433 && !rtJsonTokenizerIsSkipNewLine(pTokenizer)) 434 {435 434 break; /* Skipped everything, next is some real content. */ 436 }437 435 } 438 436 } … … 723 721 static void rtJsonTokenizerDestroy(PRTJSONTOKENIZER pTokenizer) 724 722 { 725 723 RT_NOREF_PV(pTokenizer); 726 724 } 727 725 … … 1142 1140 size_t *pcbRead) 1143 1141 { 1144 int rc = VINF_SUCCESS;1145 1142 PRTJSONREADERARGS pArgs = (PRTJSONREADERARGS)pvUser; 1143 1144 RT_NOREF_PV(offInput); 1145 1146 1146 size_t cbRead = 0; 1147 1148 rc = RTStrmReadEx(pArgs->u.hStream, pvBuf, cbBuf, &cbRead); 1147 int rc = RTStrmReadEx(pArgs->u.hStream, pvBuf, cbBuf, &cbRead); 1149 1148 if (RT_SUCCESS(rc)) 1150 1149 *pcbRead = cbRead; … … 1160 1159 AssertReturn(cbBuf > 0, VERR_INVALID_PARAMETER); 1161 1160 1162 int rc = VINF_SUCCESS;1161 RTJSONTOKENIZER Tokenizer; 1163 1162 RTJSONREADERARGS Args; 1164 RTJSONTOKENIZER Tokenizer;1165 1166 1163 Args.cbData = cbBuf; 1167 1164 Args.u.pbBuf = pbBuf; 1168 1165 1169 rc = rtJsonTokenizerInit(&Tokenizer, rtJsonTokenizerParseFromBuf, &Args);1166 int rc = rtJsonTokenizerInit(&Tokenizer, rtJsonTokenizerParseFromBuf, &Args); 1170 1167 if (RT_SUCCESS(rc)) 1171 1168 { … … 1182 1179 AssertPtrReturn(pszStr, VERR_INVALID_POINTER); 1183 1180 1184 int rc = VINF_SUCCESS;1185 1181 RTJSONTOKENIZER Tokenizer; 1186 1187 rc = rtJsonTokenizerInit(&Tokenizer, rtJsonTokenizerParseFromString, (void *)pszStr); 1182 int rc = rtJsonTokenizerInit(&Tokenizer, rtJsonTokenizerParseFromString, (void *)pszStr); 1188 1183 if (RT_SUCCESS(rc)) 1189 1184 { -
trunk/src/VBox/Runtime/common/misc/lockvalidator.cpp
r62477 r62564 3061 3061 if (pRecU->Excl.hThread == hThreadSelf) 3062 3062 { 3063 Assert(!fFirstRecursion); 3063 Assert(!fFirstRecursion); RT_NOREF_PV(fFirstRecursion); 3064 3064 pRecU->Excl.cRecursion++; 3065 3065 rtLockValidatorStackPushRecursion(hThreadSelf, pRecU, pSrcPos); … … 3098 3098 { 3099 3099 Assert(c < UINT32_C(0xffff0000)); 3100 Assert(!fFinalRecursion); 3100 Assert(!fFinalRecursion); RT_NOREF_PV(fFinalRecursion); 3101 3101 rtLockValidatorStackPopRecursion(pThread, pRec); 3102 3102 }
Note:
See TracChangeset
for help on using the changeset viewer.