Commit 3aa1407c authored by 张明扬's avatar 张明扬 🇨🇳

fix:修改禅道问题58596(QAC)——

在赋值时,“本质上无符号 ”类型 (%1s) 的非常数表达式被转换为较窄的无符号类型“%2s”。
parent fc87c09e
...@@ -276,7 +276,7 @@ uint8_t SerXXNRC12Filter(uint8_t insub, const uint8_t *supportsub, uint8_t size, ...@@ -276,7 +276,7 @@ uint8_t SerXXNRC12Filter(uint8_t insub, const uint8_t *supportsub, uint8_t size,
return nrccode; return nrccode;
} }
uint8_t SerXXNRC13Filter(uint8_t type, uint8_t serlength, const uint8_t *length, uint8_t index) uint8_t SerXXNRC13Filter(uint8_t type, uint16_t serlength, const uint8_t *length, uint8_t index)
{ {
uint8_t nrccode; uint8_t nrccode;
nrccode = incorrectMessageLength; nrccode = incorrectMessageLength;
...@@ -789,7 +789,7 @@ void UDS_Service_22_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A ...@@ -789,7 +789,7 @@ void UDS_Service_22_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A
if (0 == NrcCode) if (0 == NrcCode)
{ {
DID = ((uint16_t)UDS_ISO14229_Transfer[0] << 8) | UDS_ISO14229_Transfer[1]; DID = ((uint16_t)UDS_ISO14229_Transfer[0] << 8) | UDS_ISO14229_Transfer[1];
NrcCode = SerXXNRC31DIDFilter(DID, Ser22DIDList, (sizeof(Ser22DIDList) / 2), &Index); NrcCode = SerXXNRC31DIDFilter(DID, Ser22DIDList, (uint8_t)(sizeof(Ser22DIDList) / 2), &Index);
} }
if (0 == NrcCode) if (0 == NrcCode)
...@@ -903,7 +903,7 @@ void UDS_Service_2E_Indication ( uint16_t A_TA_type, uint16_t A_Length, uint8_t ...@@ -903,7 +903,7 @@ void UDS_Service_2E_Indication ( uint16_t A_TA_type, uint16_t A_Length, uint8_t
{ {
uint16_t i; uint16_t i;
uint16_t DID; uint16_t DID;
uint8_t Service2EDiagDataLength; uint16_t Service2EDiagDataLength;
uint16_t FunorPhy = 0; uint16_t FunorPhy = 0;
Service2EDiagDataLength = A_Length; Service2EDiagDataLength = A_Length;
S3_ServerCnt = 0; S3_ServerCnt = 0;
......
...@@ -393,7 +393,7 @@ typedef void (*InitFunction)(void); ...@@ -393,7 +393,7 @@ typedef void (*InitFunction)(void);
/***********Local Functin*************/ /***********Local Functin*************/
uint8_t GetCurrentSession(void); uint8_t GetCurrentSession(void);
uint8_t SerXXNRC12Filter(uint8_t insub, const uint8_t *supportsub, uint8_t size, uint8_t *index); uint8_t SerXXNRC12Filter(uint8_t insub, const uint8_t *supportsub, uint8_t size, uint8_t *index);
uint8_t SerXXNRC13Filter(uint8_t type, uint8_t serlength, const uint8_t *length, uint8_t index); uint8_t SerXXNRC13Filter(uint8_t type, uint16_t serlength, const uint8_t *length, uint8_t index);
uint8_t SerXXNRC22Filter(void); uint8_t SerXXNRC22Filter(void);
uint8_t SerXXNRC31DIDFilter(uint16_t inDID, const uint16_t *DIDList, uint8_t size, uint8_t *index); uint8_t SerXXNRC31DIDFilter(uint16_t inDID, const uint16_t *DIDList, uint8_t size, uint8_t *index);
uint8_t SerXXNRC33Filter(const uint8_t *levelList, uint8_t index); uint8_t SerXXNRC33Filter(const uint8_t *levelList, uint8_t index);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment