xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #29083 from taosdata/fix/internal 

fix: compile errors
This commit is contained in:
Shengliang Guan 2024-12-10 17:32:14 +08:00 committed by GitHub
parent f04f63c1d3 85af6a9224
commit 2241336f57
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/os/osLocale.h
View File

@ -28,9 +28,9 @@ extern "C" {
#define setlocale SETLOCALE_FUNC_TAOS_FORBID #define setlocale SETLOCALE_FUNC_TAOS_FORBID
#endif #endif
char *taosCharsetReplace(char *charsetstr); char *taosCharsetReplace(char *charsetstr);
void taosGetSystemLocale(char *outLocale, char *outCharset); void taosGetSystemLocale(char *outLocale, char *outCharset);
int32_t taosSetSystemLocale(const char *inLocale); int32_t taosSetSystemLocale(const char *inLocale);
#ifdef __cplusplus #ifdef __cplusplus
} }

3
source/os/src/osLocale.c
View File

@ -87,8 +87,7 @@ int32_t taosSetSystemLocale(const char *inLocale) {
return terrno; return terrno;
} }
(void)memcpy(tsLocale, inLocale, strlen(inLocale) + 1); tstrncpy(tsLocale, locale, TD_LOCALE_LEN);
return 0; return 0;
} }

5
source/os/test/osEnvTests.cpp
View File

@ -84,9 +84,8 @@ TEST(osEnvTests, osSufficient) {
ret = osTempSpaceSufficient(); ret = osTempSpaceSufficient();
EXPECT_EQ(ret, true); EXPECT_EQ(ret, true);
osSetSystemLocale(NULL, NULL); taosSetSystemLocale(NULL);
osSetSystemLocale(NULL, NULL); taosSetSystemLocale("1");
osSetSystemLocale("1", "2");
osSetProcPath(1, NULL); osSetProcPath(1, NULL);
osSetProcPath(0, (char **)&ret); osSetProcPath(0, (char **)&ret);