Changeset 57926 in vbox for trunk/src/VBox/Runtime
- Timestamp:
- Sep 28, 2015 2:05:58 PM (9 years ago)
- svn:sync-xref-src-repo-rev:
- 102898
- Location:
- trunk/src/VBox/Runtime
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Runtime/Doxyfile
r36507 r57926 205 205 \ 206 206 Implements the callback \link \1 \1 " 207 208 # bugref - xTracker bug reference, takes one to four bug numbers. 209 ALIASES += bugref{1}="https://xtracker.innotek.de/index.php?bug=\1" 210 ALIASES += bugref{2}="https://xtracker.innotek.de/index.php?bug=\1, \ 211 https://xtracker.innotek.de/index.php?bug=\2" 212 ALIASES += bugref{3}="https://xtracker.innotek.de/index.php?bug=\1, \ 213 https://xtracker.innotek.de/index.php?bug=\2, \ 214 https://xtracker.innotek.de/index.php?bug=\3" 215 ALIASES += bugref{4}="https://xtracker.innotek.de/index.php?bug=\1, \ 216 https://xtracker.innotek.de/index.php?bug=\2, \ 217 https://xtracker.innotek.de/index.php?bug=\3, \ 218 https://xtracker.innotek.de/index.php?bug=\4" 219 220 # ticketref - Track ticket reference, takes one to four ticket numbers. 221 ALIASES += ticketref{1}="http://www.virtualbox.org/ticket/\1" 222 ALIASES += ticketref{2}="http://www.virtualbox.org/ticket/\1, \ 223 http://www.virtualbox.org/ticket/\2" 224 ALIASES += ticketref{3}="http://www.virtualbox.org/ticket/\1, \ 225 http://www.virtualbox.org/ticket/\2, \ 226 http://www.virtualbox.org/ticket/\3" 227 ALIASES += ticketref{4}="http://www.virtualbox.org/ticket/\1, \ 228 http://www.virtualbox.org/ticket/\2, \ 229 http://www.virtualbox.org/ticket/\3, \ 230 http://www.virtualbox.org/ticket/\4" 231 207 232 208 233 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C … … 1194 1219 "DECLINLINE(type)=inline type" \ 1195 1220 DECL_FORCE_INLINE(type)=DECLINLINE(type) \ 1221 DECL_NO_INLINE(type)=type \ 1196 1222 \ 1197 1223 AssertCompile(expr) \ … … 1203 1229 AssertCompile2MemberOffsets(a,b,c) \ 1204 1230 \ 1231 RT_SRC_POS=1 \ 1232 RT_SRC_POS_ARGS=SRC_POS \ 1233 "RT_SRC_POS_DECL=int SRC_POS" \ 1234 \ 1235 RT_IPRT_FORMAT_ATTR(a,b)= \ 1236 RT_IPRT_FORMAT_ATTR_MAYBE_NULL(a,b)= \ 1237 RT_NO_THROW_PROTO= 1205 1238 1206 1239 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then … … 1245 1278 CTXMID \ 1246 1279 OTHERCTXMID \ 1247 \1248 RT_SRC_POS \1249 RT_SRC_POS_ARGS \1250 RT_SRC_POS_DECL1251 1280 1252 1281 -
trunk/src/VBox/Runtime/common/asn1/asn1-basics.cpp
r57358 r57926 334 334 */ 335 335 336 RTDECL(void) RTAsn1VtDelete(PRTASN1CORE p Asn1Core)337 { 338 if (p Asn1Core)339 { 340 PCRTASN1COREVTABLE pOps = p Asn1Core->pOps;336 RTDECL(void) RTAsn1VtDelete(PRTASN1CORE pThisCore) 337 { 338 if (pThisCore) 339 { 340 PCRTASN1COREVTABLE pOps = pThisCore->pOps; 341 341 if (pOps) 342 pOps->pfnDtor(p Asn1Core);342 pOps->pfnDtor(pThisCore); 343 343 } 344 344 } … … 355 355 356 356 357 static DECLCALLBACK(int) rtAsn1VtDeepEnumDepthFirst(PRTASN1CORE p Asn1Core, const char *pszName, uint32_t uDepth, void *pvUser)358 { 359 AssertReturn(p Asn1Core, VINF_SUCCESS);360 361 if (p Asn1Core->pOps && pAsn1Core->pOps->pfnEnum)362 { 363 int rc = p Asn1Core->pOps->pfnEnum(pAsn1Core, rtAsn1VtDeepEnumDepthFirst, uDepth, pvUser);357 static DECLCALLBACK(int) rtAsn1VtDeepEnumDepthFirst(PRTASN1CORE pThisCore, const char *pszName, uint32_t uDepth, void *pvUser) 358 { 359 AssertReturn(pThisCore, VINF_SUCCESS); 360 361 if (pThisCore->pOps && pThisCore->pOps->pfnEnum) 362 { 363 int rc = pThisCore->pOps->pfnEnum(pThisCore, rtAsn1VtDeepEnumDepthFirst, uDepth, pvUser); 364 364 if (rc != VINF_SUCCESS) 365 365 return rc; … … 367 367 368 368 RTASN1DEEPENUMCTX *pCtx = (RTASN1DEEPENUMCTX *)pvUser; 369 return pCtx->pfnCallback(p Asn1Core, pszName, uDepth, pCtx->pvUser);370 } 371 372 373 static DECLCALLBACK(int) rtAsn1VtDeepEnumDepthLast(PRTASN1CORE p Asn1Core, const char *pszName, uint32_t uDepth, void *pvUser)374 { 375 AssertReturn(p Asn1Core, VINF_SUCCESS);369 return pCtx->pfnCallback(pThisCore, pszName, uDepth, pCtx->pvUser); 370 } 371 372 373 static DECLCALLBACK(int) rtAsn1VtDeepEnumDepthLast(PRTASN1CORE pThisCore, const char *pszName, uint32_t uDepth, void *pvUser) 374 { 375 AssertReturn(pThisCore, VINF_SUCCESS); 376 376 377 377 RTASN1DEEPENUMCTX *pCtx = (RTASN1DEEPENUMCTX *)pvUser; 378 int rc = pCtx->pfnCallback(p Asn1Core, pszName, uDepth, pCtx->pvUser);378 int rc = pCtx->pfnCallback(pThisCore, pszName, uDepth, pCtx->pvUser); 379 379 if (rc == VINF_SUCCESS) 380 380 { 381 if (p Asn1Core->pOps && pAsn1Core->pOps->pfnEnum)382 rc = p Asn1Core->pOps->pfnEnum(pAsn1Core, rtAsn1VtDeepEnumDepthFirst, uDepth, pvUser);381 if (pThisCore->pOps && pThisCore->pOps->pfnEnum) 382 rc = pThisCore->pOps->pfnEnum(pThisCore, rtAsn1VtDeepEnumDepthFirst, uDepth, pvUser); 383 383 } 384 384 return rc; -
trunk/src/VBox/Runtime/common/checksum/manifest2.cpp
r57358 r57926 135 135 const char * const *papszIgnoreEntries; 136 136 /** Name of attributes to ignore. */ 137 const char * const *papszIgnoreAttr ;137 const char * const *papszIgnoreAttrs; 138 138 /** Flags governing the comparision. */ 139 139 uint32_t fFlags; … … 350 350 * Ignore this entry? 351 351 */ 352 char const * const *ppsz = pEquals->papszIgnoreAttr ;352 char const * const *ppsz = pEquals->papszIgnoreAttrs; 353 353 if (ppsz) 354 354 { … … 425 425 * Ignore this entry? 426 426 */ 427 char const * const *ppsz = pEquals->papszIgnoreAttr ;427 char const * const *ppsz = pEquals->papszIgnoreAttrs; 428 428 if (ppsz) 429 429 { … … 571 571 572 572 RTDECL(int) RTManifestEqualsEx(RTMANIFEST hManifest1, RTMANIFEST hManifest2, const char * const *papszIgnoreEntries, 573 const char * const *papszIgnoreAttr , uint32_t fFlags, char *pszError, size_t cbError)573 const char * const *papszIgnoreAttrs, uint32_t fFlags, char *pszError, size_t cbError) 574 574 { 575 575 /* … … 614 614 Equals.fFlags = fFlags; 615 615 Equals.papszIgnoreEntries = papszIgnoreEntries; 616 Equals.papszIgnoreAttr = papszIgnoreAttr;616 Equals.papszIgnoreAttrs = papszIgnoreAttrs; 617 617 Equals.pszError = pszError; 618 618 Equals.cbError = cbError; -
trunk/src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp
r57358 r57926 120 120 #endif 121 121 #ifdef ENFILE 122 case ENFILE: return VERR_TOO_MANY_OPEN_FILES; /** @Todo fix duplicate error */122 case ENFILE: return VERR_TOO_MANY_OPEN_FILES; /** @todo fix duplicate error */ 123 123 #endif 124 124 #ifdef EMFILE -
trunk/src/VBox/Runtime/common/err/errmsg.cpp
r57358 r57926 46 46 static const RTSTATUSMSG g_aStatusMsgs[] = 47 47 { 48 #if ndef IPRT_NO_ERROR_DATA48 #if !defined(IPRT_NO_ERROR_DATA) && !defined(DOXYGEN_RUNNING) 49 49 # include "errmsgdata.h" 50 50 #else -
trunk/src/VBox/Runtime/common/err/errmsgxpcom.cpp
r57358 r57926 107 107 MY_ERR("NS_SUCCESS_FILE_DIRECTORY_EMPTY", "NS_SUCCESS_FILE_DIRECTORY_EMPTY", UINT32_C(0x00520001)), 108 108 109 #if defined(VBOX) && !defined(IN_GUEST) 109 #if defined(VBOX) && !defined(IN_GUEST) && !defined(DOXYGEN_RUNNING) 110 110 # include "errmsgvboxcomdata.h" 111 111 #endif -
trunk/src/VBox/Runtime/r0drv/solaris/semeventwait-r0drv-solaris.h
r56290 r57926 101 101 * @param fFlags The wait flags. 102 102 * @param uTimeout The timeout. 103 * @param pWaitQueue The wait queue head.104 103 */ 105 104 DECLINLINE(int) rtR0SemSolWaitInit(PRTR0SEMSOLWAIT pWait, uint32_t fFlags, uint64_t uTimeout) -
trunk/src/VBox/Runtime/r3/init.cpp
r57358 r57926 369 369 * rtR3Init worker. 370 370 */ 371 static int rtR3InitBody(uint32_t fFlags, int cArgs, char ***p apszArgs, const char *pszProgramPath)371 static int rtR3InitBody(uint32_t fFlags, int cArgs, char ***ppapszArgs, const char *pszProgramPath) 372 372 { 373 373 /* … … 448 448 AssertLogRelMsgRCReturn(rc, ("Failed to get executable directory path, rc=%Rrc!\n", rc), rc); 449 449 450 rc = rtR3InitArgv(fFlags, cArgs, p apszArgs);450 rc = rtR3InitArgv(fFlags, cArgs, ppapszArgs); 451 451 AssertLogRelMsgRCReturn(rc, ("Failed to convert the arguments, rc=%Rrc!\n", rc), rc); 452 452 … … 550 550 * out ourselves. 551 551 */ 552 static int rtR3Init(uint32_t fFlags, int cArgs, char ***p apszArgs, const char *pszProgramPath)552 static int rtR3Init(uint32_t fFlags, int cArgs, char ***ppapszArgs, const char *pszProgramPath) 553 553 { 554 554 /* no entry log flow, because prefixes and thread may freak out. */ … … 590 590 rc = rtR3InitProgramPath(pszProgramPath); 591 591 if (RT_SUCCESS(rc)) 592 rc = rtR3InitArgv(fFlags, cArgs, p apszArgs);592 rc = rtR3InitArgv(fFlags, cArgs, ppapszArgs); 593 593 return rc; 594 594 } … … 598 598 * Do the initialization. 599 599 */ 600 int rc = rtR3InitBody(fFlags, cArgs, p apszArgs, pszProgramPath);600 int rc = rtR3InitBody(fFlags, cArgs, ppapszArgs, pszProgramPath); 601 601 if (RT_FAILURE(rc)) 602 602 { … … 614 614 615 615 616 RTR3DECL(int) RTR3InitExe(int cArgs, char ***p apszArgs, uint32_t fFlags)616 RTR3DECL(int) RTR3InitExe(int cArgs, char ***ppapszArgs, uint32_t fFlags) 617 617 { 618 618 Assert(!(fFlags & RTR3INIT_FLAGS_DLL)); 619 return rtR3Init(fFlags, cArgs, p apszArgs, NULL);619 return rtR3Init(fFlags, cArgs, ppapszArgs, NULL); 620 620 } 621 621 … … 635 635 636 636 637 RTR3DECL(int) RTR3InitEx(uint32_t iVersion, uint32_t fFlags, int cArgs, char ***p apszArgs, const char *pszProgramPath)637 RTR3DECL(int) RTR3InitEx(uint32_t iVersion, uint32_t fFlags, int cArgs, char ***ppapszArgs, const char *pszProgramPath) 638 638 { 639 639 AssertReturn(iVersion == RTR3INIT_VER_CUR, VERR_NOT_SUPPORTED); 640 return rtR3Init(fFlags, cArgs, p apszArgs, pszProgramPath);640 return rtR3Init(fFlags, cArgs, ppapszArgs, pszProgramPath); 641 641 } 642 642 -
trunk/src/VBox/Runtime/r3/isofs.cpp
r57358 r57926 525 525 526 526 527 RTR3DECL(int) RTIsoFsGetFileInfo(PRTISOFSFILE pFile, const char *pszPath, 528 uint32_t *pcbOffset, size_t *pcbLength) 527 RTR3DECL(int) RTIsoFsGetFileInfo(PRTISOFSFILE pFile, const char *pszPath, uint32_t *poffInIso, size_t *pcbLength) 529 528 { 530 529 AssertPtrReturn(pFile, VERR_INVALID_PARAMETER); 531 530 AssertPtrReturn(pszPath, VERR_INVALID_PARAMETER); 532 AssertPtrReturn(p cbOffset, VERR_INVALID_PARAMETER);531 AssertPtrReturn(poffInIso, VERR_INVALID_PARAMETER); 533 532 534 533 PRTISOFSDIRRECORD pDirRecord; … … 545 544 if (RT_SUCCESS(rc)) 546 545 { 547 *p cbOffset= pFileRecord->extent_location * RTISOFS_SECTOR_SIZE;546 *poffInIso = pFileRecord->extent_location * RTISOFS_SECTOR_SIZE; 548 547 *pcbLength = pFileRecord->extent_data_length; 549 548 rtIsoFsFreeDirectoryRecord(pFileRecord); … … 555 554 556 555 557 RTR3DECL(int) RTIsoFsExtractFile(PRTISOFSFILE pFile, const char *pszSource, 558 const char *pszDest) 559 { 560 AssertPtrReturn(pFile, VERR_INVALID_PARAMETER); 561 AssertPtrReturn(pszSource, VERR_INVALID_PARAMETER); 562 AssertPtrReturn(pszDest, VERR_INVALID_PARAMETER); 556 RTR3DECL(int) RTIsoFsExtractFile(PRTISOFSFILE pFile, const char *pszSrcPath, const char *pszDstPath) 557 { 558 AssertPtrReturn(pFile, VERR_INVALID_PARAMETER); 559 AssertPtrReturn(pszSrcPath, VERR_INVALID_PARAMETER); 560 AssertPtrReturn(pszDstPath, VERR_INVALID_PARAMETER); 563 561 564 562 uint32_t cbOffset; 565 563 size_t cbLength; 566 int rc = RTIsoFsGetFileInfo(pFile, pszS ource, &cbOffset, &cbLength);564 int rc = RTIsoFsGetFileInfo(pFile, pszSrcPath, &cbOffset, &cbLength); 567 565 if (RT_SUCCESS(rc)) 568 566 { … … 571 569 { 572 570 RTFILE fileDest; 573 rc = RTFileOpen(&fileDest, pszD est, RTFILE_O_CREATE | RTFILE_O_WRITE | RTFILE_O_DENY_WRITE);571 rc = RTFileOpen(&fileDest, pszDstPath, RTFILE_O_CREATE | RTFILE_O_WRITE | RTFILE_O_DENY_WRITE); 574 572 if (RT_SUCCESS(rc)) 575 573 { -
trunk/src/VBox/Runtime/r3/nt/internal-r3-nt.h
r56290 r57926 49 49 * @returns @c true if equal, @c false if not. 50 50 * @param pwsz1 The first string. 51 * @param c b1The length of the first string, in bytes.51 * @param cch1 The length of the first string, in bytes. 52 52 * @param psz2 The second string. 53 53 * @param cch2 The length of the second string. -
trunk/src/VBox/Runtime/win/errmsgwin.cpp
r57358 r57926 45 45 static const RTWINERRMSG g_aStatusMsgs[] = 46 46 { 47 #if ndef IPRT_NO_ERROR_DATA47 #if !defined(IPRT_NO_ERROR_DATA) && !defined(DOXYGEN_RUNNING) 48 48 # include "errmsgcomdata.h" 49 49 # if defined(VBOX) && !defined(IN_GUEST)
Note:
See TracChangeset
for help on using the changeset viewer.