From 0286b6ec301219620adf553882c3f1bf194c0a5e Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Tue, 14 Jun 2022 14:54:16 -0600 Subject: [PATCH] Fix #2118, Endian macro mask before shift to avoid shift overflow warning --- modules/core_api/fsw/inc/cfe_endian.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core_api/fsw/inc/cfe_endian.h b/modules/core_api/fsw/inc/cfe_endian.h index 96a0f0347..b5cc54fe3 100644 --- a/modules/core_api/fsw/inc/cfe_endian.h +++ b/modules/core_api/fsw/inc/cfe_endian.h @@ -61,9 +61,9 @@ #define CFE_MAKE_BIG16(n) (n) #define CFE_MAKE_BIG32(n) (n) #else -#define CFE_MAKE_BIG16(n) ((((n) << 8) & 0xFF00) | (((n) >> 8) & 0x00FF)) +#define CFE_MAKE_BIG16(n) ((((n)&0x00FF) << 8) | (((n)&0xFF00) >> 8)) #define CFE_MAKE_BIG32(n) \ - ((((n) << 24) & 0xFF000000) | (((n) << 8) & 0x00FF0000) | (((n) >> 8) & 0x0000FF00) | (((n) >> 24) & 0x000000FF)) + ((((n)&0x000000FF) << 24) | (((n)&0x0000FF00) << 8) | (((n)&0x00FF0000) >> 8) | (((n)&0xFF000000) >> 24)) #endif #endif /* CFE_ENDIAN_H */