From ea584d8950c155067bf0ea86ec1ed0df7526ad2f Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Fri, 9 Aug 2024 23:25:56 +1000 Subject: [PATCH] Fixed the failing build on mingw Squashed commit of the following: commit c48929d25a84331ca8bd1b27be2c6aa4f3b4db12 Author: Kayne Ruse Date: Fri Aug 9 23:12:49 2024 +1000 Update c-cpp.yml I'm only going a little bit nuts. commit 3f65882bdc75f1712c9a3c9d2ddf0e53a27ce4b9 Author: Kayne Ruse Date: Fri Aug 9 22:49:18 2024 +1000 Update c-cpp.yml It would be great if this was documented better. commit d3abeda7c2776bb2e82ca635cd659967afa6ad75 Author: Kayne Ruse Date: Fri Aug 9 21:40:39 2024 +1000 Bumped license date commit 17bbce9d7ca212064bc95e467933c5602a89fb4c Author: Kayne Ruse Date: Fri Aug 9 21:33:57 2024 +1000 Fixed the failing build on mingw There seems to be persistent issues with different compilers displaying the values of size_t, so I simply cast it to an integer. commit 843a76d0ac44328776f8ecf83a66caa7ea7fdef6 Author: Kayne Ruse Date: Fri Aug 9 21:17:17 2024 +1000 Updated CI commit 08cd89c58d8d028438b9f83a60f5dd9265cc3465 Author: Kayne Ruse Date: Fri Aug 9 21:09:03 2024 +1000 Why did that fail last time? --- .github/workflows/c-cpp.yml | 9 +++++---- LICENSE.md | 2 +- source/toy_literal.c | 2 +- source/toy_memory.c | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index b64ee92..2779b0f 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -2,16 +2,17 @@ name: Comprehensive Tests on: push: - branches: [ "main", "dev" ] + branches: [ "main" ] pull_request: branches: [ "main" ] + workflow_dispatch: jobs: test-valgrind: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: install valgrind run: sudo apt install valgrind - name: make test (valgrind) @@ -21,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: make test (sanitized) run: make test-sanitized @@ -29,6 +30,6 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: make test (mingw32) run: make test diff --git a/LICENSE.md b/LICENSE.md index 33c634d..e3000f0 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ # License -Copyright (c) 2020-2023 Kayne Ruse, KR Game Studios +Copyright (c) 2020-2024 Kayne Ruse, KR Game Studios This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/source/toy_literal.c b/source/toy_literal.c index ecc298f..d9ce3f6 100644 --- a/source/toy_literal.c +++ b/source/toy_literal.c @@ -455,7 +455,7 @@ static void printToBuffer(const char* str) { globalPrintBuffer = TOY_GROW_ARRAY(char, globalPrintBuffer, oldCapacity, globalPrintCapacity); } - size_t total = snprintf(globalPrintBuffer + globalPrintCount, strlen(str) + 1, "%s", str ? str : ""); + size_t total = snprintf(globalPrintBuffer + globalPrintCount, strlen(str) + 1, "%s", str ? str : "\0"); globalPrintCount += total; } diff --git a/source/toy_memory.c b/source/toy_memory.c index 9975b94..040c491 100644 --- a/source/toy_memory.c +++ b/source/toy_memory.c @@ -22,7 +22,7 @@ void* Toy_private_defaultMemoryAllocator(void* pointer, size_t oldSize, size_t n void* mem = realloc(pointer, newSize); if (mem == NULL) { - fprintf(stderr, TOY_CC_ERROR "[internal] Memory allocation error (requested %zu, replacing %zu)\n" TOY_CC_RESET, newSize, oldSize); + fprintf(stderr, TOY_CC_ERROR "[internal] Memory allocation error (requested %d, replacing %d)\n" TOY_CC_RESET, (int)newSize, (int)oldSize); return NULL; }