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

Fix unportable definition of BSWAP64() macro.

Browse Source 
We have a portable way of writing uint64 constants, but whoever wrote
this macro didn't know about it.

While at it, fix unsafe under-parenthesization of arguments.  That might
be moot, because there are already good reasons not to use the macro on
anything more complicated than a simple variable, but it's still poor
practice.

Per buildfarm warnings.
This commit is contained in:
Tom Lane 2017-02-24 15:21:39 -05:00
parent 5dbdb2f799
commit 41c16edcf6
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/include/port/pg_bswap.h
View File

@ -6,6 +6,7 @@
* Macros for reversing the byte order of 32-bit and 64-bit unsigned integers. * Macros for reversing the byte order of 32-bit and 64-bit unsigned integers.
* For example, 0xAABBCCDD becomes 0xDDCCBBAA. These are just wrappers for * For example, 0xAABBCCDD becomes 0xDDCCBBAA. These are just wrappers for
* built-in functions provided by the compiler where support exists. * built-in functions provided by the compiler where support exists.
* Elsewhere, beware of multiple evaluations of the arguments!
* *
* Note that the GCC built-in functions __builtin_bswap32() and * Note that the GCC built-in functions __builtin_bswap32() and
* __builtin_bswap64() are documented as accepting single arguments of type * __builtin_bswap64() are documented as accepting single arguments of type
@ -24,23 +25,23 @@
#ifdef HAVE__BUILTIN_BSWAP32 #ifdef HAVE__BUILTIN_BSWAP32
#define BSWAP32(x) __builtin_bswap32(x) #define BSWAP32(x) __builtin_bswap32(x)
#else #else
#define BSWAP32(x) (((x << 24) & 0xff000000) | \ #define BSWAP32(x) ((((x) << 24) & 0xff000000) | \
((x << 8) & 0x00ff0000) | \ (((x) << 8) & 0x00ff0000) | \
((x >> 8) & 0x0000ff00) | \ (((x) >> 8) & 0x0000ff00) | \
((x >> 24) & 0x000000ff)) (((x) >> 24) & 0x000000ff))
#endif /* HAVE__BUILTIN_BSWAP32 */ #endif /* HAVE__BUILTIN_BSWAP32 */
#ifdef HAVE__BUILTIN_BSWAP64 #ifdef HAVE__BUILTIN_BSWAP64
#define BSWAP64(x) __builtin_bswap64(x) #define BSWAP64(x) __builtin_bswap64(x)
#else #else
#define BSWAP64(x) (((x << 56) & 0xff00000000000000UL) | \ #define BSWAP64(x) ((((x) << 56) & UINT64CONST(0xff00000000000000)) | \
((x << 40) & 0x00ff000000000000UL) | \ (((x) << 40) & UINT64CONST(0x00ff000000000000)) | \
((x << 24) & 0x0000ff0000000000UL) | \ (((x) << 24) & UINT64CONST(0x0000ff0000000000)) | \
((x << 8) & 0x000000ff00000000UL) | \ (((x) << 8) & UINT64CONST(0x000000ff00000000)) | \
((x >> 8) & 0x00000000ff000000UL) | \ (((x) >> 8) & UINT64CONST(0x00000000ff000000)) | \
((x >> 24) & 0x0000000000ff0000UL) | \ (((x) >> 24) & UINT64CONST(0x0000000000ff0000)) | \
((x >> 40) & 0x000000000000ff00UL) | \ (((x) >> 40) & UINT64CONST(0x000000000000ff00)) | \
((x >> 56) & 0x00000000000000ffUL)) (((x) >> 56) & UINT64CONST(0x00000000000000ff)))
#endif /* HAVE__BUILTIN_BSWAP64 */ #endif /* HAVE__BUILTIN_BSWAP64 */
/* /*