diff options
| author | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2018-03-24 22:33:30 +0000 |
|---|---|---|
| committer | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2018-03-24 22:33:30 +0000 |
| commit | 2b6d754134ddde785bc199421c6ca592433dad79 (patch) | |
| tree | d043169e99a085731f6016768a279cadd5d97a8b /src/VBox/Runtime/common/log/tracelogwriter.cpp | |
| parent | fa2b22095547958c2504a7afb37f8fa68e43b509 (diff) | |
| download | VirtualBox-svn-2b6d754134ddde785bc199421c6ca592433dad79.tar.gz | |
more immediate build fixes, some will get proper fixing later
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@71494 cfe28804-0f27-0410-a406-dd0f0b0b656f
Diffstat (limited to 'src/VBox/Runtime/common/log/tracelogwriter.cpp')
| -rw-r--r-- | src/VBox/Runtime/common/log/tracelogwriter.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/VBox/Runtime/common/log/tracelogwriter.cpp b/src/VBox/Runtime/common/log/tracelogwriter.cpp index 7ec48e7d4b5..f956580e830 100644 --- a/src/VBox/Runtime/common/log/tracelogwriter.cpp +++ b/src/VBox/Runtime/common/log/tracelogwriter.cpp @@ -387,7 +387,7 @@ DECLINLINE(size_t) rtTraceLogWrEvtInit(PTRACELOGEVT pEvt, RTTRACELOGEVTGRPID uGrpId, RTTRACELOGEVTGRPID uParentGrpId, size_t *pacbRawData) { - size_t cbEvtData = pEvtDescInt->cbEvtData; + uint32_t cbEvtData = pEvtDescInt->cbEvtData; for (unsigned i = 0; i < pEvtDescInt->cRawDataNonStatic; i++) cbEvtData += pacbRawData[i]; @@ -484,7 +484,7 @@ static int rtTraceLogWrInit(PRTTRACELOGWRINT pThis, const char *pszDesc) Hdr.u32Endianess = TRACELOG_HDR_ENDIANESS; /* Endianess marker. */ Hdr.u32Version = TRACELOG_VERSION; Hdr.fFlags = 0; - Hdr.cbStrDesc = pszDesc ? strlen(pszDesc) : 0; + Hdr.cbStrDesc = pszDesc ? (uint32_t)strlen(pszDesc) : 0; Hdr.cbTypePtr = sizeof(uintptr_t); Hdr.cbTypeSize = sizeof(size_t); Hdr.u64TsStart = RTTimeNanoTS(); @@ -558,8 +558,8 @@ static int rtTraceLogWrEvtDescAdd(PRTTRACELOGWRINT pThis, PCRTTRACELOGEVTDESC pE memcpy(&EvtDesc.szMagic[0], TRACELOG_EVTDESC_MAGIC, sizeof(EvtDesc.szMagic)); EvtDesc.u32Id = pEvtDescInt->u32Id; EvtDesc.u32Severity = rtTraceLogWrConvSeverityToStream(pEvtDescInt->EvtDesc.enmSeverity); - EvtDesc.cbStrId = strlen(pEvtDescInt->EvtDesc.pszId); - EvtDesc.cbStrDesc = pEvtDescInt->EvtDesc.pszDesc ? strlen(pEvtDescInt->EvtDesc.pszDesc) : 0; + EvtDesc.cbStrId = (uint32_t)strlen(pEvtDescInt->EvtDesc.pszId); + EvtDesc.cbStrDesc = pEvtDescInt->EvtDesc.pszDesc ? (uint32_t)strlen(pEvtDescInt->EvtDesc.pszDesc) : 0; EvtDesc.cEvtItems = pEvtDescInt->EvtDesc.cEvtItems; rc = rtTraceLogWrStream(pThis, &EvtDesc, sizeof(EvtDesc)); if (RT_SUCCESS(rc)) @@ -577,10 +577,10 @@ static int rtTraceLogWrEvtDescAdd(PRTTRACELOGWRINT pThis, PCRTTRACELOGEVTDESC pE RT_ZERO(EvtItemDesc); memcpy(&EvtItemDesc.szMagic[0], TRACELOG_EVTITEMDESC_MAGIC, sizeof(EvtItemDesc.szMagic)); - EvtItemDesc.cbStrName = strlen(pEvtItemDesc->pszName); - EvtItemDesc.cbStrDesc = pEvtItemDesc->pszDesc ? strlen(pEvtItemDesc->pszDesc) : 0; + EvtItemDesc.cbStrName = (uint32_t)strlen(pEvtItemDesc->pszName); + EvtItemDesc.cbStrDesc = pEvtItemDesc->pszDesc ? (uint32_t)strlen(pEvtItemDesc->pszDesc) : 0; EvtItemDesc.u32Type = rtTraceLogWrConvTypeToStream(pEvtItemDesc->enmType); - EvtItemDesc.cbRawData = pEvtItemDesc->cbRawData; + EvtItemDesc.cbRawData = (uint32_t)pEvtItemDesc->cbRawData; rc = rtTraceLogWrStream(pThis, &EvtItemDesc, sizeof(EvtItemDesc)); if (RT_SUCCESS(rc)) rc = rtTraceLogWrStream(pThis, pEvtItemDesc->pszName, EvtItemDesc.cbStrName); |