Fix warnings from static analysis tools
1.INVALID ASSIGNMENT:
a. phDnldNfc.cc: phDnldNfc_LoadFW()
The size of variables equated are different.
"fileSize" is 4 (unsigned int) and "fTellFileSize" is 8(long)
b. phDnldNfc_Internal.cc: phDnldNfc_CreateFramePld()
Explicit type casting is done to avoid ambiguity.
c. phNxpNciHal.cc: phNxpNciHal_core_initialized()
The size of variables equated are different.
"timeout" is 4 (unsigned int) and "retLen*1000" is
8 (long)
d. phNxpNciHal.cc: phNxpNciHal_getVendorConfig()
The size of variables equated are different.
"config.maxIsoDepTranscieveLength" is 4 (unsigned int)
and "num" is 8 (unsigned long)
e. phOsalNfc_Timer.cc: phOsalNfc_DeferredCall()
"dwIndex" datatype change from uint32_t to unsigned long
2.DO_NOT_USE_INT_IN_FOR_LOOP
a. phNxpConfig.cpp: GetNxpNumValue()
unsigned int is changed to size_t datatype
Bug: 142626701
Test: Nfc-On/Off, Tag read, HCE, VTS
Change-Id: I013a068cd29631f684b4f6d8986413914b942759
diff --git a/halimpl/dnld/phDnldNfc.cc b/halimpl/dnld/phDnldNfc.cc
index 5ee2aac..9ef1471 100644
--- a/halimpl/dnld/phDnldNfc.cc
+++ b/halimpl/dnld/phDnldNfc.cc
@@ -1015,8 +1015,8 @@
*******************************************************************************/
NFCSTATUS phDnldNfc_LoadBinFW(uint8_t** pImgInfo, uint16_t* pImgInfoLen) {
FILE* pFile = NULL;
- uint32_t fileSize = 0;
- uint32_t bytesRead = 0;
+ long fileSize = 0;
+ long bytesRead = 0;
long ftellFileSize = 0;
/* check for path name */
diff --git a/halimpl/dnld/phDnldNfc_Internal.cc b/halimpl/dnld/phDnldNfc_Internal.cc
index fe27f04..0e562dd 100755
--- a/halimpl/dnld/phDnldNfc_Internal.cc
+++ b/halimpl/dnld/phDnldNfc_Internal.cc
@@ -678,7 +678,7 @@
*******************************************************************************/
static NFCSTATUS phDnldNfc_CreateFramePld(pphDnldNfc_DlContext_t pDlContext) {
NFCSTATUS wStatus = NFCSTATUS_SUCCESS;
- uint16_t wBuffIdx = 0;
+ uint32_t wBuffIdx = 0;
uint16_t wChkIntgVal = 0;
uint16_t wFrameLen = 0;
@@ -770,7 +770,7 @@
&(pDlContext->tRWInfo.wBytesToSendRecv),
(sizeof(pDlContext->tRWInfo.wBytesToSendRecv)));
- wBuffIdx += sizeof(pDlContext->tRWInfo.wBytesToSendRecv);
+ wBuffIdx += (uint32_t)sizeof(pDlContext->tRWInfo.wBytesToSendRecv);
memcpy(&(pDlContext->tCmdRspFrameInfo.aFrameBuff[wBuffIdx]),
&(pDlContext->tRWInfo.dwAddr), sizeof(pDlContext->tRWInfo.dwAddr));
diff --git a/halimpl/hal/phNxpNciHal.cc b/halimpl/hal/phNxpNciHal.cc
index 117b371..8a039ce 100644
--- a/halimpl/hal/phNxpNciHal.cc
+++ b/halimpl/hal/phNxpNciHal.cc
@@ -1667,7 +1667,7 @@
// Check the permissible range [0 - 60]
if (0 <= retlen && retlen <= 60) {
if (0 < retlen) {
- unsigned int timeout = retlen * 1000;
+ unsigned int timeout = (uint32_t)retlen * 1000;
unsigned int timeoutHx = 0x0000;
char tmpbuffer[10] = {0};
@@ -2258,33 +2258,32 @@
config.nfaPollBailOutMode = true;
if (GetNxpNumValue(NAME_ISO_DEP_MAX_TRANSCEIVE, &num, sizeof(num))) {
- config.maxIsoDepTransceiveLength = num;
+ config.maxIsoDepTransceiveLength = (uint32_t)num;
}
if (GetNxpNumValue(NAME_DEFAULT_OFFHOST_ROUTE, &num, sizeof(num))) {
- config.defaultOffHostRoute = num;
+ config.defaultOffHostRoute = (uint8_t)num;
}
if (GetNxpNumValue(NAME_DEFAULT_NFCF_ROUTE, &num, sizeof(num))) {
- config.defaultOffHostRouteFelica = num;
+ config.defaultOffHostRouteFelica = (uint8_t)num;
}
if (GetNxpNumValue(NAME_DEFAULT_SYS_CODE_ROUTE, &num, sizeof(num))) {
- config.defaultSystemCodeRoute = num;
+ config.defaultSystemCodeRoute = (uint8_t)num;
}
if (GetNxpNumValue(NAME_DEFAULT_SYS_CODE_PWR_STATE, &num, sizeof(num))) {
- config.defaultSystemCodePowerState = num;
+ config.defaultSystemCodePowerState = (uint8_t)num;
}
if (GetNxpNumValue(NAME_DEFAULT_ROUTE, &num, sizeof(num))) {
- config.defaultRoute = num;
+ config.defaultRoute = (uint8_t)num;
}
if (GetNxpByteArrayValue(NAME_DEVICE_HOST_WHITE_LIST, (char*)buffer.data(), buffer.size(), &retlen)) {
config.hostWhitelist.resize(retlen);
- for(int i=0; i<retlen; i++)
- config.hostWhitelist[i] = buffer[i];
+ for(long i=0; i<retlen; i++) config.hostWhitelist[i] = buffer[i];
}
if (GetNxpNumValue(NAME_OFF_HOST_ESE_PIPE_ID, &num, sizeof(num))) {
- config.offHostESEPipeId = num;
+ config.offHostESEPipeId = (uint8_t)num;
}
if (GetNxpNumValue(NAME_OFF_HOST_SIM_PIPE_ID, &num, sizeof(num))) {
- config.offHostSIMPipeId = num;
+ config.offHostSIMPipeId = (uint8_t)num;
}
if ((GetNxpByteArrayValue(NAME_NFA_PROPRIETARY_CFG, (char*)buffer.data(), buffer.size(), &retlen))
&& (retlen == 9)) {
diff --git a/halimpl/tml/phOsalNfc_Timer.cc b/halimpl/tml/phOsalNfc_Timer.cc
index 3f5269d..91872ce 100755
--- a/halimpl/tml/phOsalNfc_Timer.cc
+++ b/halimpl/tml/phOsalNfc_Timer.cc
@@ -314,7 +314,7 @@
*******************************************************************************/
static void phOsalNfc_DeferredCall(void* pParams) {
/* Retrieve the timer id from the parameter */
- uint32_t dwIndex;
+ unsigned long dwIndex;
phOsalNfc_TimerHandle_t* pTimerHandle;
if (NULL != pParams) {
/* Retrieve the index at which the timer handle structure is stored */
diff --git a/halimpl/utils/phNxpConfig.cpp b/halimpl/utils/phNxpConfig.cpp
index 7160fe3..7492183 100755
--- a/halimpl/utils/phNxpConfig.cpp
+++ b/halimpl/utils/phNxpConfig.cpp
@@ -800,7 +800,7 @@
unsigned long v = pParam->numValue();
if (v == 0 && pParam->str_len() > 0 && pParam->str_len() < 4) {
const unsigned char* p = (const unsigned char*)pParam->str_value();
- for (unsigned int i = 0; i < pParam->str_len(); ++i) {
+ for (size_t i = 0; i < pParam->str_len(); ++i) {
v *= 256;
v += *p++;
}
