Merge branch 'develop' into feature/TD-13970

da688f6b · Ganlin Zhao · b3105484 · da688f6b
隐藏空白更改
内联并排

Showing with 4 addition and 2 deletion

src/os/src/detail/osTime.c src/os/src/detail/osTime.c +4 -2

未找到文件。
--- a/src/os/src/detail/osTime.c
+++ b/src/os/src/detail/osTime.c
@@ -337,7 +337,8 @@ int32_t parseLocaltime(char* timestr, int64_t* time, int32_t timePrec, char deli

  if (str == NULL) {
    //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;
    }
  }
@@ -382,7 +383,8 @@ int32_t parseLocaltimeWithDst(char* timestr, int64_t* time, int32_t timePrec, ch

  if (str == NULL) {
    //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;
    }
  }