summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Peplin <chris.peplin@rhubarbtech.com>2014-01-07 00:07:11 -0500
committerChristopher Peplin <chris.peplin@rhubarbtech.com>2014-01-07 00:07:11 -0500
commit7f1d5473842361f97fef886bc4e98949ecf853b6 (patch)
treec54ace92b5603b6f1ba3b3f8110339b15e2a51da
parent05e7cb6cfd0929046abe0ea44bab7a43d7f6d0d2 (diff)
Enable warnings when compiling and fix a few.
-rw-r--r--Makefile2
-rw-r--r--src/bitfield/8byte.c4
-rw-r--r--tests/8byte_tests.c1
3 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index d831b5ad..e93efb47 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
CC = gcc
INCLUDES = -Isrc
-CFLAGS = $(INCLUDES) -c -w -Wall -Werror -g -ggdb -coverage
+CFLAGS = $(INCLUDES) -c -Wall -Werror -g -ggdb -coverage
LDFLAGS = -coverage -lm
LDLIBS = -lcheck
diff --git a/src/bitfield/8byte.c b/src/bitfield/8byte.c
index 0ae6894b..9325ed1b 100644
--- a/src/bitfield/8byte.c
+++ b/src/bitfield/8byte.c
@@ -8,8 +8,8 @@
uint8_t eightbyte_get_nibble(const uint64_t source, const uint8_t nibble_index,
const bool data_is_big_endian) {
- return eightbyte_get_bitfield(source, NIBBLE_SIZE * nibble_index, NIBBLE_SIZE,
- data_is_big_endian);
+ return (uint8_t) eightbyte_get_bitfield(source, NIBBLE_SIZE * nibble_index,
+ NIBBLE_SIZE, data_is_big_endian);
}
uint8_t eightbyte_get_byte(uint64_t source, const uint8_t byte_index,
diff --git a/tests/8byte_tests.c b/tests/8byte_tests.c
index 258b8805..64554acc 100644
--- a/tests/8byte_tests.c
+++ b/tests/8byte_tests.c
@@ -1,6 +1,7 @@
#include <check.h>
#include <stdint.h>
#include <bitfield/bitfield.h>
+#include <bitfield/8byte.h>
START_TEST (test_large_bitmask)
{