Add rbtree files

[wimlib] / src / endianness.h

diff --git a/src/endianness.h b/src/endianness.h
index cba645bf30554359eab58152b2f9f14150c13b80..584b62178769ce80cc9fe593e2ef63f236c5ab15 100644 (file)
--- a/src/endianness.h
+++ b/src/endianness.h
@@ -20,7 +20,7 @@ static inline uint32_t bswap32(uint32_t n)
 #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
        return __builtin_bswap32(n);
 #else
-       return (n << 24) | ((n & 0xff00) << 8) | ((n & 0xff0000) >> 8) | 
+       return (n << 24) | ((n & 0xff00) << 8) | ((n & 0xff0000) >> 8) |
                                                        (n >> 24);
 #endif
 }
@@ -29,12 +29,12 @@ static inline uint32_t bswap32(uint32_t n)
 #ifndef bswap64
 static inline uint64_t bswap64(uint64_t n)
 {
-#ifdef __GNUC__
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
        return __builtin_bswap64(n);
 #else
-       return (n << 56) | ((n & 0xff00) << 40) | ((n & 0xff0000) << 24) | 
-                       ((n & 0xff000000) << 8) | ((n & 0xff00000000) >> 8) | 
-                       ((n & 0xff0000000000) >> 24) | 
+       return (n << 56) | ((n & 0xff00) << 40) | ((n & 0xff0000) << 24) |
+                       ((n & 0xff000000) << 8) | ((n & 0xff00000000) >> 8) |
+                       ((n & 0xff0000000000) >> 24) |
                        ((n & 0xff000000000000) >> 40) | (n >> 56);
 #endif
 }
@@ -59,28 +59,29 @@ static inline uint64_t bswap64(uint64_t n)
 #      endif
 #endif
 
-static inline void array_cpu_to_le32(uint32_t *p, uint64_t n)
+static inline void array_cpu_to_le32(uint32_t *p, size_t n)
 {
-       while (n--)
-               *p++ = cpu_to_le32(*p);
+       for (size_t i = 0; i < n; i++)
+               p[i] = cpu_to_le32(p[i]);
 }
 
-static inline void array_le32_to_cpu(uint32_t *p, uint64_t n)
+static inline void array_le32_to_cpu(uint32_t *p, size_t n)
 {
-       while (n--)
-               *p++ = le32_to_cpu(*p);
+       for (size_t i = 0; i < n; i++)
+               p[i] = le32_to_cpu(p[i]);
 }
 
-static inline void array_cpu_to_le64(uint64_t *p, uint64_t n)
+static inline void array_cpu_to_le64(uint64_t *p, size_t n)
 {
-       while (n--)
-               *p++ = cpu_to_le64(*p);
+       for (size_t i = 0; i < n; i++)
+               p[i] = cpu_to_le64(p[i]);
 }
 
-static inline void array_le64_to_cpu(uint64_t *p, uint64_t n)
+static inline void array_le64_to_cpu(uint64_t *p, size_t n)
 {
-       while (n--)
-               *p++ = le64_to_cpu(*p);
+       for (size_t i = 0; i < n; i++)
+               p[i] = le64_to_cpu(p[i]);
 }
 
+
 #endif /* _WIMLIB_ENDIANNESS_H */