1 files changed, 21 insertions, 19 deletions

diff --git a/src/bitfield/8byte.c b/src/bitfield/8byte.c
index 0f249d93..77251996 100644
--- a/src/bitfield/8byte.c
+++ b/src/bitfield/8byte.c
@@ -4,11 +4,13 @@
 #include <limits.h>
 #include <string.h>
 
-uint64_t bitmask(const uint8_t numBits) {
-    return (((uint64_t)0x1) << numBits) - 1;
+#define EIGHTBYTE_BIT (8 * sizeof(uint64_t))
+
+uint64_t bitmask(const uint8_t bit_count) {
+    return (((uint64_t)0x1) << bit_count) - 1;
 }
 
-static uint16_t bitsToBytes(uint32_t bits) {
+static uint16_t bits_to_bytes(uint32_t bits) {
     uint8_t byte_count = bits / CHAR_BIT;
     if(bits % CHAR_BIT != 0) {
         ++byte_count;
@@ -16,21 +18,21 @@ static uint16_t bitsToBytes(uint32_t bits) {
     return byte_count;
 }
 
-uint64_t getBitField(uint64_t data, const uint16_t startBit,
-        const uint16_t numBits, bool bigEndian) {
+uint64_t get_bit_field(uint64_t source, const uint16_t startBit,
+        const uint16_t bit_count, bool big_endian) {
     uint8_t result[8] = {0};
-    if(!bigEndian) {
-        data = __builtin_bswap64(data);
+    if(!big_endian) {
+        source = __builtin_bswap64(source);
     }
-    copyBitsRightAligned((const uint8_t*)&data, sizeof(data), startBit, numBits,
-            result, sizeof(result));
+    copyBitsRightAligned((const uint8_t*)&source, sizeof(source), startBit,
+            bit_count, result, sizeof(result));
     uint64_t int_result = 0;
 
-    if(!bigEndian) {
+    if(!big_endian) {
         // we need to swap the byte order of the array to get it into a
         // uint64_t, but it's been right aligned so we have to be more careful
-        for(int i = 0; i < bitsToBytes(numBits); i++) {
-            int_result |= result[bitsToBytes(numBits) - i - 1] << (CHAR_BIT * i);
+        for(int i = 0; i < bits_to_bytes(bit_count); i++) {
+            int_result |= result[bits_to_bytes(bit_count) - i - 1] << (CHAR_BIT * i);
         }
     } else {
         int_result = *(uint64_t*)result;
@@ -42,15 +44,15 @@ uint64_t getBitField(uint64_t data, const uint16_t startBit,
  * TODO it would be nice to have a warning if you call with this a value that
  * won't fit in the number of bits you've specified it should use.
  */
-void setBitField(uint64_t* data, uint64_t value, const uint16_t startPos,
-        const uint16_t numBits) {
-    int shiftDistance = 64 - startPos - numBits;
+void set_bit_field(uint64_t* destination, uint64_t value, const uint16_t offset,
+        const uint16_t bit_count) {
+    int shiftDistance = EIGHTBYTE_BIT - offset - bit_count;
     value <<= shiftDistance;
-    *data &= ~(bitmask(numBits) << shiftDistance);
-    *data |= value;
+    *destination &= ~(bitmask(bit_count) << shiftDistance);
+    *destination |= value;
 }
 
-uint8_t nthByte(const uint64_t source, const uint16_t byteNum) {
-    return (source >> (64 - ((byteNum + 1) * CHAR_BIT))) & 0xFF;
+uint8_t nth_byte(const uint64_t source, const uint16_t byte_index) {
+    return (source >> (EIGHTBYTE_BIT - ((byte_index + 1) * CHAR_BIT))) & 0xFF;
 }