Commit 0b592923 authored by Rúben Soares Silva's avatar Rúben Soares Silva

Change parameter type of pack_dci_payload and unpack_dci_payload to avoid...

Change parameter type of pack_dci_payload and unpack_dci_payload to avoid -Wstringop-overflow warning.
Change declaration of unpack_buf in dci_inversion_test to not require calloc
parent d15f6469
Branches unavailable
No related merge requests found
...@@ -77,8 +77,8 @@ uint8_t unpackarray(uint8_t **ppReadPackedMsg, ...@@ -77,8 +77,8 @@ uint8_t unpackarray(uint8_t **ppReadPackedMsg,
uint8_t *end, uint8_t *end,
unpack_array_elem_fn fn); unpack_array_elem_fn fn);
uint32_t pack_dci_payload(uint8_t payload[], uint16_t payloadSizeBits, uint8_t **out, uint8_t *end); uint32_t pack_dci_payload(uint8_t *payload, uint16_t payloadSizeBits, uint8_t **out, uint8_t *end);
uint32_t unpack_dci_payload(uint8_t payload[], uint16_t payloadSizeBits, uint8_t **in, uint8_t *end); uint32_t unpack_dci_payload(uint8_t *payload, uint16_t payloadSizeBits, uint8_t **in, uint8_t *end);
uint8_t pack_tl(nfapi_tl_t *tl, uint8_t **ppWritePackedMsg, uint8_t *end); uint8_t pack_tl(nfapi_tl_t *tl, uint8_t **ppWritePackedMsg, uint8_t *end);
uint8_t unpack_tl(uint8_t **ppReadPackedMsg, nfapi_tl_t *tl, uint8_t *end); uint8_t unpack_tl(uint8_t **ppReadPackedMsg, nfapi_tl_t *tl, uint8_t *end);
......
...@@ -585,7 +585,7 @@ uint8_t unpackarray(uint8_t **ppReadPackedMsg, void *array, uint16_t array_eleme ...@@ -585,7 +585,7 @@ uint8_t unpackarray(uint8_t **ppReadPackedMsg, void *array, uint16_t array_eleme
return 1; return 1;
} }
uint32_t pack_dci_payload(uint8_t payload[], uint16_t payloadSizeBits, uint8_t **out, uint8_t *end) uint32_t pack_dci_payload(uint8_t *payload, uint16_t payloadSizeBits, uint8_t **out, uint8_t *end)
{ {
uint8_t dci_byte_len = (payloadSizeBits + 7) / 8; uint8_t dci_byte_len = (payloadSizeBits + 7) / 8;
#ifdef FAPI_BYTE_ORDERING_BIG_ENDIAN #ifdef FAPI_BYTE_ORDERING_BIG_ENDIAN
...@@ -615,7 +615,7 @@ uint32_t pack_dci_payload(uint8_t payload[], uint16_t payloadSizeBits, uint8_t * ...@@ -615,7 +615,7 @@ uint32_t pack_dci_payload(uint8_t payload[], uint16_t payloadSizeBits, uint8_t *
#endif #endif
} }
uint32_t unpack_dci_payload(uint8_t payload[], uint16_t payloadSizeBits, uint8_t **in, uint8_t *end) uint32_t unpack_dci_payload(uint8_t *payload, uint16_t payloadSizeBits, uint8_t **in, uint8_t *end)
{ {
// Pull the inverted DCI and invert it back // Pull the inverted DCI and invert it back
// Helper vars for DCI Payload // Helper vars for DCI Payload
......
...@@ -95,7 +95,7 @@ int main(int n, char *v[]) ...@@ -95,7 +95,7 @@ int main(int n, char *v[])
truncate_unwanted_bits(payloadSizeBits, payload); truncate_unwanted_bits(payloadSizeBits, payload);
pack_dci_payload(payload, payloadSizeBits, &pWritePackedMessage, pPackMessageEnd); pack_dci_payload(payload, payloadSizeBits, &pWritePackedMessage, pPackMessageEnd);
uint8_t *unpack_buf = calloc_or_fail(payloadSizeBytes, sizeof(uint8_t)); uint8_t unpack_buf[payloadSizeBytes];
pWritePackedMessage = msg_buf; pWritePackedMessage = msg_buf;
unpack_dci_payload(unpack_buf, payloadSizeBits, &pWritePackedMessage, pPackMessageEnd); unpack_dci_payload(unpack_buf, payloadSizeBits, &pWritePackedMessage, pPackMessageEnd);
...@@ -115,6 +115,5 @@ int main(int n, char *v[]) ...@@ -115,6 +115,5 @@ int main(int n, char *v[])
DevAssert(memcmp(payload, unpack_buf, payloadSizeBytes) == 0); DevAssert(memcmp(payload, unpack_buf, payloadSizeBytes) == 0);
// All tests successful! // All tests successful!
free(unpack_buf);
return 0; return 0;
} }
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