clang-format Mosh
Run clang-format over the Mosh source tree. This is a large change and
has been factored into its own commit for auditability. Reproduce it
with
find . -name \*.cc -or -name \*.h | while read f; do clang-format -i --style=file $f; done
This commit is contained in:
committed by
Alex Chernyakhovsky
parent
0b15dc94fa
commit
3acaa1c4d3
+40
-45
@@ -37,12 +37,12 @@
|
||||
|
||||
#if HAVE_DECL_BE64TOH || HAVE_DECL_BETOH64
|
||||
|
||||
# if defined(HAVE_ENDIAN_H)
|
||||
# include <endian.h>
|
||||
# elif defined(HAVE_SYS_ENDIAN_H)
|
||||
# include <sys/types.h>
|
||||
# include <sys/endian.h>
|
||||
# endif
|
||||
#if defined( HAVE_ENDIAN_H )
|
||||
#include <endian.h>
|
||||
#elif defined( HAVE_SYS_ENDIAN_H )
|
||||
#include <sys/endian.h>
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
|
||||
#if !HAVE_DECL_BE64TOH && HAVE_DECL_BETOH64
|
||||
#define be64toh betoh64
|
||||
@@ -50,11 +50,11 @@
|
||||
#endif
|
||||
|
||||
#elif HAVE_OSX_SWAP
|
||||
# include <libkern/OSByteOrder.h>
|
||||
# define htobe64 OSSwapHostToBigInt64
|
||||
# define be64toh OSSwapBigToHostInt64
|
||||
# define htobe16 OSSwapHostToBigInt16
|
||||
# define be16toh OSSwapBigToHostInt16
|
||||
#include <libkern/OSByteOrder.h>
|
||||
#define htobe64 OSSwapHostToBigInt64
|
||||
#define be64toh OSSwapBigToHostInt64
|
||||
#define htobe16 OSSwapHostToBigInt16
|
||||
#define be16toh OSSwapBigToHostInt16
|
||||
|
||||
#else
|
||||
|
||||
@@ -70,60 +70,55 @@
|
||||
|
||||
/* Use unions rather than casts, to comply with strict aliasing rules. */
|
||||
|
||||
inline uint64_t htobe64( uint64_t x ) {
|
||||
uint8_t xs[ 8 ] = {
|
||||
static_cast<uint8_t>( ( x >> 56 ) & 0xFF ),
|
||||
static_cast<uint8_t>( ( x >> 48 ) & 0xFF ),
|
||||
static_cast<uint8_t>( ( x >> 40 ) & 0xFF ),
|
||||
static_cast<uint8_t>( ( x >> 32 ) & 0xFF ),
|
||||
static_cast<uint8_t>( ( x >> 24 ) & 0xFF ),
|
||||
static_cast<uint8_t>( ( x >> 16 ) & 0xFF ),
|
||||
static_cast<uint8_t>( ( x >> 8 ) & 0xFF ),
|
||||
static_cast<uint8_t>( ( x ) & 0xFF ) };
|
||||
inline uint64_t htobe64( uint64_t x )
|
||||
{
|
||||
uint8_t xs[8] = { static_cast<uint8_t>( ( x >> 56 ) & 0xFF ),
|
||||
static_cast<uint8_t>( ( x >> 48 ) & 0xFF ),
|
||||
static_cast<uint8_t>( ( x >> 40 ) & 0xFF ),
|
||||
static_cast<uint8_t>( ( x >> 32 ) & 0xFF ),
|
||||
static_cast<uint8_t>( ( x >> 24 ) & 0xFF ),
|
||||
static_cast<uint8_t>( ( x >> 16 ) & 0xFF ),
|
||||
static_cast<uint8_t>( ( x >> 8 ) & 0xFF ),
|
||||
static_cast<uint8_t>( (x)&0xFF ) };
|
||||
union {
|
||||
const uint8_t *p8;
|
||||
const uint64_t *p64;
|
||||
const uint8_t* p8;
|
||||
const uint64_t* p64;
|
||||
} u;
|
||||
u.p8 = xs;
|
||||
return *u.p64;
|
||||
}
|
||||
|
||||
inline uint64_t be64toh( uint64_t x ) {
|
||||
inline uint64_t be64toh( uint64_t x )
|
||||
{
|
||||
union {
|
||||
const uint8_t *p8;
|
||||
const uint64_t *p64;
|
||||
const uint8_t* p8;
|
||||
const uint64_t* p64;
|
||||
} u;
|
||||
u.p64 = &x;
|
||||
return ( uint64_t( u.p8[ 0 ] ) << 56 )
|
||||
| ( uint64_t( u.p8[ 1 ] ) << 48 )
|
||||
| ( uint64_t( u.p8[ 2 ] ) << 40 )
|
||||
| ( uint64_t( u.p8[ 3 ] ) << 32 )
|
||||
| ( uint64_t( u.p8[ 4 ] ) << 24 )
|
||||
| ( uint64_t( u.p8[ 5 ] ) << 16 )
|
||||
| ( uint64_t( u.p8[ 6 ] ) << 8 )
|
||||
| ( uint64_t( u.p8[ 7 ] ) );
|
||||
return ( uint64_t( u.p8[0] ) << 56 ) | ( uint64_t( u.p8[1] ) << 48 ) | ( uint64_t( u.p8[2] ) << 40 )
|
||||
| ( uint64_t( u.p8[3] ) << 32 ) | ( uint64_t( u.p8[4] ) << 24 ) | ( uint64_t( u.p8[5] ) << 16 )
|
||||
| ( uint64_t( u.p8[6] ) << 8 ) | ( uint64_t( u.p8[7] ) );
|
||||
}
|
||||
|
||||
inline uint16_t htobe16( uint16_t x ) {
|
||||
uint8_t xs[ 2 ] = {
|
||||
static_cast<uint8_t>( ( x >> 8 ) & 0xFF ),
|
||||
static_cast<uint8_t>( ( x ) & 0xFF ) };
|
||||
inline uint16_t htobe16( uint16_t x )
|
||||
{
|
||||
uint8_t xs[2] = { static_cast<uint8_t>( ( x >> 8 ) & 0xFF ), static_cast<uint8_t>( (x)&0xFF ) };
|
||||
union {
|
||||
const uint8_t *p8;
|
||||
const uint16_t *p16;
|
||||
const uint8_t* p8;
|
||||
const uint16_t* p16;
|
||||
} u;
|
||||
u.p8 = xs;
|
||||
return *u.p16;
|
||||
}
|
||||
|
||||
inline uint16_t be16toh( uint16_t x ) {
|
||||
inline uint16_t be16toh( uint16_t x )
|
||||
{
|
||||
union {
|
||||
const uint8_t *p8;
|
||||
const uint16_t *p16;
|
||||
const uint8_t* p8;
|
||||
const uint16_t* p16;
|
||||
} u;
|
||||
u.p16 = &x;
|
||||
return ( uint16_t( u.p8[ 0 ] ) << 8 )
|
||||
| ( uint16_t( u.p8[ 1 ] ) );
|
||||
return ( uint16_t( u.p8[0] ) << 8 ) | ( uint16_t( u.p8[1] ) );
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user