From b308ded1e1e7df01aaa81c255dd6e9ed929502ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Wed, 5 Jun 2024 16:03:10 +0800 Subject: [PATCH] Global (Linux): silence some compiler warnings --- src/detection/cpu/cpu_linux.c | 4 ++-- src/detection/initsystem/initsystem_linux.c | 2 +- src/detection/terminalfont/terminalfont_linux.c | 2 +- src/detection/wifi/wifi_linux.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/detection/cpu/cpu_linux.c b/src/detection/cpu/cpu_linux.c index 53aa739f1..3a8df2565 100644 --- a/src/detection/cpu/cpu_linux.c +++ b/src/detection/cpu/cpu_linux.c @@ -115,13 +115,13 @@ static uint8_t getNumCores(FFstrbuf* basePath, FFstrbuf* buffer) bool ok = ffReadFileBuffer(basePath->chars, buffer); ffStrbufSubstrBefore(basePath, baseLen); if (ok) - return (uint8_t) ffStrbufCountC(buffer, ' ') + 1; + return (uint8_t) (ffStrbufCountC(buffer, ' ') + 1); ffStrbufAppendS(basePath, "/related_cpus"); ok = ffReadFileBuffer(basePath->chars, buffer); ffStrbufSubstrBefore(basePath, baseLen); if (ok) - return (uint8_t) ffStrbufCountC(buffer, ' ') + 1; + return (uint8_t) (ffStrbufCountC(buffer, ' ') + 1); return 0; } diff --git a/src/detection/initsystem/initsystem_linux.c b/src/detection/initsystem/initsystem_linux.c index b518db21d..078d36f1b 100644 --- a/src/detection/initsystem/initsystem_linux.c +++ b/src/detection/initsystem/initsystem_linux.c @@ -45,7 +45,7 @@ const char* ffDetectInitSystem(FFInitSystemResult* result) uint32_t iStart = ffStrbufFirstIndexS(&result->version, "Version "); if (iStart < result->version.length) { - iStart += strlen("Version"); + iStart += (uint32_t) strlen("Version"); uint32_t iEnd = ffStrbufNextIndexC(&result->version, iStart + 1, ':'); ffStrbufSubstrBefore(&result->version, iEnd); ffStrbufSubstrAfter(&result->version, iStart); diff --git a/src/detection/terminalfont/terminalfont_linux.c b/src/detection/terminalfont/terminalfont_linux.c index bcb640f3d..f10bcd735 100644 --- a/src/detection/terminalfont/terminalfont_linux.c +++ b/src/detection/terminalfont/terminalfont_linux.c @@ -320,7 +320,7 @@ static void detectSt(FFTerminalFontResult* terminalFont, const FFTerminalResult* uint32_t sIndex = ffStrbufNextIndexS(&font, index + 1, "size="); if (sIndex != font.length) { - sIndex += strlen("size="); + sIndex += (uint32_t) strlen("size="); uint32_t sIndexEnd = ffStrbufNextIndexC(&font, sIndex, ':'); ffStrbufSetNS(&size, sIndexEnd - sIndex, font.chars + sIndex); } diff --git a/src/detection/wifi/wifi_linux.c b/src/detection/wifi/wifi_linux.c index fffadc9a2..0392fb706 100644 --- a/src/detection/wifi/wifi_linux.c +++ b/src/detection/wifi/wifi_linux.c @@ -334,7 +334,7 @@ static const char* detectWifiWithIoctls(FFlist* result) #endif -const char* ffDetectWifi(FFlist* result) +const char* ffDetectWifi(FF_MAYBE_UNUSED FFlist* result) { #ifdef FF_HAVE_LIBNM detectWifiWithLibnm(result);