From a54cbee79aa19dad7b51fa9059827d42a4d75384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Sat, 24 Aug 2024 00:24:50 +0800 Subject: [PATCH] Locale: remove usage of LC_MESSAGE --- src/common/init.c | 3 --- src/detection/locale/locale_linux.c | 10 ---------- 2 files changed, 13 deletions(-) diff --git a/src/common/init.c b/src/common/init.c index 5ac6abf6b..2da9f3027 100644 --- a/src/common/init.c +++ b/src/common/init.c @@ -54,9 +54,6 @@ void ffInitInstance(void) #else // Never use `setlocale(LC_ALL, "")` setlocale(LC_TIME, ""); - #ifdef LC_MESSAGES - setlocale(LC_MESSAGES, ""); - #endif #endif initState(&instance.state); diff --git a/src/detection/locale/locale_linux.c b/src/detection/locale/locale_linux.c index 4b5123059..34c1fb52f 100644 --- a/src/detection/locale/locale_linux.c +++ b/src/detection/locale/locale_linux.c @@ -8,19 +8,9 @@ void ffDetectLocale(FFstrbuf* result) if(result->length > 0) return; - ffStrbufAppendS(result, getenv("LC_MESSAGES")); - if(result->length > 0) - return; - ffStrbufAppendS(result, getenv("LANG")); if(result->length > 0) return; - #ifdef LC_MESSAGES - ffStrbufAppendS(result, setlocale(LC_MESSAGES, NULL)); - if(result->length > 0) - return; - #endif - ffStrbufAppendS(result, setlocale(LC_TIME, NULL)); }