X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fendianness.h;h=3de872ac7d592cd8a31ed44ee2833855ea1856a2;hb=fd763f8533b72067aa38a08849e57f23aa300060;hp=cba645bf30554359eab58152b2f9f14150c13b80;hpb=a73db0665d3154b413e1ba16dd15008abc4b46fa;p=wimlib

diff --git a/src/endianness.h b/src/endianness.h
index cba645bf..3de872ac 100644
--- a/src/endianness.h
+++ b/src/endianness.h
@@ -8,33 +8,36 @@
 /* Watch out for conflicts with ntfs-3g headers... */
 
 #ifndef bswap16
-static inline uint16_t bswap16(uint16_t n)
+static inline uint16_t
+bswap16(uint16_t n)
 {
 	return (n << 8) | (n >> 8);
 }
 #endif /* ifndef bswap16 */
 
 #ifndef bswap32
-static inline uint32_t bswap32(uint32_t n)
+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
 }
 #endif /* ifndef bswap32 */
 
 #ifndef bswap64
-static inline uint64_t bswap64(uint64_t n)
+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 +62,33 @@ 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 */