Merge pull request drowe67#203 from drowe67/ms-warning-cleaup

Clean up warnings when using -Wall

Author: drowe67

src/generate_codebook.c

@@ -80,7 +80,7 @@ dump_structure(const struct codebook * b, int index)
 {
   printf("  {\n");
   printf("    %d,\n", b->k);
-  printf("    %g,\n", log(b->m) / log(2));
+  printf("    %d,\n", (int)roundf(log(b->m) / log(2)));
   printf("    %d,\n", b->m);
   printf("    codes%d\n", index);
   printf("  }");

unittest/CMakeLists.txt

@@ -44,10 +44,10 @@ add_library(function_trace STATIC ../unittest/function_trace.c)
 add_executable(ofdm_stack ofdm_stack.c ../src/ofdm.c ../src/octave.c ../src/kiss_fft.c ../src/modem_probe.c ../src/mpdecode_core.c ../src/phi0.c ../src/filter.c)
 if (CMAKE_C_COMPILER MATCHES "gcc$")
     target_link_libraries(ofdm_stack function_trace m -no-pie "-Wl,-Map=ofdm_stack.map")
-    target_compile_options(ofdm_stack PUBLIC -fstack-usage -finstrument-functions -no-pie)
+    target_compile_options(ofdm_stack PUBLIC -fstack-usage -finstrument-functions)
 else()
     target_link_libraries(ofdm_stack function_trace m -no-pie)
-    target_compile_options(ofdm_stack PUBLIC -finstrument-functions -no-pie)
+    target_compile_options(ofdm_stack PUBLIC -finstrument-functions)
 endif()
 add_definitions(-D__UNITTEST__)
 

unittest/compare_ints.c

@@ -126,7 +126,7 @@ int main(int argc, char *argv[]) {
         uint64_t err = llabs(data1 - data2);
         if (err > tol) {
             errors ++;
-            printf("%d %ld %ld\n", count, data1, data2);
+            printf("%d %lld %lld\n", count, data1, data2);
 	    if (numerrorstoexit != -1)
 	        if (errors > numerrorstoexit) {
 		    printf("reached errors: %d, bailing!", numerrorstoexit);