From d1f8e843d5e4cbb06ff9cb5a908b48688cc9abb3 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 5 Jan 2021 09:35:42 +0100 Subject: [PATCH] shared: don't clang-format "shared/nm-std-aux/unaligned.h" "shared/nm-std-aux/unaligned.h" is taken from systemd and frequently re-imported via the "systemd" branch. It is not our code, and should not be formatted with our clang-format. --- contrib/scripts/nm-code-format.sh | 11 ++- shared/nm-std-aux/unaligned.h | 144 ++++++++++-------------------- 2 files changed, 55 insertions(+), 100 deletions(-) diff --git a/contrib/scripts/nm-code-format.sh b/contrib/scripts/nm-code-format.sh index 3552413bfe..f5e0528e89 100755 --- a/contrib/scripts/nm-code-format.sh +++ b/contrib/scripts/nm-code-format.sh @@ -26,16 +26,19 @@ while (( $# )); do done NM_ROOT=$(git rev-parse --show-toplevel) -EXCLUDE=":(exclude)shared/systemd/src - :(exclude)src/systemd/src - :(exclude)shared/n-dhcp4 +EXCLUDE=" :(exclude)shared/c-list :(exclude)shared/c-list :(exclude)shared/c-list :(exclude)shared/c-rbtree :(exclude)shared/c-siphash :(exclude)shared/c-stdaux - :(exclude)shared/n-acd" + :(exclude)shared/n-acd + :(exclude)shared/n-dhcp4 + :(exclude)shared/nm-std-aux/unaligned.h + :(exclude)shared/systemd/src + :(exclude)src/systemd/src +" if ! command -v clang-format &> /dev/null; then echo -n "Error: clang-format is not installed, " diff --git a/shared/nm-std-aux/unaligned.h b/shared/nm-std-aux/unaligned.h index 2a811aaa39..4100be0803 100644 --- a/shared/nm-std-aux/unaligned.h +++ b/shared/nm-std-aux/unaligned.h @@ -6,142 +6,94 @@ /* BE */ -static inline uint16_t -unaligned_read_be16(const void *_u) -{ - const struct __attribute__((__packed__, __may_alias__)) { - uint16_t x; - } *u = _u; +static inline uint16_t unaligned_read_be16(const void *_u) { + const struct __attribute__((__packed__, __may_alias__)) { uint16_t x; } *u = _u; - return be16toh(u->x); + return be16toh(u->x); } -static inline uint32_t -unaligned_read_be32(const void *_u) -{ - const struct __attribute__((__packed__, __may_alias__)) { - uint32_t x; - } *u = _u; +static inline uint32_t unaligned_read_be32(const void *_u) { + const struct __attribute__((__packed__, __may_alias__)) { uint32_t x; } *u = _u; - return be32toh(u->x); + return be32toh(u->x); } -static inline uint64_t -unaligned_read_be64(const void *_u) -{ - const struct __attribute__((__packed__, __may_alias__)) { - uint64_t x; - } *u = _u; +static inline uint64_t unaligned_read_be64(const void *_u) { + const struct __attribute__((__packed__, __may_alias__)) { uint64_t x; } *u = _u; - return be64toh(u->x); + return be64toh(u->x); } -static inline void -unaligned_write_be16(void *_u, uint16_t a) -{ - struct __attribute__((__packed__, __may_alias__)) { - uint16_t x; - } *u = _u; +static inline void unaligned_write_be16(void *_u, uint16_t a) { + struct __attribute__((__packed__, __may_alias__)) { uint16_t x; } *u = _u; - u->x = be16toh(a); + u->x = be16toh(a); } -static inline void -unaligned_write_be32(void *_u, uint32_t a) -{ - struct __attribute__((__packed__, __may_alias__)) { - uint32_t x; - } *u = _u; +static inline void unaligned_write_be32(void *_u, uint32_t a) { + struct __attribute__((__packed__, __may_alias__)) { uint32_t x; } *u = _u; - u->x = be32toh(a); + u->x = be32toh(a); } -static inline void -unaligned_write_be64(void *_u, uint64_t a) -{ - struct __attribute__((__packed__, __may_alias__)) { - uint64_t x; - } *u = _u; +static inline void unaligned_write_be64(void *_u, uint64_t a) { + struct __attribute__((__packed__, __may_alias__)) { uint64_t x; } *u = _u; - u->x = be64toh(a); + u->x = be64toh(a); } /* LE */ -static inline uint16_t -unaligned_read_le16(const void *_u) -{ - const struct __attribute__((__packed__, __may_alias__)) { - uint16_t x; - } *u = _u; +static inline uint16_t unaligned_read_le16(const void *_u) { + const struct __attribute__((__packed__, __may_alias__)) { uint16_t x; } *u = _u; - return le16toh(u->x); + return le16toh(u->x); } -static inline uint32_t -unaligned_read_le32(const void *_u) -{ - const struct __attribute__((__packed__, __may_alias__)) { - uint32_t x; - } *u = _u; +static inline uint32_t unaligned_read_le32(const void *_u) { + const struct __attribute__((__packed__, __may_alias__)) { uint32_t x; } *u = _u; - return le32toh(u->x); + return le32toh(u->x); } -static inline uint64_t -unaligned_read_le64(const void *_u) -{ - const struct __attribute__((__packed__, __may_alias__)) { - uint64_t x; - } *u = _u; +static inline uint64_t unaligned_read_le64(const void *_u) { + const struct __attribute__((__packed__, __may_alias__)) { uint64_t x; } *u = _u; - return le64toh(u->x); + return le64toh(u->x); } -static inline void -unaligned_write_le16(void *_u, uint16_t a) -{ - struct __attribute__((__packed__, __may_alias__)) { - uint16_t x; - } *u = _u; +static inline void unaligned_write_le16(void *_u, uint16_t a) { + struct __attribute__((__packed__, __may_alias__)) { uint16_t x; } *u = _u; - u->x = le16toh(a); + u->x = le16toh(a); } -static inline void -unaligned_write_le32(void *_u, uint32_t a) -{ - struct __attribute__((__packed__, __may_alias__)) { - uint32_t x; - } *u = _u; +static inline void unaligned_write_le32(void *_u, uint32_t a) { + struct __attribute__((__packed__, __may_alias__)) { uint32_t x; } *u = _u; - u->x = le32toh(a); + u->x = le32toh(a); } -static inline void -unaligned_write_le64(void *_u, uint64_t a) -{ - struct __attribute__((__packed__, __may_alias__)) { - uint64_t x; - } *u = _u; +static inline void unaligned_write_le64(void *_u, uint64_t a) { + struct __attribute__((__packed__, __may_alias__)) { uint64_t x; } *u = _u; - u->x = le64toh(a); + u->x = le64toh(a); } #if __BYTE_ORDER == __BIG_ENDIAN - #define unaligned_read_ne16 unaligned_read_be16 - #define unaligned_read_ne32 unaligned_read_be32 - #define unaligned_read_ne64 unaligned_read_be64 +#define unaligned_read_ne16 unaligned_read_be16 +#define unaligned_read_ne32 unaligned_read_be32 +#define unaligned_read_ne64 unaligned_read_be64 - #define unaligned_write_ne16 unaligned_write_be16 - #define unaligned_write_ne32 unaligned_write_be32 - #define unaligned_write_ne64 unaligned_write_be64 +#define unaligned_write_ne16 unaligned_write_be16 +#define unaligned_write_ne32 unaligned_write_be32 +#define unaligned_write_ne64 unaligned_write_be64 #else - #define unaligned_read_ne16 unaligned_read_le16 - #define unaligned_read_ne32 unaligned_read_le32 - #define unaligned_read_ne64 unaligned_read_le64 +#define unaligned_read_ne16 unaligned_read_le16 +#define unaligned_read_ne32 unaligned_read_le32 +#define unaligned_read_ne64 unaligned_read_le64 - #define unaligned_write_ne16 unaligned_write_le16 - #define unaligned_write_ne32 unaligned_write_le32 - #define unaligned_write_ne64 unaligned_write_le64 +#define unaligned_write_ne16 unaligned_write_le16 +#define unaligned_write_ne32 unaligned_write_le32 +#define unaligned_write_ne64 unaligned_write_le64 #endif