Skip to content

T
TDengine

taosdata / TDengine
接近 2 年 前同步成功

通知 1192
Star 22018
Fork 4786
T
TDengine
提交 a590ecf0 编写于 作者: G Ganlin Zhao
浏览文件
操作

Merge branch 'develop' into feature/TD-13970

上级 d093cd79
隐藏空白更改
内联 并排
Showing with 4 addition and 2 deletion
src/os/src/detail/osTime.c
浏览文件 @ a590ecf0
...@@ -323,7 +323,8 @@ int32_t parseLocaltime(char* timestr, int64_t* time, int32_t timePrec) { ...@@ -323,7 +323,8 @@ int32_t parseLocaltime(char* timestr, int64_t* time, int32_t timePrec) {
char* str = strptime(timestr, "%Y-%m-%d %H:%M:%S", &tm); char* str = strptime(timestr, "%Y-%m-%d %H:%M:%S", &tm);
if (str == NULL) { if (str == NULL) {
//if parse failed, try "%Y-%m-%d" format //if parse failed, try "%Y-%m-%d" format
if (!strptime(timestr, "%Y-%m-%d", &tm)) { str = strptime(timestr, "%Y-%m-%d", &tm);
if (str == NULL) {
return -1; return -1;
} }
} }
...@@ -360,7 +361,8 @@ int32_t parseLocaltimeWithDst(char* timestr, int64_t* time, int32_t timePrec) { ...@@ -360,7 +361,8 @@ int32_t parseLocaltimeWithDst(char* timestr, int64_t* time, int32_t timePrec) {
char* str = strptime(timestr, "%Y-%m-%d %H:%M:%S", &tm); char* str = strptime(timestr, "%Y-%m-%d %H:%M:%S", &tm);
if (str == NULL) { if (str == NULL) {
//if parse failed, try "%Y-%m-%d" format //if parse failed, try "%Y-%m-%d" format
if (!strptime(timestr, "%Y-%m-%d", &tm)) { str = strptime(timestr, "%Y-%m-%d", &tm);
if (str == NULL) {
return -1; return -1;
} }
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或