minor: Rename util to bit_util

include/bit_util.h

@@ -9,8 +9,8 @@
     (at your option) any later version.
 */
 
-#ifndef INCLUDE_UTIL_H_
+#ifndef INCLUDE_BIT_UTIL_H_
-#define INCLUDE_UTIL_H_
+#define INCLUDE_BIT_UTIL_H_
 
 #include <stdint.h>
 
@@ -204,4 +204,4 @@ int add_bytes(uint8_t const message[], unsigned num_bytes);
 /// @return summation value
 int add_nibbles(uint8_t const message[], unsigned num_bytes);
 
-#endif /* INCLUDE_UTIL_H_ */
+#endif /* INCLUDE_BIT_UTIL_H_ */

include/decoder.h

@@ -10,7 +10,7 @@
 #include "r_device.h"
 #include "bitbuffer.h"
 #include "data.h"
-#include "util.h"
+#include "bit_util.h"
 #include "decoder_util.h"
 
 #endif /* INCLUDE_DECODER_H_ */

src/CMakeLists.txt

@@ -8,6 +8,7 @@ add_library(r_433 STATIC
     abuf.c
     am_analyze.c
     baseband.c
+    bit_util.c
     bitbuffer.c
     compat_paths.c
     compat_time.c
@@ -41,7 +42,6 @@ add_library(r_433 STATIC
     samp_grab.c
     sdr.c
     term_ctl.c
-    util.c
     write_sigrok.c
     devices/abmt.c
     devices/acurite.c

src/bit_util.c

@@ -9,7 +9,8 @@
     (at your option) any later version.
 */
 
-#include "util.h"
+#include "bit_util.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

src/output_influx.c

@@ -14,7 +14,6 @@
 // note: our unit header includes unistd.h for gethostname() via data.h
 #include "output_influx.h"
 #include "optparse.h"
-#include "util.h"
 #include "logger.h"
 #include "fatal.h"
 #include "r_util.h"

src/output_mqtt.c

@@ -12,7 +12,7 @@
 // note: our unit header includes unistd.h for gethostname() via data.h
 #include "output_mqtt.h"
 #include "optparse.h"
-#include "util.h"
+#include "bit_util.h"
 #include "logger.h"
 #include "fatal.h"
 #include "r_util.h"

src/pulse_analyzer.c

@@ -11,7 +11,7 @@
 
 #include "pulse_analyzer.h"
 #include "pulse_slicer.h"
-#include "util.h"
+#include "bit_util.h" // for MIN(), MAX()
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

src/pulse_detect.c

@@ -14,7 +14,7 @@
 #include "pulse_detect_fsk.h"
 #include "pulse_data.h"
 #include "baseband.h"
-#include "util.h"
+#include "bit_util.h" // for MIN(), MAX()
 #include "logger.h"
 #include "fatal.h"
 #include <stdio.h>

src/pulse_detect_fsk.c

@@ -12,7 +12,7 @@
 */
 
 #include "pulse_detect_fsk.h"
-#include "util.h"
+#include "bit_util.h" // for MIN(), MAX()
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>

src/pulse_slicer.c

@@ -14,7 +14,7 @@
 #include "pulse_slicer.h"
 #include "pulse_data.h"
 #include "bitbuffer.h"
-#include "util.h"
+#include "bit_util.h" // for MIN()
 #include "logger.h"
 #include "decoder_util.h" // TODO: this should be refactored
 #include <stdio.h>

tests/CMakeLists.txt

@@ -20,7 +20,7 @@ endif()
 ########################################################################
 # target_compile_definitions was only added in CMake 2.8.11
 add_definitions(-D_TEST)
-foreach(testSrc bitbuffer.c fileformat.c optparse.c util.c)
+foreach(testSrc bitbuffer.c fileformat.c optparse.c bit_util.c)
     get_filename_component(testName ${testSrc} NAME_WE)
 
     add_executable(test_${testName} ../src/${testSrc})