Warning cleanup

srdja · Feb 3, 2024 · 573ef53 · 573ef53
1 parent ec0c427
commit 573ef53
Show file tree

Hide file tree

Showing 32 changed files with 786 additions and 66 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.15)
 
 set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
 
@@ -8,7 +8,7 @@ if(UNIX)
     set(CFLAGS "-Wall")
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}	${CFLAGS}")
 elseif(MSVC)
-    set(CFLAGS "/W4")
+    set(CFLAGS "/W3")
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}	${CFLAGS}")
 endif()
 

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.15)
 
 set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
 

diff --git a/examples/hashtable/CMakeLists.txt b/examples/hashtable/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.15)
 project(collectc_hashtable_examples)
 
 include_directories(${PROJECT_SOURCE_DIR}/include ${collectc_INCLUDE_DIRS})

diff --git a/examples/hashtable/initialization/configuration.c b/examples/hashtable/initialization/configuration.c
@@ -7,6 +7,9 @@
 
 int main(int argc, char **argv)
 {
+    (void)argc;
+    (void)argv;
+
     CC_HashTableConf config;
     cc_hashtable_conf_init(&config);
 

diff --git a/examples/hashtable/initialization/custom_key_types.c b/examples/hashtable/initialization/custom_key_types.c
@@ -26,6 +26,9 @@ int point_compare(const void *key1, const void *key2)
 
 int main(int argc, char **argv)
 {
+    (void)argc;
+    (void)argv;
+
     /* Define the config structure (for more details check the
        configuration example) */
     CC_HashTableConf config;

diff --git a/examples/hashtable/initialization/pointer_keys.c b/examples/hashtable/initialization/pointer_keys.c
@@ -16,6 +16,9 @@ int pointer_equality(const void *k1, const void *k2)
 
 int main(int argc, char **argv)
 {
+    (void)argc;
+    (void)argv;
+
     /* ************************************************************
       Config strcture
     ************************************************************/

diff --git a/examples/hashtable/initialization/string_keys.c b/examples/hashtable/initialization/string_keys.c
@@ -5,6 +5,9 @@
 
 int main(int argc, char **argv)
 {
+    (void)argc;
+    (void)argv;
+
     /* Define a new table pointer */
     CC_HashTable *string_table;
 

diff --git a/examples/hashtable/operations/adding_key_value_pairs.c b/examples/hashtable/operations/adding_key_value_pairs.c
@@ -3,6 +3,9 @@
 
 int main(int argc, char **argv)
 {
+    (void)argc;
+    (void)argv;
+
     /* Make a new string key table */
     CC_HashTable *table;
     cc_hashtable_new(&table);

diff --git a/examples/hashtable/operations/getting_info_about_the_table_and_pairs.c b/examples/hashtable/operations/getting_info_about_the_table_and_pairs.c
@@ -4,6 +4,9 @@
 
 int main(int argc, char **argv)
 {
+    (void)argc;
+    (void)argv;
+
     // Make a new string key table
     CC_HashTable *table;
     cc_hashtable_new(&table);
@@ -21,7 +24,7 @@ int main(int argc, char **argv)
     // Size represents the number of key value pairs currently
     // stored inside the table.
     size_t size = cc_hashtable_size(table);
-    printf("Table size: %lu\n", size);
+    printf("Table size: %llu\n", size);
 
     // ************************************************************
     // Getting the capacity of the table
@@ -30,7 +33,7 @@ int main(int argc, char **argv)
     // Capacity represents the size of the internal array. (check
     // the initialization example for more info).
     size_t capacity = cc_hashtable_capacity(table);
-    printf("Table capacity: %lu\n", capacity);
+    printf("Table capacity: %llu\n", capacity);
 
     // ************************************************************
     // Check if a key is present

diff --git a/examples/hashtable/operations/iterating_over_pairs.c b/examples/hashtable/operations/iterating_over_pairs.c
@@ -4,6 +4,9 @@
 
 int main(int argc, char **argv)
 {
+    (void)argc;
+    (void)argv;
+
     CC_HashTable *table;
     cc_hashtable_new(&table);
 

diff --git a/examples/hashtable/operations/removing_key_value_pairs.c b/examples/hashtable/operations/removing_key_value_pairs.c
@@ -3,6 +3,9 @@
 
 int main(int argc, char **argv)
 {
+    (void)argc;
+    (void)argv;
+
     // Make a new string key table
     CC_HashTable *table;
     cc_hashtable_new(&table);

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,3 +1,5 @@
+cmake_minimum_required(VERSION 3.15)
+
 project(collectc VERSION 0.0.1)
 
 file(GLOB source_files "*.c" "sized/*.c" "memory/*.c")

diff --git a/src/sized/cc_array_sized.c b/src/sized/cc_array_sized.c
@@ -800,7 +800,7 @@ static enum cc_stat expand_capacity(CC_ArraySized *ar)
         return CC_ERR_MAX_CAPACITY;
     }
 
-    size_t new_capacity = ar->capacity * ar->exp_factor;
+    size_t new_capacity = (size_t) (ar->capacity * ar->exp_factor);
 
     /* As long as the capacity is greater that the expansion factor
      * at the point of overflow, this is check is valid. */

diff --git a/test/benchmark/CMakeLists.txt b/test/benchmark/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.15)
 
 set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
 

diff --git a/test/benchmark/pool/dpool_bench.c b/test/benchmark/pool/dpool_bench.c
@@ -30,7 +30,7 @@ void bench_malloc()
     t_start = clock();
 
     CC_SLIST_FOREACH(v, list, {
-        (int*)v += 1;
+        *((int*)v) += 1;
     });
     t_end = clock();
     t_delta = (double)(t_end - t_start)/CLOCKS_PER_SEC;
@@ -85,7 +85,7 @@ void bench_pool_packed()
     t_start = clock();
 
     CC_SLIST_FOREACH(v, list, {
-        (int*)v += 1;
+        *((int*)v) += 1;
     });
     t_end = clock();
     t_delta = (double)(t_end - t_start)/CLOCKS_PER_SEC;
@@ -127,7 +127,7 @@ void bench_pool_aligned()
     t_start = clock();
 
     CC_SLIST_FOREACH(v, list, {
-        (int*)v += 1;
+        *((int*)v) += 1;
     });
     t_end = clock();
     t_delta = (double)(t_end - t_start)/CLOCKS_PER_SEC;
@@ -140,6 +140,9 @@ void bench_pool_aligned()
 
 int main(int argc, char** argv)
 {
+    (void)argc;
+    (void)argv;
+
     bench_pool_aligned();
     bench_pool_packed();
     bench_malloc();

diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.15)
 project(collectc_test)
 
 #find_package(PkgConfig)