@@ -200,15 +200,15 @@
 # define of_bswap32(i) of_bswap32_const(i)
 # define of_bswap64(i) of_bswap64_const(i)
 #endif
 
 static OF_INLINE void
-of_bswap32_vec(uint32_t *buf, size_t len)
+of_bswap32_vec(uint32_t *buffer, size_t length)
 {
-	while (len--) {
-		*buf = of_bswap32(*buf);
-		buf++;
+	while (length--) {
+		*buffer = of_bswap32(*buffer);
+		buffer++;
 	}
 }
 
 #ifdef OF_BIG_ENDIAN
 # define of_bswap16_if_be(i) of_bswap16(i)
@@ -226,13 +226,13 @@
 # define of_bswap32_if_le(i) of_bswap32(i)
 # define of_bswap64_if_le(i) of_bswap64(i)
 # define of_bswap32_vec_if_be(buf, len)
 #endif
 
-#define OF_ROL(val, bits)						\
-	(((val) << ((bits) % (sizeof(val) * 8))) |			\
-	(val) >> (sizeof(val) * 8 - ((bits) % (sizeof(val) * 8))))
+#define OF_ROL(value, bits)						\
+	(((value) << ((bits) % (sizeof(value) * 8))) |			\
+	(value) >> (sizeof(value) * 8 - ((bits) % (sizeof(value) * 8))))
 
 #define OF_HASH_INIT(hash) hash = 0
 #define OF_HASH_ADD(hash, byte)		\
 	{				\
 		hash += (uint8_t)byte;	\