update ovbase/ovutil

Author: oov

build.bash

@@ -5,11 +5,9 @@ CUR_DIR="${PWD}"
 cd "$(dirname "${BASH_SOURCE:-$0}")"
 
 mkdir -p build/tools
-cd build/tools
+. src/c/3rd/ovbase/setup-llvm-mingw.bash --dir $PWD/build/tools
 
-. ../../src/c/3rd/ovbase/setup-llvm-mingw.bash --dir $PWD
-
-cd ..
+cd build
 
 REBUILD=0
 SKIP_TESTS=0

src/c/3rd/ovbase

@@ -93,7 +93,7 @@ add_custom_target(copy_related_files
 
 set(is_clang "$<C_COMPILER_ID:Clang>")
 set(v16_or_later "$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,16>")
-
+set(v18_or_later "$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,18>")
 add_library(gcmzdrops_intf INTERFACE)
 target_include_directories(gcmzdrops_intf INTERFACE
   "${CMAKE_CURRENT_BINARY_DIR}" # for version.h
@@ -118,6 +118,7 @@ target_compile_options(gcmzdrops_intf INTERFACE
   -Wno-declaration-after-statement
   -Wno-padded
   $<$<AND:${is_clang},${v16_or_later}>:-Wno-unsafe-buffer-usage>
+  $<$<AND:${is_clang},${v18_or_later}>:-Wno-switch-default>
   -ffunction-sections
   -fdata-sections
   $<$<CONFIG:Debug>:-O0>

src/c/3rd/ovutil

@@ -1004,7 +1004,7 @@ error gcmz_confirm(struct wstr const *const caption, bool *const result) {
     buf_size = 1024,
   };
   wchar_t buf[buf_size];
-  mo_sprintf_wchar(buf, buf_size, NULL, "%1$s %2  $s", "GCMZDrops", VERSION);
+  mo_snprintf_wchar(buf, buf_size, NULL, "%1$s %2  $s", "GCMZDrops", VERSION);
   int r = MessageBoxW(h, caption->ptr, buf, MB_ICONQUESTION | MB_OKCANCEL);
   if (!r) {
     return errhr(HRESULT_FROM_WIN32(GetLastError()));

src/c/CMakeLists.txt

@@ -132,7 +132,7 @@ error gui_init(HWND const window) {
 
   int save_mode_height = padding;
   {
-    mo_sprintf_wchar(buf, buf_size, NULL, "%1$s", gettext("Processing mode:"));
+    mo_snprintf_wchar(buf, buf_size, NULL, "%1$s", gettext("Processing mode:"));
     HWND h = CreateWindowExW(0,
                              L"STATIC",
                              buf,
@@ -161,11 +161,11 @@ error gui_init(HWND const window) {
                         (HMENU)1,
                         hinst,
                         NULL);
-    mo_sprintf_wchar(buf, buf_size, NULL, "%1$s", gettext("Auto detect"));
+    mo_snprintf_wchar(buf, buf_size, NULL, "%1$s", gettext("Auto detect"));
     SendMessageW(h, CB_ADDSTRING, 0, (LPARAM)buf);
-    mo_sprintf_wchar(buf, buf_size, NULL, "%1$s", gettext("Copy"));
+    mo_snprintf_wchar(buf, buf_size, NULL, "%1$s", gettext("Copy"));
     SendMessageW(h, CB_ADDSTRING, 0, (LPARAM)buf);
-    mo_sprintf_wchar(buf, buf_size, NULL, "%1$s", gettext("Direct read"));
+    mo_snprintf_wchar(buf, buf_size, NULL, "%1$s", gettext("Direct read"));
     SendMessageW(h, CB_ADDSTRING, 0, (LPARAM)buf);
     SendMessageW(h, WM_SETFONT, (WPARAM)font, 0);
     save_mode_height += control_height;
@@ -175,7 +175,7 @@ error gui_init(HWND const window) {
   int save_dir_height = padding;
   {
     int const button_width = font_height * 2;
-    mo_sprintf_wchar(buf, buf_size, NULL, "%1$s", gettext("Save to:"));
+    mo_snprintf_wchar(buf, buf_size, NULL, "%1$s", gettext("Save to:"));
     HWND h = CreateWindowExW(0,
                              L"STATIC",
                              buf,
@@ -228,7 +228,7 @@ error gui_init(HWND const window) {
     enum {
       button_width = 128,
     };
-    mo_sprintf_wchar(buf, buf_size, NULL, "%1$s", gettext("Revert to initial"));
+    mo_snprintf_wchar(buf, buf_size, NULL, "%1$s", gettext("Revert to initial"));
     HWND h = CreateWindowExW(0,
                              L"BUTTON",
                              buf,
@@ -243,7 +243,7 @@ error gui_init(HWND const window) {
                              NULL);
     SendMessageW(h, WM_SETFONT, (WPARAM)font, 0);
     g_restore_initial = h;
-    mo_sprintf_wchar(buf, buf_size, NULL, "%1$s", gettext("Revert to default"));
+    mo_snprintf_wchar(buf, buf_size, NULL, "%1$s", gettext("Revert to default"));
     h = CreateWindowExW(0,
                         L"BUTTON",
                         buf,
@@ -258,7 +258,7 @@ error gui_init(HWND const window) {
                         NULL);
     SendMessageW(h, WM_SETFONT, (WPARAM)font, 0);
     g_restore_default = h;
-    mo_sprintf_wchar(buf, buf_size, NULL, "%1$s", gettext("Save as default"));
+    mo_snprintf_wchar(buf, buf_size, NULL, "%1$s", gettext("Save as default"));
     h = CreateWindowExW(0,
                         L"BUTTON",
                         buf,
@@ -393,7 +393,7 @@ NODISCARD static error click_select_folder_button(HWND const window) {
     buf_size = 1024,
   };
   wchar_t buf[buf_size];
-  mo_sprintf_wchar(buf, buf_size, NULL, "%1$s", gettext("Choose Save Directory"));
+  mo_snprintf_wchar(buf, buf_size, NULL, "%1$s", gettext("Choose Save Directory"));
   err = select_directory(window, &wstr_unmanaged(buf), &dir, &ret);
   if (efailed(err)) {
     err = ethru(err);