From a63d854681f416ce17f1b6f172cddee5767b8c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sun, 31 May 2026 11:11:31 +0200 Subject: [PATCH] OS (Haiku): Fix warnings --- src/detection/os/os_haiku.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/detection/os/os_haiku.c b/src/detection/os/os_haiku.c index 40dad2220..1a3c40cfa 100644 --- a/src/detection/os/os_haiku.c +++ b/src/detection/os/os_haiku.c @@ -1,6 +1,7 @@ #include "os.h" #include #include +#include void ffDetectOSImpl(FFOSResult* os) { ffStrbufSetStatic(&os->name, "Haiku"); @@ -32,7 +33,7 @@ void ffDetectOSImpl(FFOSResult* os) { int32 relVer = ver / 0x10000; ver %= 0x10000; if (ver == 0) { - ffStrbufSetF(&os->version, "R%d", relVer); + ffStrbufSetF(&os->version, "R%" B_PRId32, relVer); } else { relVer++; @@ -40,16 +41,16 @@ void ffDetectOSImpl(FFOSResult* os) { if (ver < B_HAIKU_VERSION_1_PRE_BETA_1) { int32 alphaVer = ver / 0x100; if (isPre) { - ffStrbufSetF(&os->version, "R%dA%d-", relVer, alphaVer + 1); + ffStrbufSetF(&os->version, "R%" B_PRId32 "A%ld-", relVer, alphaVer + 1); } else { - ffStrbufSetF(&os->version, "R%dA%d", relVer, alphaVer); + ffStrbufSetF(&os->version, "R%" B_PRId32 "A%ld", relVer, alphaVer); } } else if (ver < 0x00010000 /* B_HAIKU_VERSION_1 */) { int32 betaVer = (ver - B_HAIKU_VERSION_1_ALPHA_4) / 0x100; if (isPre) { - ffStrbufSetF(&os->version, "R%dB%d-", relVer, betaVer + 1); + ffStrbufSetF(&os->version, "R%" B_PRId32 "B%ld-", relVer, betaVer + 1); } else { - ffStrbufSetF(&os->version, "R%dB%d", relVer, betaVer); + ffStrbufSetF(&os->version, "R%" B_PRId32 "B%ld", relVer, betaVer); } } } @@ -59,7 +60,7 @@ void ffDetectOSImpl(FFOSResult* os) { if (!os->version.length) { system_info sys; if (get_system_info(&sys) == B_OK) { - ffStrbufAppendF(&os->version, "R%ldx", sys.kernel_version); + ffStrbufAppendF(&os->version, "R%" B_PRIx64, sys.kernel_version); } } }