maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wrap multi-statement macros ENCODE_U8() and ENCODE_U32() in do { ... } while (0) statements

Browse Source
This commit is contained in:
Guido Casati
2024-08-26 10:13:18 +02:00
parent bac4f798f9
commit 9e6435758a
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair3/NAS/COMMON/UTIL/TLVEncoder.h
+8 -6
View File
@@ -24,9 +24,11 @@
#include <arpa/inet.h> // htonl, htons #include <arpa/inet.h> // htonl, htons
#define ENCODE_U8(buffer, value, size) \ #define ENCODE_U8(buffer, value, size) \
*(uint8_t*)(buffer) = value; \ do { \
size += sizeof(uint8_t) *(uint8_t*)(buffer) = value; \
size += sizeof(uint8_t); \
} while (0)
/* Safely encodes a 16-bit value into a buffer, handling /* Safely encodes a 16-bit value into a buffer, handling
misalignment by memcpy 2 bytes to buffer in network misalignment by memcpy 2 bytes to buffer in network
@@ -49,11 +51,11 @@
} while (0) } while (0)
#define ENCODE_U32(buffer, value, size) \ #define ENCODE_U32(buffer, value, size) \
{ \ do { \
uint32_t tmp = htonl(value); \ uint32_t tmp = htonl(value); \
memcpy(buffer, &tmp, sizeof(tmp)); \ memcpy(buffer, &tmp, sizeof(tmp)); \
} \ size += sizeof(uint32_t); \
size += sizeof(uint32_t) } while (0)
#define IES_ENCODE_U8(buffer, encoded, value) \ #define IES_ENCODE_U8(buffer, encoded, value) \
ENCODE_U8(buffer + encoded, value, encoded) ENCODE_U8(buffer + encoded, value, encoded)