Merge branch 'josh/enable-extra-warnings-wprototype' into josh/enable-extra-warnings

Author: saxbophone

CMakeLists.txt

@@ -85,8 +85,6 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "")
     enable_c_compiler_flag_if_supported("-pedantic")
     # enable 'extra' strict warnings
     enable_c_compiler_flag_if_supported("-Wextra")
-    # enable warnings on potentially destructive conversions
-    enable_c_compiler_flag_if_supported("-Wconversion")
     # enable warnings on missing prototypes of global functions
     enable_c_compiler_flag_if_supported("-Wmissing-prototypes")
     # convert all warnings into errors

sxbp/initialise.c

@@ -34,7 +34,7 @@ sxbp_direction_t sxbp_change_direction(
     return (current + turn) % 4U;
 }
 
-sxbp_spiral_t sxbp_blank_spiral() {
+sxbp_spiral_t sxbp_blank_spiral(void) {
     return (sxbp_spiral_t){0, NULL, {{NULL, 0}, 0}, false, 0, 0, 0};
 }
 

sxbp/initialise.h

@@ -58,7 +58,7 @@ sxbp_direction_t sxbp_change_direction(
  *
  * @return A blank spiral struct with all fields initialised to 0 or blank values.
  */
-sxbp_spiral_t sxbp_blank_spiral();
+sxbp_spiral_t sxbp_blank_spiral(void);
 
 /**
  * @brief Builds a partially-complete spiral from binary input data stored in a

tests.c

@@ -35,7 +35,7 @@
 #include "sxbp/serialise.h"
 
 
-bool test_sxbp_change_direction() {
+static bool test_sxbp_change_direction(void) {
     if(sxbp_change_direction(SXBP_UP, SXBP_CLOCKWISE) != SXBP_RIGHT) {
         return false;
     } else if(sxbp_change_direction(SXBP_UP, SXBP_ANTI_CLOCKWISE) != SXBP_LEFT) {
@@ -53,7 +53,7 @@ bool test_sxbp_change_direction() {
     }
 }
 
-bool test_sxbp_init_spiral() {
+static bool test_sxbp_init_spiral(void) {
     // success / failure variable
     bool result = true;
     // build buffer of bytes for input data
@@ -99,7 +99,7 @@ bool test_sxbp_init_spiral() {
     return result;
 }
 
-bool test_sxbp_spiral_points() {
+static bool test_sxbp_spiral_points(void) {
     // success variable
     bool success = true;
     // prepare input spiral struct
@@ -153,7 +153,7 @@ bool test_sxbp_spiral_points() {
     return success;
 }
 
-bool test_sxbp_cache_spiral_points_blank() {
+static bool test_sxbp_cache_spiral_points_blank(void) {
     // success variable
     bool success = true;
     // prepare input spiral struct
@@ -207,7 +207,7 @@ bool test_sxbp_cache_spiral_points_blank() {
     return success;
 }
 
-bool test_sxbp_plot_spiral() {
+static bool test_sxbp_plot_spiral(void) {
     // success / failure variable
     bool result = true;
     // build input and output structs
@@ -251,7 +251,7 @@ bool test_sxbp_plot_spiral() {
     return result;
 }
 
-bool test_sxbp_plot_spiral_partial() {
+static bool test_sxbp_plot_spiral_partial(void) {
     // success / failure variable
     bool result = true;
     // build input and output structs
@@ -312,7 +312,7 @@ static void test_progress_callback(
 // re-enable all warnings
 #pragma GCC diagnostic pop
 
-bool test_sxbp_plot_spiral_progress_callback() {
+static bool test_sxbp_plot_spiral_progress_callback(void) {
     // success / failure variable
     bool result = true;
     // build input structs
@@ -347,7 +347,7 @@ bool test_sxbp_plot_spiral_progress_callback() {
     return result;
 }
 
-bool test_sxbp_load_spiral() {
+static bool test_sxbp_load_spiral(void) {
     // success / failure variable
     bool result = true;
     // build buffer of bytes for input data
@@ -431,7 +431,7 @@ bool test_sxbp_load_spiral() {
     return result;
 }
 
-bool test_sxbp_load_spiral_rejects_missing_magic_number() {
+static bool test_sxbp_load_spiral_rejects_missing_magic_number(void) {
     // success / failure variable
     bool result = true;
     // build buffer of bytes for input data
@@ -456,7 +456,7 @@ bool test_sxbp_load_spiral_rejects_missing_magic_number() {
     return result;
 }
 
-bool test_sxbp_load_spiral_rejects_too_small_for_header() {
+static bool test_sxbp_load_spiral_rejects_too_small_for_header(void) {
     // success / failure variable
     bool result = true;
     // build buffer of bytes for input data - should be smaller than 26
@@ -479,7 +479,7 @@ bool test_sxbp_load_spiral_rejects_too_small_for_header() {
     return result;
 }
 
-bool test_sxbp_load_spiral_rejects_too_small_data_section() {
+static bool test_sxbp_load_spiral_rejects_too_small_data_section(void) {
     // success / failure variable
     bool result = true;
     // build buffer of bytes for input data
@@ -519,7 +519,7 @@ bool test_sxbp_load_spiral_rejects_too_small_data_section() {
     return result;
 }
 
-bool test_sxbp_load_spiral_rejects_wrong_version() {
+static bool test_sxbp_load_spiral_rejects_wrong_version(void) {
     // success / failure variable
     bool result = true;
     // build buffer of bytes for input data
@@ -559,7 +559,7 @@ bool test_sxbp_load_spiral_rejects_wrong_version() {
     return result;
 }
 
-bool test_sxbp_dump_spiral() {
+static bool test_sxbp_dump_spiral(void) {
     // success / failure variable
     bool result = true;
     // build input struct
@@ -643,7 +643,7 @@ bool test_sxbp_dump_spiral() {
 // a function pointer to a test case function, and a string containing the
 // test case's name. it will run the test case function and return the success
 // or failure status, which should be stored in the test suite status bool.
-bool run_test_case(
+static bool run_test_case(
     bool test_suite_state, bool (*test_case_func)(), char* test_case_name
 ) {
     printf("%s: ", test_case_name);
@@ -653,7 +653,7 @@ bool run_test_case(
     return test_suite_state && test_result;
 }
 
-int main() {
+int main(void) {
     // set up test suite status flag
     bool result = true;
     // call run_test_case() for each test case