Changeset 73502 in vbox for trunk/src/VBox
- Timestamp:
- Aug 5, 2018 12:40:50 PM (6 years ago)
- Location:
- trunk/src/VBox
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp
r73097 r73502 3615 3615 strncpy((char *)pPages->ManufacturingPage0.u.fields.abBoardName, "VBox MPT Fusion", 16); 3616 3616 strncpy((char *)pPages->ManufacturingPage0.u.fields.abBoardAssembly, "SUN", 8); 3617 strncpy((char *)pPages->ManufacturingPage0.u.fields.abBoardTracerNumber, "CAFECAFECAFECAFE", 16);3617 memcpy(pPages->ManufacturingPage0.u.fields.abBoardTracerNumber, "CAFECAFECAFECAFE", 16); 3618 3618 3619 3619 /* Manufacturing Page 1 - I don't know what this contains so we leave it 0 for now. */ -
trunk/src/VBox/Runtime/common/fs/RTFsCmdLs.cpp
r73097 r73502 492 492 case RTCMDLSTIME_ATIME: pfnCmp = pOpts->fGroupDirectoriesFirst ? rtCmdLsEntryCmpDirFirstATime : rtCmdLsEntryCmpATime; break; 493 493 } 494 break; 494 495 case RTCMDLSSORT_VERSION: 495 496 pfnCmp = pOpts->fGroupDirectoriesFirst ? rtCmdLsEntryCmpDirFirstVersion : rtCmdLsEntryCmpVersion; -
trunk/src/VBox/Runtime/common/zip/xarvfs.cpp
r73097 r73502 1941 1941 Parser.read(pszOutput, cchToc, RTCString("xar-toc.xml"), *pDoc); 1942 1942 } 1943 catch (xml::XmlError Err)1943 catch (xml::XmlError &Err) 1944 1944 { 1945 1945 rc = VERR_XAR_TOC_XML_PARSE_ERROR; -
trunk/src/VBox/Runtime/r3/xml.cpp
r69434 r73502 1941 1941 pThis->m_pStrDst->append(pachBuf, (size_t)cbToWrite); 1942 1942 } 1943 catch (std::bad_alloc )1943 catch (std::bad_alloc &) 1944 1944 { 1945 1945 pThis->m_fOutOfMemory = true; -
trunk/src/VBox/Runtime/testcase/tstRTHeapOffset.cpp
r69111 r73502 101 101 }; 102 102 uint32_t i; 103 RTHeapOffsetDump(Heap, (PFNRTHEAPOFFSETPRINTF) RTPrintf); /** @todo Add some detail info output with a signature identical to RTPrintf. */103 RTHeapOffsetDump(Heap, (PFNRTHEAPOFFSETPRINTF)(uintptr_t)RTPrintf); /** @todo Add some detail info output with a signature identical to RTPrintf. */ 104 104 size_t cbBefore = RTHeapOffsetGetFreeSize(Heap); 105 105 static char const s_szFill[] = "01234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; … … 185 185 "Warning: Either we've split out an alignment chunk at the start, or we've got\n" 186 186 " an alloc/free accounting bug: cbBefore=%d cbAfter=%d\n", cbBefore, cbAfter); 187 RTHeapOffsetDump(Heap, (PFNRTHEAPOFFSETPRINTF) RTPrintf);187 RTHeapOffsetDump(Heap, (PFNRTHEAPOFFSETPRINTF)(uintptr_t)RTPrintf); 188 188 } 189 189 -
trunk/src/VBox/Runtime/testcase/tstRTHeapSimple.cpp
r69111 r73502 98 98 }; 99 99 unsigned i; 100 RTHeapSimpleDump(Heap, (PFNRTHEAPSIMPLEPRINTF) RTPrintf); /** @todo Add some detail info output with a signature identical to RTPrintf. */100 RTHeapSimpleDump(Heap, (PFNRTHEAPSIMPLEPRINTF)(uintptr_t)RTPrintf); /** @todo Add some detail info output with a signature identical to RTPrintf. */ 101 101 size_t cbBefore = RTHeapSimpleGetFreeSize(Heap); 102 102 static char szFill[] = "01234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; … … 181 181 "Warning: Either we've split out an alignment chunk at the start, or we've got\n" 182 182 " an alloc/free accounting bug: cbBefore=%d cbAfter=%d\n", cbBefore, cbAfter); 183 RTHeapSimpleDump(Heap, (PFNRTHEAPSIMPLEPRINTF) RTPrintf);183 RTHeapSimpleDump(Heap, (PFNRTHEAPSIMPLEPRINTF)(uintptr_t)RTPrintf); 184 184 } 185 185 -
trunk/src/VBox/VMM/testcase/tstMMHyperHeap.cpp
r73097 r73502 66 66 return RTEXITCODE_FAILURE; 67 67 } 68 memset(pVM, 0, sizeof(*pVM)); /* wtf? */69 68 pVM->paVMPagesR3 = aPages; 70 69 pVM->pVMR0 = pvR0; -
trunk/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp
r69111 r73502 133 133 for (int i = iFrom, iItr = 0; i != iTo; i += iInc, iItr++) 134 134 { 135 int rc = stackRandom(&g_Jmp, (PFNVMMR0SETJMP) tst2, (PVM)(uintptr_t)i, 0);135 int rc = stackRandom(&g_Jmp, (PFNVMMR0SETJMP)(uintptr_t)tst2, (PVM)(uintptr_t)i, 0); 136 136 RTTESTI_CHECK_MSG_RETV(rc == 0 || rc == 42, ("i=%d rc=%d setjmp; cbFoo=%#x cbFooUsed=%#x\n", i, rc, g_cbFoo, g_cbFooUsed)); 137 137
Note:
See TracChangeset
for help on using the changeset viewer.