upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add casts to __uint16_t to the __bswap16() macros on all arches which

Browse source 
didn't already have them.  This is because the ternary expression will
return int, due to the Usual Arithmetic Conversions.  Such casts are not
needed for the 32 and 64 bit variants.

While here, add additional parentheses around the x86 variant, to
protect against unintended consequences.

MFC after:	2 weeks
This commit is contained in:
Dimitry Andric 2012-03-09 20:34:31 +00:00
parent ad47abd20c
commit 63d094a7e2
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/powerpc/include/endian.h
View file

@ -124,8 +124,8 @@ __bswap64_var(__uint64_t _x)
((_x << 40) & ((__uint64_t)0xff << 48)) | ((_x << 56)));
}
#define __bswap16(x) (__is_constant(x) ? __bswap16_const(x) : \
__bswap16_var(x))
#define __bswap16(x) ((__uint16_t)(__is_constant(x) ? __bswap16_const(x) : \
__bswap16_var(x)))
#define __bswap32(x) (__is_constant(x) ? __bswap32_const(x) : \
__bswap32_var(x))
#define __bswap64(x) (__is_constant(x) ? __bswap64_const(x) : \

4
sys/sparc64/include/endian.h
View file

@ -109,8 +109,8 @@ __bswap64_var(__uint64_t _x)
((_x << 40) & ((__uint64_t)0xff << 48)) | ((_x << 56)));
}
#define __bswap16(x) (__is_constant(x) ? __bswap16_const(x) : \
__bswap16_var(x))
#define __bswap16(x) ((__uint16_t)(__is_constant(x) ? __bswap16_const(x) : \
__bswap16_var(x)))
#define __bswap32(x) (__is_constant(x) ? __bswap32_const(x) : \
__bswap32_var(x))
#define __bswap64(x) (__is_constant(x) ? __bswap64_const(x) : \

4
sys/x86/include/endian.h
View file

@ -71,8 +71,8 @@
#ifdef __GNUCLIKE_BUILTIN_CONSTANT_P
#define __bswap16(x) \
(__uint16_t)(__builtin_constant_p(x) ? \
__bswap16_gen((__uint16_t)(x)) : __bswap16_var(x))
((__uint16_t)(__builtin_constant_p(x) ? \
__bswap16_gen((__uint16_t)(x)) : __bswap16_var(x)))
#define __bswap32(x) \
(__builtin_constant_p(x) ? \
__bswap32_gen((__uint32_t)(x)) : __bswap32_var(x))