A bit more clang-format

src/include/86box/bswap.h

@@ -36,12 +36,12 @@
  */
 
 #ifndef BSWAP_H
-# define BSWAP_H
+#define BSWAP_H
 
 #include <stdint.h>
 
 #ifdef HAVE_BYTESWAP_H
-#include <byteswap.h>
+#    include <byteswap.h>
 #else
 # define bswap_16(x) \
     ( \
@@ -81,103 +81,111 @@ static __inline uint16_t bswap16(uint16_t x)
 {
     return bswap_16(x);
 }
-#endif
+#    endif
 #else
-static __inline uint16_t bswap16(uint16_t x)
+static __inline uint16_t
+bswap16(uint16_t x)
 {
     return bswap_16(x);
 }
 #endif
 
-#if  __GNUC__ >= 10
-#if defined __has_builtin && __has_builtin(__builtin_bswap32)
-#define bswap32(x) __builtin_bswap32(x)
-#else
-static __inline uint32_t bswap32(uint32_t x)
+#if __GNUC__ >= 10
+#    if defined __has_builtin && __has_builtin(__builtin_bswap32)
+#        define bswap32(x) __builtin_bswap32(x)
+#    else
+static __inline uint32_t
+bswap32(uint32_t x)
 {
     return bswap_32(x);
 }
-#endif
+#    endif
 #else
-static __inline uint32_t bswap32(uint32_t x)
+static __inline uint32_t
+bswap32(uint32_t x)
 {
     return bswap_32(x);
 }
 #endif
 
-#if  __GNUC__ >= 10
-#if defined __has_builtin && __has_builtin(__builtin_bswap64)
-#define bswap64(x) __builtin_bswap64(x)
-#else
-static __inline uint64_t bswap64(uint64_t x)
+#if __GNUC__ >= 10
+#    if defined __has_builtin && __has_builtin(__builtin_bswap64)
+#        define bswap64(x) __builtin_bswap64(x)
+#    else
+static __inline uint64_t
+bswap64(uint64_t x)
 {
     return bswap_64(x);
 }
-#endif
+#    endif
 #else
-static __inline uint64_t bswap64(uint64_t x)
+static __inline uint64_t
+bswap64(uint64_t x)
 {
     return bswap_64(x);
 }
 #endif
 
-static __inline void bswap16s(uint16_t *s)
+static __inline void
+bswap16s(uint16_t *s)
 {
     *s = bswap16(*s);
 }
 
-static __inline void bswap32s(uint32_t *s)
+static __inline void
+bswap32s(uint32_t *s)
 {
     *s = bswap32(*s);
 }
 
-static __inline void bswap64s(uint64_t *s)
+static __inline void
+bswap64s(uint64_t *s)
 {
     *s = bswap64(*s);
 }
 
 #if defined(WORDS_BIGENDIAN)
-# define be_bswap(v, size) (v)
-# define le_bswap(v, size) bswap ## size(v)
-# define be_bswaps(v, size)
-# define le_bswaps(p, size) *p = bswap ## size(*p);
+#    define be_bswap(v, size) (v)
+#    define le_bswap(v, size) bswap##size(v)
+#    define be_bswaps(v, size)
+#    define le_bswaps(p, size) *p = bswap##size(*p);
 #else
-# define le_bswap(v, size) (v)
-# define be_bswap(v, size) bswap ## size(v)
-# define le_bswaps(v, size)
-# define be_bswaps(p, size) *p = bswap ## size(*p);
+#    define le_bswap(v, size) (v)
+#    define be_bswap(v, size) bswap##size(v)
+#    define le_bswaps(v, size)
+#    define be_bswaps(p, size) *p = bswap##size(*p);
 #endif
 
-#define CPU_CONVERT(endian, size, type)\
-static __inline type endian ## size ## _to_cpu(type v)\
-{\
-    return endian ## _bswap(v, size);\
-}\
-\
-static __inline type cpu_to_ ## endian ## size(type v)\
-{\
-    return endian ## _bswap(v, size);\
-}\
-\
-static __inline void endian ## size ## _to_cpus(type *p)\
-{\
-    endian ## _bswaps(p, size)\
-}\
-\
-static __inline void cpu_to_ ## endian ## size ## s(type *p)\
-{\
-    endian ## _bswaps(p, size)\
-}\
-\
-static __inline type endian ## size ## _to_cpup(const type *p)\
-{\
-    return endian ## size ## _to_cpu(*p);\
-}\
-\
-static __inline void cpu_to_ ## endian ## size ## w(type *p, type v)\
-{\
-     *p = cpu_to_ ## endian ## size(v);\
-}
+#define CPU_CONVERT(endian, size, type)                            \
+    static __inline type endian##size##_to_cpu(type v)             \
+    {                                                              \
+        return endian##_bswap(v, size);                            \
+    }                                                              \
+                                                                   \
+    static __inline type cpu_to_##endian##size(type v)             \
+    {                                                              \
+        return endian##_bswap(v, size);                            \
+    }                                                              \
+                                                                   \
+    static __inline void endian##size##_to_cpus(type *p)           \
+    {                                                              \
+        endian##_bswaps(p, size)                                   \
+    }                                                              \
+                                                                   \
+    static __inline void cpu_to_##endian##size##s(type *p)         \
+    {                                                              \
+        endian##_bswaps(p, size)                                   \
+    }                                                              \
+                                                                   \
+    static __inline type endian##size##_to_cpup(const type *p)     \
+    {                                                              \
+        return endian##size##_to_cpu(*p);                          \
+    }                                                              \
+                                                                   \
+    static __inline void cpu_to_##endian##size##w(type *p, type v) \
+    {                                                              \
+        *p = cpu_to_##endian##size(v);                             \
+    }
 
 CPU_CONVERT(be, 16, uint16_t)
 CPU_CONVERT(be, 32, uint32_t)
@@ -191,27 +199,29 @@ CPU_CONVERT(le, 64, uint64_t)
 
 #if defined(__i386__) || defined(__powerpc__)
 
-#define cpu_to_le16wu(p, v) cpu_to_le16w(p, v)
-#define cpu_to_le32wu(p, v) cpu_to_le32w(p, v)
-#define le16_to_cpupu(p) le16_to_cpup(p)
-#define le32_to_cpupu(p) le32_to_cpup(p)
+#    define cpu_to_le16wu(p, v) cpu_to_le16w(p, v)
+#    define cpu_to_le32wu(p, v) cpu_to_le32w(p, v)
+#    define le16_to_cpupu(p)    le16_to_cpup(p)
+#    define le32_to_cpupu(p)    le32_to_cpup(p)
 
-#define cpu_to_be16wu(p, v) cpu_to_be16w(p, v)
-#define cpu_to_be32wu(p, v) cpu_to_be32w(p, v)
+#    define cpu_to_be16wu(p, v) cpu_to_be16w(p, v)
+#    define cpu_to_be32wu(p, v) cpu_to_be32w(p, v)
 
 #else
 
-static __inline void cpu_to_le16wu(uint16_t *p, uint16_t v)
+static __inline void
+cpu_to_le16wu(uint16_t *p, uint16_t v)
 {
-    uint8_t *p1 = (uint8_t *)p;
+    uint8_t *p1 = (uint8_t *) p;
 
     p1[0] = v & 0xff;
     p1[1] = v >> 8;
 }
 
-static __inline void cpu_to_le32wu(uint32_t *p, uint32_t v)
+static __inline void
+cpu_to_le32wu(uint32_t *p, uint32_t v)
 {
-    uint8_t *p1 = (uint8_t *)p;
+    uint8_t *p1 = (uint8_t *) p;
 
     p1[0] = v;
     p1[1] = v >> 8;
@@ -219,29 +229,33 @@ static __inline void cpu_to_le32wu(uint32_t *p, uint32_t v)
     p1[3] = v >> 24;
 }
 
-static __inline uint16_t le16_to_cpupu(const uint16_t *p)
+static __inline uint16_t
+le16_to_cpupu(const uint16_t *p)
 {
-    const uint8_t *p1 = (const uint8_t *)p;
+    const uint8_t *p1 = (const uint8_t *) p;
     return p1[0] | (p1[1] << 8);
 }
 
-static __inline uint32_t le32_to_cpupu(const uint32_t *p)
+static __inline uint32_t
+le32_to_cpupu(const uint32_t *p)
 {
-    const uint8_t *p1 = (const uint8_t *)p;
+    const uint8_t *p1 = (const uint8_t *) p;
     return p1[0] | (p1[1] << 8) | (p1[2] << 16) | (p1[3] << 24);
 }
 
-static __inline void cpu_to_be16wu(uint16_t *p, uint16_t v)
+static __inline void
+cpu_to_be16wu(uint16_t *p, uint16_t v)
 {
-    uint8_t *p1 = (uint8_t *)p;
+    uint8_t *p1 = (uint8_t *) p;
 
     p1[0] = v >> 8;
     p1[1] = v & 0xff;
 }
 
-static __inline void cpu_to_be32wu(uint32_t *p, uint32_t v)
+static __inline void
+cpu_to_be32wu(uint32_t *p, uint32_t v)
 {
-    uint8_t *p1 = (uint8_t *)p;
+    uint8_t *p1 = (uint8_t *) p;
 
     p1[0] = v >> 24;
     p1[1] = v >> 16;
@@ -252,9 +266,9 @@ static __inline void cpu_to_be32wu(uint32_t *p, uint32_t v)
 #endif
 
 #ifdef WORDS_BIGENDIAN
-#define cpu_to_32wu cpu_to_be32wu
+#    define cpu_to_32wu cpu_to_be32wu
 #else
-#define cpu_to_32wu cpu_to_le32wu
+#    define cpu_to_32wu cpu_to_le32wu
 #endif
 
 #undef le_bswap