mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed casts in Data_Read macros.

Browse Source
This commit is contained in:
Armin Novak 2018-10-25 15:48:06 +02:00
parent 423d54d752
commit b7f272cd16
1 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
winpr/include/winpr/endian.h
View File

@ -29,101 +29,101 @@ extern "C" {
#endif #endif
#define Data_Read_UINT8_NE(_d, _v) do { _v = \ #define Data_Read_UINT8_NE(_d, _v) do { _v = \
*((BYTE*) _d); } while (0) *((const BYTE*) _d); } while (0)
#define Data_Read_UINT8(_d, _v) do { _v = \ #define Data_Read_UINT8(_d, _v) do { _v = \
*((BYTE*) _d); } while (0) *((const BYTE*) _d); } while (0)
#define Data_Read_UINT16_NE(_d, _v) do { _v = \ #define Data_Read_UINT16_NE(_d, _v) do { _v = \
*((UINT16*) _d); } while (0) *((const UINT16*) _d); } while (0)
#define Data_Read_UINT16(_d, _v) do { _v = \ #define Data_Read_UINT16(_d, _v) do { _v = \
(UINT16)(*((BYTE*) _d)) + \ (UINT16)(*((const BYTE*) _d)) + \
(((UINT16)(*((BYTE*) _d + 1))) << 8); \ (UINT16)(((UINT16)(*((const BYTE*) _d + 1))) << 8); \
} while (0) } while (0)
#define Data_Read_UINT16_BE(_d, _v) do { _v = \ #define Data_Read_UINT16_BE(_d, _v) do { _v = \
(((UINT16)(*(BYTE*) _d)) << 8) + \ (((UINT16)(*(const BYTE*) _d)) << 8) + \
(UINT16)(*((BYTE*) _d + 1)); \ (UINT16)(*((const BYTE*) _d + 1)); \
} while (0) } while (0)
#define Data_Read_UINT32_NE(_d, _v) do { _v = \ #define Data_Read_UINT32_NE(_d, _v) do { _v = \
*((UINT32*) _d); } while (0) *((UINT32*) _d); } while (0)
#define Data_Read_UINT32(_d, _v) do { _v = \ #define Data_Read_UINT32(_d, _v) do { _v = \
(UINT32)(*((BYTE*) _d)) + \ (UINT32)(*((const BYTE*) _d)) + \
(((UINT32)(*((BYTE*) _d + 1))) << 8) + \ (((UINT32)(*((const BYTE*) _d + 1))) << 8) + \
(((UINT32)(*((BYTE*) _d + 2))) << 16) + \ (((UINT32)(*((const BYTE*) _d + 2))) << 16) + \
(((UINT32)(*((BYTE*) _d + 3))) << 24); \ (((UINT32)(*((const BYTE*) _d + 3))) << 24); \
} while (0) } while (0)
#define Data_Read_UINT32_BE(_d, _v) do { _v = \ #define Data_Read_UINT32_BE(_d, _v) do { _v = \
(((UINT32)(*((BYTE*) _d))) << 24) + \ (((UINT32)(*((const BYTE*) _d))) << 24) + \
(((UINT32)(*((BYTE*) _d + 1))) << 16) + \ (((UINT32)(*((const BYTE*) _d + 1))) << 16) + \
(((UINT32)(*((BYTE*) _d + 2))) << 8) + \ (((UINT32)(*((const BYTE*) _d + 2))) << 8) + \
(((UINT32)(*((BYTE*) _d + 3)))); \ (((UINT32)(*((const BYTE*) _d + 3)))); \
} while (0) } while (0)
#define Data_Read_UINT64_NE(_d, _v) do { _v = \ #define Data_Read_UINT64_NE(_d, _v) do { _v = \
*((UINT64*) _d); } while (0) *((UINT64*) _d); } while (0)
#define Data_Read_UINT64(_d, _v) do { _v = \ #define Data_Read_UINT64(_d, _v) do { _v = \
(UINT64)(*((BYTE*) _d)) + \ (UINT64)(*((const BYTE*) _d)) + \
(((UINT64)(*((BYTE*) _d + 1))) << 8) + \ (((UINT64)(*((const BYTE*) _d + 1))) << 8) + \
(((UINT64)(*((BYTE*) _d + 2))) << 16) + \ (((UINT64)(*((const BYTE*) _d + 2))) << 16) + \
(((UINT64)(*((BYTE*) _d + 3))) << 24) + \ (((UINT64)(*((const BYTE*) _d + 3))) << 24) + \
(((UINT64)(*((BYTE*) _d + 4))) << 32) + \ (((UINT64)(*((const BYTE*) _d + 4))) << 32) + \
(((UINT64)(*((BYTE*) _d + 5))) << 40) + \ (((UINT64)(*((const BYTE*) _d + 5))) << 40) + \
(((UINT64)(*((BYTE*) _d + 6))) << 48) + \ (((UINT64)(*((const BYTE*) _d + 6))) << 48) + \
(((UINT64)(*((BYTE*) _d + 7))) << 56); \ (((UINT64)(*((const BYTE*) _d + 7))) << 56); \
} while (0) } while (0)
#define Data_Write_UINT8_NE(_d, _v) do { \ #define Data_Write_UINT8_NE(_d, _v) do { \
*((UINT8*) _d) = v; } while (0) *((UINT8*) _d) = v; } while (0)
#define Data_Write_UINT8(_d, _v) do { \ #define Data_Write_UINT8(_d, _v) do { \
*_d = (UINT8)(_v); } while (0) *_d = (UINT8)(_v); } while (0)
#define Data_Write_UINT16_NE(_d, _v) do { \ #define Data_Write_UINT16_NE(_d, _v) do { \
*((UINT16*) _d) = _v; } while (0) *((UINT16*) _d) = _v; } while (0)
#define Data_Write_UINT16(_d, _v) do { \ #define Data_Write_UINT16(_d, _v) do { \
*((BYTE*) _d) = (_v) & 0xFF; \ *((BYTE*) _d) = (_v) & 0xFF; \
*((BYTE*) _d + 1) = ((_v) >> 8) & 0xFF; \ *((BYTE*) _d + 1) = ((_v) >> 8) & 0xFF; \
} while (0) } while (0)
#define Data_Write_UINT16_BE(_d, _v) do { \ #define Data_Write_UINT16_BE(_d, _v) do { \
*((BYTE*) _d) = ((_v) >> 8) & 0xFF; \ *((BYTE*) _d) = ((_v) >> 8) & 0xFF; \
*((BYTE*) _d + 1) = (_v) & 0xFF; \ *((BYTE*) _d + 1) = (_v) & 0xFF; \
} while (0) } while (0)
#define Data_Write_UINT32_NE(_d, _v) do { \ #define Data_Write_UINT32_NE(_d, _v) do { \
*((UINT32*) _d) = _v; } while (0) *((UINT32*) _d) = _v; } while (0)
#define Data_Write_UINT32(_d, _v) do { \ #define Data_Write_UINT32(_d, _v) do { \
*((BYTE*) _d) = (_v) & 0xFF; \ *((BYTE*) _d) = (_v) & 0xFF; \
*((BYTE*) _d + 1) = ((_v) >> 8) & 0xFF; \ *((BYTE*) _d + 1) = ((_v) >> 8) & 0xFF; \
*((BYTE*) _d + 2) = ((_v) >> 16) & 0xFF; \ *((BYTE*) _d + 2) = ((_v) >> 16) & 0xFF; \
*((BYTE*) _d + 3) = ((_v) >> 24) & 0xFF; \ *((BYTE*) _d + 3) = ((_v) >> 24) & 0xFF; \
} while (0) } while (0)
#define Data_Write_UINT32_BE(_d, _v) do { \ #define Data_Write_UINT32_BE(_d, _v) do { \
Data_Write_UINT16_BE((BYTE*) _d, ((_v) >> 16 & 0xFFFF)); \ Data_Write_UINT16_BE((BYTE*) _d, ((_v) >> 16 & 0xFFFF)); \
Data_Write_UINT16_BE((BYTE*) _d + 2, ((_v) & 0xFFFF)); \ Data_Write_UINT16_BE((BYTE*) _d + 2, ((_v) & 0xFFFF)); \
} while (0) } while (0)
#define Data_Write_UINT64_NE(_d, _v) do { \ #define Data_Write_UINT64_NE(_d, _v) do { \
*((UINT64*) _d) = _v; } while (0) *((UINT64*) _d) = _v; } while (0)
#define Data_Write_UINT64(_d, _v) do { \ #define Data_Write_UINT64(_d, _v) do { \
*((BYTE*) _d) = (UINT64)(_v) & 0xFF; \ *((BYTE*) _d) = (UINT64)(_v) & 0xFF; \
*((BYTE*) _d + 1) = ((UINT64)(_v) >> 8) & 0xFF; \ *((BYTE*) _d + 1) = ((UINT64)(_v) >> 8) & 0xFF; \
*((BYTE*) _d + 2) = ((UINT64)(_v) >> 16) & 0xFF; \ *((BYTE*) _d + 2) = ((UINT64)(_v) >> 16) & 0xFF; \
*((BYTE*) _d + 3) = ((UINT64)(_v) >> 24) & 0xFF; \ *((BYTE*) _d + 3) = ((UINT64)(_v) >> 24) & 0xFF; \
*((BYTE*) _d + 4) = ((UINT64)(_v) >> 32) & 0xFF; \ *((BYTE*) _d + 4) = ((UINT64)(_v) >> 32) & 0xFF; \
*((BYTE*) _d + 5) = ((UINT64)(_v) >> 40) & 0xFF; \ *((BYTE*) _d + 5) = ((UINT64)(_v) >> 40) & 0xFF; \
*((BYTE*) _d + 6) = ((UINT64)(_v) >> 48) & 0xFF; \ *((BYTE*) _d + 6) = ((UINT64)(_v) >> 48) & 0xFF; \
*((BYTE*) _d + 7) = ((UINT64)(_v) >> 56) & 0xFF; \ *((BYTE*) _d + 7) = ((UINT64)(_v) >> 56) & 0xFF; \
} while (0) } while (0)
#ifdef __cplusplus #ifdef __cplusplus