diff --git a/nfapi/open-nFAPI/common/public_inc/nfapi.h b/nfapi/open-nFAPI/common/public_inc/nfapi.h index e3a5d83b9c2d79e51ba6cbec0c0c6b988b60c28e..99c7d7ec7e2dcc68c43583986cf778fd30715c23 100644 --- a/nfapi/open-nFAPI/common/public_inc/nfapi.h +++ b/nfapi/open-nFAPI/common/public_inc/nfapi.h @@ -77,8 +77,8 @@ uint8_t unpackarray(uint8_t **ppReadPackedMsg, uint8_t *end, unpack_array_elem_fn fn); -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 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); 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); diff --git a/nfapi/open-nFAPI/common/src/nfapi.c b/nfapi/open-nFAPI/common/src/nfapi.c index ae3ab85c05bf87065b5f165f3168f28ea1ef8164..97352b98f79487ede26e257f290d4512a1144b1b 100644 --- a/nfapi/open-nFAPI/common/src/nfapi.c +++ b/nfapi/open-nFAPI/common/src/nfapi.c @@ -618,7 +618,7 @@ uint8_t unpackarray(uint8_t **ppReadPackedMsg, 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; #ifdef FAPI_BYTE_ORDERING_BIG_ENDIAN @@ -648,7 +648,7 @@ uint32_t pack_dci_payload(uint8_t payload[], uint16_t payloadSizeBits, uint8_t * #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 // Helper vars for DCI Payload diff --git a/nfapi/tests/p7/nr_fapi_dci_inversion_test.c b/nfapi/tests/p7/nr_fapi_dci_inversion_test.c index 4c3c05c2e3d1db130bde0a6290c38b944d721837..22e883b0cd91b5246c169b4e35cd6be1bc046acb 100644 --- a/nfapi/tests/p7/nr_fapi_dci_inversion_test.c +++ b/nfapi/tests/p7/nr_fapi_dci_inversion_test.c @@ -108,7 +108,7 @@ void test_pack_payload(uint8_t payloadSizeBits, uint8_t payload[]) 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; unpack_dci_payload(unpack_buf, payloadSizeBits, &pWritePackedMessage, pPackMessageEnd); @@ -128,7 +128,6 @@ void test_pack_payload(uint8_t payloadSizeBits, uint8_t payload[]) DevAssert(memcmp(payload, unpack_buf, payloadSizeBytes) == 0); // All tests successful! - free(unpack_buf); } int main(int n, char *v[])