diff --git a/include/os/osTimezone.h b/include/os/osTimezone.h index c259587264706fb7372e2a2ba566c10121b78525..3676c4b634df89ec712bd07e2fc3b1b743fd4ab1 100644 --- a/include/os/osTimezone.h +++ b/include/os/osTimezone.h @@ -40,7 +40,7 @@ enum TdTimezone TdWestZone3, TdWestZone2, TdWestZone1, - TdZeroZero, + TdZeroZone, TdEastZone1, TdEastZone2, TdEastZone3, diff --git a/source/os/src/osEnv.c b/source/os/src/osEnv.c index 4847bbf2fee8abcc3834cc776ec70a4581e6b5d9..22884298efbcf7015a6426a2fa2827afa87914b1 100644 --- a/source/os/src/osEnv.c +++ b/source/os/src/osEnv.c @@ -27,7 +27,7 @@ SDiskSpace tsLogSpace = {0}; SDiskSpace tsTempSpace = {0}; char tsOsName[16] = {0}; char tsTimezoneStr[TD_TIMEZONE_LEN] = {0}; -enum TdTimezone tsTimezone = TdZeroZero; +enum TdTimezone tsTimezone = TdZeroZone; char tsLocale[TD_LOCALE_LEN] = {0}; char tsCharset[TD_CHARSET_LEN] = {0}; int8_t tsDaylight = 0; diff --git a/source/os/src/osMemory.c b/source/os/src/osMemory.c index 1adf9f9bf3f9f8c362e512391e6825b2a1e50172..2ce851cd63694ac6335e774c5bbdfa31986309cb 100644 --- a/source/os/src/osMemory.c +++ b/source/os/src/osMemory.c @@ -115,7 +115,8 @@ void taosMemoryFree(const void *ptr) { TdMemoryInfoPtr pTdMemoryInfo = (TdMemoryInfoPtr)((char*)ptr - sizeof(TdMemoryInfo)); if(pTdMemoryInfo->symbol == TD_MEMORY_SYMBOL) { - memset(pTdMemoryInfo, 0, sizeof(TdMemoryInfo)); + pTdMemoryInfo->memorySize = 0; + // memset(pTdMemoryInfo, 0, sizeof(TdMemoryInfo)); free(pTdMemoryInfo); } else { free((void*)ptr);