fix warnings (errors) introduced with previous commit

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9fbcb4ce1e687f013666ce0ef2374e8579ea2b4e..4f50e5fbc5f03e85c39d7e836f6f8073acc04213 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -214,10 +214,12 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
     "${CMAKE_C_FLAGS} \
     /Wall \
     /WX \
+    /wd4127 \
     /wd4201 \
     /wd4204 \
     /wd4255 \
     /wd4668 \
+    /wd4702 \
     /wd4710 \
     /wd4777 \
     /wd4820 \

diff --git a/src/ebisp/gc.c b/src/ebisp/gc.c
index 9525a6348e26161e41804361ca1c942a5225ac56..90dfde36aaf65d26932f093e49a201c67ad06c85 100644 (file)
--- a/src/ebisp/gc.c
+++ b/src/ebisp/gc.c
@@ -19,12 +19,12 @@ struct Gc
     size_t capacity;
 };
 
-static long int value_of_expr(struct Expr expr)
+static intptr_t value_of_expr(struct Expr expr)
 {
     if (expr.type == EXPR_CONS) {
-        return (long int) expr.cons;
+        return (intptr_t) expr.cons;
     } else if (expr.type == EXPR_ATOM) {
-        return (long int) expr.atom;
+        return (intptr_t) expr.atom;
     } else {
         return 0;
     }
@@ -35,9 +35,9 @@ static int compare_exprs(const void *a, const void *b)
     trace_assert(a);
     trace_assert(b);
 
-    const long int ptr_a = value_of_expr(*(const struct Expr *)a);
-    const long int ptr_b = value_of_expr(*(const struct Expr *)b);
-    const long int d = ptr_b - ptr_a;
+    const intptr_t ptr_a = value_of_expr(*(const struct Expr *)a);
+    const intptr_t ptr_b = value_of_expr(*(const struct Expr *)b);
+    const intptr_t d = ptr_b - ptr_a;
 
     if (d < 0) {
         return -1;

diff --git a/src/ebisp/parser.c b/src/ebisp/parser.c
index 906a8f604739730f42ce811f1374d51e7319bcd8..b48287bd5fc260891690583eedf33aa3b739cf40 100644 (file)
--- a/src/ebisp/parser.c
+++ b/src/ebisp/parser.c
@@ -122,7 +122,7 @@ static struct ParseResult parse_string(Gc *gc, struct Token current_token)
 static struct ParseResult parse_number(Gc *gc, struct Token current_token)
 {
     char *endptr = 0;
-    const long int x = strtoimax(current_token.begin, &endptr, 10);
+    const long int x = strtol(current_token.begin, &endptr, 10);
 
     if (current_token.begin == endptr || current_token.end != endptr) {
         return parse_failure("Expected number", current_token.begin);

diff --git a/src/game/level/goals.c b/src/game/level/goals.c
index c06c07e549c554ca2716d6ffbb3755c3ffb18c0c..22cdbb1701e46c279d8fff700d5a2fb2b3a1d269 100644 (file)
--- a/src/game/level/goals.c
+++ b/src/game/level/goals.c
@@ -53,7 +53,7 @@ Goals *create_goals_from_line_stream(LineStream *line_stream)
     goals->count = 0;
     if (sscanf(
             line_stream_next(line_stream),
-            "%lu",
+            "%zu",
             &goals->count) == EOF) {
         log_fail("Could not read amount of goals\n");
         RETURN_LT(lt, NULL);

diff --git a/src/game/level/labels.c b/src/game/level/labels.c
index 44b95d168ae32e8b8bd6aa983063d23b657d4674..16d9699c518705a5739144fe104adcd4807737e2 100644 (file)
--- a/src/game/level/labels.c
+++ b/src/game/level/labels.c
@@ -51,7 +51,7 @@ Labels *create_labels_from_line_stream(LineStream *line_stream)
 
     if (sscanf(
             line_stream_next(line_stream),
-            "%lu",
+            "%zu",
             &labels->count) == EOF) {
         log_fail("Could not read amount of labels\n");
         RETURN_LT(lt, NULL);

diff --git a/src/game/level/lava.c b/src/game/level/lava.c
index 8dd026d51ef1e7d63852274953e4daa5a7997906..a060d85c2a2360993c03bba2258ebe73c7ed590e 100644 (file)
--- a/src/game/level/lava.c
+++ b/src/game/level/lava.c
@@ -33,7 +33,7 @@ Lava *create_lava_from_line_stream(LineStream *line_stream)
 
     if (sscanf(
             line_stream_next(line_stream),
-            "%lu",
+            "%zu",
             &lava->rects_count) < 0) {
         log_fail("Could not read amount of lava\n");
         RETURN_LT(lt, NULL);

diff --git a/src/game/level/level_editor/label_layer.c b/src/game/level/level_editor/label_layer.c
index c5345b97457c598d6a956256bcb3292780976d93..8e9dcfd2b267d959c0947f5893174d01b173b66d 100644 (file)
--- a/src/game/level/level_editor/label_layer.c
+++ b/src/game/level/level_editor/label_layer.c
@@ -86,7 +86,7 @@ LabelLayer *create_label_layer_from_line_stream(LineStream *line_stream)
     }
 
     size_t n = 0;
-    if (sscanf(line, "%lu", &n) == EOF) {
+    if (sscanf(line, "%zu", &n) == EOF) {
         log_fail("Could not parse amount of labels\n");
         RETURN_LT(label_layer->lt, NULL);
     }
@@ -211,7 +211,7 @@ int label_layer_dump_stream(const LabelLayer *label_layer, FILE *filedump)
     Color *colors = dynarray_data(label_layer->colors);
     char **texts = dynarray_data(label_layer->texts);
 
-    fprintf(filedump, "%ld\n", n);
+    fprintf(filedump, "%zd\n", n);
     for (size_t i = 0; i < n; ++i) {
         fprintf(filedump, "%s %f %f ",
                 ids + LABEL_LAYER_ID_MAX_SIZE * i,

diff --git a/src/game/level/level_editor/layer_picker.c b/src/game/level/level_editor/layer_picker.c
index 719d266f86e713378cd0f6f5d8f0712ee1ed163d..ec09833897980d8252abdebf4050459c5c0d33cd 100644 (file)
--- a/src/game/level/level_editor/layer_picker.c
+++ b/src/game/level/level_editor/layer_picker.c
@@ -1,4 +1,5 @@
 #include <stdbool.h>
+#include <string.h>
 
 #include <SDL.h>
 

diff --git a/src/game/level/level_editor/point_layer.c b/src/game/level/level_editor/point_layer.c
index 6efa94cac45b5febbc1784baa834e66e5d28a331..b6859733650e10fbb06556e2b754cc768a243b57 100644 (file)
--- a/src/game/level/level_editor/point_layer.c
+++ b/src/game/level/level_editor/point_layer.c
@@ -92,7 +92,7 @@ PointLayer *create_point_layer_from_line_stream(LineStream *line_stream)
     size_t count = 0;
     if (sscanf(
             line_stream_next(line_stream),
-            "%lu",
+            "%zu",
             &count) == EOF) {
         log_fail("Could not read amount of points");
         RETURN_LT(point_layer->lt, NULL);
@@ -382,7 +382,7 @@ int point_layer_dump_stream(const PointLayer *point_layer,
     Point *points = dynarray_data(point_layer->points);
     Color *colors = dynarray_data(point_layer->colors);
 
-    fprintf(filedump, "%ld\n", n);
+    fprintf(filedump, "%zd\n", n);
     for (size_t i = 0; i < n; ++i) {
         fprintf(filedump, "%s %f %f ",
                 ids + ID_MAX_SIZE * i,

diff --git a/src/game/level/level_editor/rect_layer.c b/src/game/level/level_editor/rect_layer.c
index ab9b758a26cbbe3a51817c8516aa551babdd38c0..b4657bfec9160dbae8a596d75754d2df436663c4 100644 (file)
--- a/src/game/level/level_editor/rect_layer.c
+++ b/src/game/level/level_editor/rect_layer.c
@@ -89,7 +89,7 @@ RectLayer *create_rect_layer_from_line_stream(LineStream *line_stream)
     }
 
     size_t count = 0;
-    if (sscanf(line, "%lu", &count) < 0) {
+    if (sscanf(line, "%zu", &count) < 0) {
         RETURN_LT(layer->lt, NULL);
     }
 
@@ -267,7 +267,7 @@ int rect_layer_dump_stream(const RectLayer *layer, FILE *filedump)
     Rect *rects = dynarray_data(layer->rects);
     Color *colors = dynarray_data(layer->colors);
 
-    fprintf(filedump, "%ld\n", n);
+    fprintf(filedump, "%zd\n", n);
     for (size_t i = 0; i < n; ++i) {
         fprintf(filedump, "%s %f %f %f %f ",
                 ids + RECT_LAYER_ID_MAX_SIZE * i,

diff --git a/src/game/level/regions.c b/src/game/level/regions.c
index a82991705e9880dbdc7fac9f934f7bed9abbc10e..52b1843f165a031ff009723072b295dc077c15fc 100644 (file)
--- a/src/game/level/regions.c
+++ b/src/game/level/regions.c
@@ -48,7 +48,7 @@ Regions *create_regions_from_line_stream(LineStream *line_stream)
 
     if(sscanf(
            line_stream_next(line_stream),
-           "%lu",
+           "%zu",
            &regions->count) < 0) {
         log_fail("Could not read amount of script regions\n");
         RETURN_LT(lt, NULL);

diff --git a/src/game/level/rigid_bodies.c b/src/game/level/rigid_bodies.c
index db5484e00757985ea66cf545905387938c4c4fb2..318f847880c073180840ef87e800ba2288ebe14a 100644 (file)
--- a/src/game/level/rigid_bodies.c
+++ b/src/game/level/rigid_bodies.c
@@ -270,7 +270,7 @@ int rigid_bodies_render(RigidBodies *rigid_bodies,
         return -1;
     }
 
-    snprintf(text_buffer, 256, "id: %ld", id);
+    snprintf(text_buffer, 256, "id: %zd", id);
 
     if (camera_render_debug_text(
             camera,

diff --git a/src/math/rect.c b/src/math/rect.c
index 672398b3435f509e5ce939c4f5b49597e4db3346..8174328e378ebbb66c099fbf26ec9ecbb6b9f410 100644 (file)
--- a/src/math/rect.c
+++ b/src/math/rect.c
@@ -105,7 +105,7 @@ Line rect_side(Rect rect, Rect_side side)
     const float x2 = rect.x + rect.w;
     const float y2 = rect.y + rect.h;
 
-    Line result;
+    Line result = { 0 };
 
     switch (side) {
     case RECT_SIDE_LEFT:

diff --git a/test/parser_suite.h b/test/parser_suite.h
index 7afff9f2947a33f302d7d46e05dde3edd7628a54..4bbadc41609a013570b6bd4a00a2728871311c1d 100644 (file)
--- a/test/parser_suite.h
+++ b/test/parser_suite.h
@@ -175,7 +175,7 @@ TEST(read_all_exprs_from_string_trailing_spaces_test)
 
     ASSERT_FALSE(result.is_error, {
             fprintf(stderr, "Parsing failed: %s\n", result.error_message);
-            fprintf(stderr, "Position: %ld\n", result.end - source_code);
+            fprintf(stderr, "Position: %zd\n", result.end - source_code);
     });
 
     return 0;