From 9555aaba748678ec8118edf43e0e0c0b4cdc66cf Mon Sep 17 00:00:00 2001 From: MS Date: Sat, 17 Aug 2024 11:56:25 -0400 Subject: [PATCH] Remove USHRT_MAX from ParseExtra functions (#1086) --- .../src/common/legoactioncontrolpresenter.cpp | 6 +++--- .../lego/legoomni/src/common/legoanimmmpresenter.cpp | 6 +++--- .../lego/legoomni/src/common/mxcontrolpresenter.cpp | 6 +++--- .../lego/legoomni/src/control/legometerpresenter.cpp | 6 +++--- .../lego/legoomni/src/entity/legoactorpresenter.cpp | 6 +++--- .../lego/legoomni/src/entity/legoentitypresenter.cpp | 6 +++--- .../lego/legoomni/src/entity/legoworldpresenter.cpp | 6 +++--- LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp | 6 +++--- LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp | 12 ++++++------ LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp | 6 +++--- LEGO1/omni/src/audio/mxwavepresenter.cpp | 6 +++--- LEGO1/omni/src/common/mxpresenter.cpp | 12 ++++++------ LEGO1/omni/src/video/mxstillpresenter.cpp | 6 +++--- 13 files changed, 45 insertions(+), 45 deletions(-) diff --git a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp index 69ca127f..1afc9d64 100644 --- a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp +++ b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp @@ -77,10 +77,10 @@ void LegoActionControlPresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & USHRT_MAX) { + if (extraLength) { char extraCopy[1024]; - memcpy(extraCopy, extraData, extraLength & USHRT_MAX); - extraCopy[extraLength & USHRT_MAX] = '\0'; + memcpy(extraCopy, extraData, extraLength); + extraCopy[extraLength] = '\0'; char output[1024]; if (KeyValueStringParse(output, g_strACTION, extraCopy)) { diff --git a/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp index 1708460a..ed7edf34 100644 --- a/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp +++ b/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp @@ -241,10 +241,10 @@ void LegoAnimMMPresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & USHRT_MAX) { + if (extraLength) { char extraCopy[1024]; - memcpy(extraCopy, extraData, extraLength & USHRT_MAX); - extraCopy[extraLength & USHRT_MAX] = '\0'; + memcpy(extraCopy, extraData, extraLength); + extraCopy[extraLength] = '\0'; char output[1024]; if (KeyValueStringParse(output, g_strANIMMAN_ID, extraCopy)) { diff --git a/LEGO1/lego/legoomni/src/common/mxcontrolpresenter.cpp b/LEGO1/lego/legoomni/src/common/mxcontrolpresenter.cpp index 70a7aece..db96f60a 100644 --- a/LEGO1/lego/legoomni/src/common/mxcontrolpresenter.cpp +++ b/LEGO1/lego/legoomni/src/common/mxcontrolpresenter.cpp @@ -244,10 +244,10 @@ void MxControlPresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & USHRT_MAX) { + if (extraLength) { char extraCopy[256]; - memcpy(extraCopy, extraData, extraLength & USHRT_MAX); - extraCopy[extraLength & USHRT_MAX] = '\0'; + memcpy(extraCopy, extraData, extraLength); + extraCopy[extraLength] = '\0'; char output[256]; if (KeyValueStringParse(output, g_strSTYLE, extraCopy)) { diff --git a/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp b/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp index 398a29e9..0f45b60c 100644 --- a/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp +++ b/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp @@ -40,10 +40,10 @@ void LegoMeterPresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & USHRT_MAX) { + if (extraLength) { char extraCopy[256]; - memcpy(extraCopy, extraData, extraLength & USHRT_MAX); - extraCopy[extraLength & USHRT_MAX] = '\0'; + memcpy(extraCopy, extraData, extraLength); + extraCopy[extraLength] = '\0'; char output[256]; if (KeyValueStringParse(output, g_strTYPE, extraCopy)) { diff --git a/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp index 40cfb958..eca29d4d 100644 --- a/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp @@ -34,10 +34,10 @@ void LegoActorPresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & USHRT_MAX) { + if (extraLength) { char extraCopy[512]; - memcpy(extraCopy, extraData, extraLength & USHRT_MAX); - extraCopy[extraLength & USHRT_MAX] = '\0'; + memcpy(extraCopy, extraData, extraLength); + extraCopy[extraLength] = '\0'; m_entity->ParseAction(extraCopy); } diff --git a/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp index 70be36c4..ec6c402d 100644 --- a/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp @@ -96,10 +96,10 @@ void LegoEntityPresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & USHRT_MAX) { + if (extraLength) { char extraCopy[512]; - memcpy(extraCopy, extraData, extraLength & USHRT_MAX); - extraCopy[extraLength & USHRT_MAX] = '\0'; + memcpy(extraCopy, extraData, extraLength); + extraCopy[extraLength] = '\0'; m_entity->ParseAction(extraCopy); } diff --git a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp index 070f05e6..cbf711ae 100644 --- a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp @@ -429,10 +429,10 @@ void LegoWorldPresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & USHRT_MAX) { + if (extraLength) { char extraCopy[1024]; - memcpy(extraCopy, extraData, extraLength & USHRT_MAX); - extraCopy[extraLength & USHRT_MAX] = '\0'; + memcpy(extraCopy, extraData, extraLength); + extraCopy[extraLength] = '\0'; char output[1024]; if (KeyValueStringParse(output, g_strWORLD, extraCopy)) { diff --git a/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp index 42366127..55f6d30c 100644 --- a/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp +++ b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp @@ -122,10 +122,10 @@ void LegoPathPresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & USHRT_MAX) { + if (extraLength) { char extraCopy[256], output[256]; - memcpy(extraCopy, extraData, extraLength & USHRT_MAX); - extraCopy[extraLength & USHRT_MAX] = '\0'; + memcpy(extraCopy, extraData, extraLength); + extraCopy[extraLength] = '\0'; strupr(extraCopy); diff --git a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp index faebd3d4..2ddf10e7 100644 --- a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp @@ -942,18 +942,18 @@ void LegoAnimPresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & USHRT_MAX) { + if (extraLength) { char extraCopy[256]; - memcpy(extraCopy, extraData, extraLength & USHRT_MAX); - extraCopy[extraLength & USHRT_MAX] = '\0'; + memcpy(extraCopy, extraData, extraLength); + extraCopy[extraLength] = '\0'; char output[256]; if (KeyValueStringParse(NULL, g_strFROM_PARENT, extraCopy) && m_compositePresenter != NULL) { m_compositePresenter->GetAction()->GetExtra(extraLength, extraData); - if (extraLength & USHRT_MAX) { - memcpy(extraCopy, extraData, extraLength & USHRT_MAX); - extraCopy[extraLength & USHRT_MAX] = '\0'; + if (extraLength) { + memcpy(extraCopy, extraData, extraLength); + extraCopy[extraLength] = '\0'; } } diff --git a/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp b/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp index 4a2cf715..d6100be7 100644 --- a/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp @@ -297,11 +297,11 @@ void LegoModelPresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & USHRT_MAX) { + if (extraLength) { char extraCopy[1024], output[1024]; output[0] = '\0'; - memcpy(extraCopy, extraData, extraLength & USHRT_MAX); - extraCopy[extraLength & USHRT_MAX] = '\0'; + memcpy(extraCopy, extraData, extraLength); + extraCopy[extraLength] = '\0'; if (KeyValueStringParse(output, g_strAUTO_CREATE, extraCopy) != 0) { char* token = strtok(output, g_parseExtraTokens); diff --git a/LEGO1/omni/src/audio/mxwavepresenter.cpp b/LEGO1/omni/src/audio/mxwavepresenter.cpp index caac77cc..ffc7e708 100644 --- a/LEGO1/omni/src/audio/mxwavepresenter.cpp +++ b/LEGO1/omni/src/audio/mxwavepresenter.cpp @@ -331,10 +331,10 @@ void MxWavePresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & USHRT_MAX) { + if (extraLength) { char extraCopy[512]; - memcpy(extraCopy, extraData, extraLength & USHRT_MAX); - extraCopy[extraLength & USHRT_MAX] = '\0'; + memcpy(extraCopy, extraData, extraLength); + extraCopy[extraLength] = '\0'; char soundValue[512]; if (KeyValueStringParse(soundValue, g_strSOUND, extraCopy)) { diff --git a/LEGO1/omni/src/common/mxpresenter.cpp b/LEGO1/omni/src/common/mxpresenter.cpp index e599f568..214f35c6 100644 --- a/LEGO1/omni/src/common/mxpresenter.cpp +++ b/LEGO1/omni/src/common/mxpresenter.cpp @@ -87,10 +87,10 @@ void MxPresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & USHRT_MAX) { + if (extraLength) { char extraCopy[512]; - memcpy(extraCopy, extraData, extraLength & USHRT_MAX); - extraCopy[extraLength & USHRT_MAX] = '\0'; + memcpy(extraCopy, extraData, extraLength); + extraCopy[extraLength] = '\0'; char worldValue[512]; if (KeyValueStringParse(worldValue, g_strWORLD, extraCopy)) { @@ -251,10 +251,10 @@ MxEntity* MxPresenter::CreateEntity(const char* p_defaultName) char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & USHRT_MAX) { + if (extraLength) { char extraCopy[512]; - memcpy(extraCopy, extraData, extraLength & USHRT_MAX); - extraCopy[extraLength & USHRT_MAX] = '\0'; + memcpy(extraCopy, extraData, extraLength); + extraCopy[extraLength] = '\0'; KeyValueStringParse(objectName, g_strOBJECT, extraCopy); } diff --git a/LEGO1/omni/src/video/mxstillpresenter.cpp b/LEGO1/omni/src/video/mxstillpresenter.cpp index 4cae0f26..7074ae26 100644 --- a/LEGO1/omni/src/video/mxstillpresenter.cpp +++ b/LEGO1/omni/src/video/mxstillpresenter.cpp @@ -202,10 +202,10 @@ void MxStillPresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & USHRT_MAX) { + if (extraLength) { char extraCopy[512]; - memcpy(extraCopy, extraData, extraLength & USHRT_MAX); - extraCopy[extraLength & USHRT_MAX] = '\0'; + memcpy(extraCopy, extraData, extraLength); + extraCopy[extraLength] = '\0'; char output[512]; if (KeyValueStringParse(output, g_strVISIBILITY, extraCopy)) {