From ef8367fbb413e19aeecb5a7cf78a8ab7d4b01563 Mon Sep 17 00:00:00 2001
From: xsren <285808407@qq.com>
Date: Thu, 10 Oct 2024 14:40:59 +0800
Subject: [PATCH] fix: ret error

---
 source/common/src/rsync.c                |  2 +-
 source/dnode/vnode/src/vnd/vnodeCommit.c |  5 ++---
 source/libs/function/src/tudf.c          |  5 +++--
 source/os/src/osSemaphore.c              | 28 ++++++++++--------------
 source/os/src/osThread.c                 | 19 +++++++++-------
 5 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/source/common/src/rsync.c b/source/common/src/rsync.c
index 47a452eab7..eef889429b 100644
--- a/source/common/src/rsync.c
+++ b/source/common/src/rsync.c
@@ -94,7 +94,7 @@ static int32_t generateConfigFile(char* confDir) {
 #endif
   );
   uDebug("[rsync] conf:%s", confContent);
-  if (taosWriteFile(pFile, confContent, strlen(confContent)) != TSDB_CODE_SUCCESS) {
+  if (taosWriteFile(pFile, confContent, strlen(confContent)) <= 0) {
     uError("[rsync] write conf file error," ERRNO_ERR_FORMAT, ERRNO_ERR_DATA);
     (void)taosCloseFile(&pFile);
     code = terrno;
diff --git a/source/dnode/vnode/src/vnd/vnodeCommit.c b/source/dnode/vnode/src/vnd/vnodeCommit.c
index 438083f9b9..4a4d305f25 100644
--- a/source/dnode/vnode/src/vnd/vnodeCommit.c
+++ b/source/dnode/vnode/src/vnd/vnodeCommit.c
@@ -102,9 +102,8 @@ static int32_t vnodeGetBufPoolToUse(SVnode *pVnode) {
           ts.tv_sec = tv.tv_sec;
         }
 
-        int32_t rc = taosThreadCondTimedWait(&pVnode->poolNotEmpty, &pVnode->mutex, &ts);
-        if (rc && rc != ETIMEDOUT) {
-          code = TAOS_SYSTEM_ERROR(rc);
+        code = taosThreadCondTimedWait(&pVnode->poolNotEmpty, &pVnode->mutex, &ts);
+        if (code && code != TSDB_CODE_TIMEOUT_ERROR) {
           TSDB_CHECK_CODE(code, lino, _exit);
         }
       }
diff --git a/source/libs/function/src/tudf.c b/source/libs/function/src/tudf.c
index 3a0cff7cf3..4a1c07ef48 100644
--- a/source/libs/function/src/tudf.c
+++ b/source/libs/function/src/tudf.c
@@ -158,11 +158,12 @@ static int32_t udfSpawnUdfd(SUdfdData *pData) {
   char *taosFqdnEnvItem = NULL;
   char *taosFqdn = getenv("TAOS_FQDN");
   if (taosFqdn != NULL) {
-    int len = strlen("TAOS_FQDN=") + strlen(taosFqdn) + 1;
+    int subLen = strlen(taosFqdn);
+    int len = strlen("TAOS_FQDN=") + subLen + 1;
     taosFqdnEnvItem = taosMemoryMalloc(len);
     if (taosFqdnEnvItem != NULL) {
       tstrncpy(taosFqdnEnvItem, "TAOS_FQDN=", len);
-      TAOS_STRNCAT(taosFqdnEnvItem, taosFqdn, strlen(taosFqdn));
+      TAOS_STRNCAT(taosFqdnEnvItem, taosFqdn, subLen);
       fnInfo("[UDFD]Succsess to set TAOS_FQDN:%s", taosFqdn);
     } else {
       fnError("[UDFD]Failed to allocate memory for TAOS_FQDN");
diff --git a/source/os/src/osSemaphore.c b/source/os/src/osSemaphore.c
index ea9e824947..cc3a13a818 100644
--- a/source/os/src/osSemaphore.c
+++ b/source/os/src/osSemaphore.c
@@ -377,20 +377,20 @@ int32_t tsem2_wait(tsem2_t* sem) {
 }
 
 int32_t tsem2_timewait(tsem2_t* sem, int64_t ms) {
-  int ret = 0;
+  int32_t code = 0;
 
-  ret = taosThreadMutexLock(&sem->mutex);
-  if (ret) {
-    return ret;
+  code = taosThreadMutexLock(&sem->mutex);
+  if (code) {
+    return code;
   }
   
   if (sem->count <= 0) {
     struct timespec ts = {0};
     if (clock_gettime(CLOCK_MONOTONIC, &ts) == -1) {
-      ret = TAOS_SYSTEM_ERROR(errno);
+      code = TAOS_SYSTEM_ERROR(errno);
       (void)taosThreadMutexUnlock(&sem->mutex);
-      terrno = ret;
-      return ret;
+      terrno = code;
+      return code;
     }
 
     ts.tv_sec += ms / 1000;
@@ -399,22 +399,18 @@ int32_t tsem2_timewait(tsem2_t* sem, int64_t ms) {
     ts.tv_nsec %= 1000000000;
 
     while (sem->count <= 0) {
-      ret = taosThreadCondTimedWait(&sem->cond, &sem->mutex, &ts);
-      if (ret != 0) {
+      code = taosThreadCondTimedWait(&sem->cond, &sem->mutex, &ts);
+      if (code != 0) {
         (void)taosThreadMutexUnlock(&sem->mutex);
-        if (errno == ETIMEDOUT) {
-          return TSDB_CODE_TIMEOUT_ERROR;
-        } else {
-          return TAOS_SYSTEM_ERROR(errno);
-        }
+        return code;
       }
     }
   }
 
   sem->count--;
   
-  ret = taosThreadMutexUnlock(&sem->mutex);
-  return ret;
+  code = taosThreadMutexUnlock(&sem->mutex);
+  return code;
 }
 
 #endif
diff --git a/source/os/src/osThread.c b/source/os/src/osThread.c
index d102a2a332..6a8c705cde 100644
--- a/source/os/src/osThread.c
+++ b/source/os/src/osThread.c
@@ -235,19 +235,22 @@ int32_t taosThreadCondWait(TdThreadCond *cond, TdThreadMutex *mutex) {
 
 int32_t taosThreadCondTimedWait(TdThreadCond *cond, TdThreadMutex *mutex, const struct timespec *abstime) {
 #ifdef __USE_WIN_THREAD
-  if (!abstime) return EINVAL;
+  if (!abstime) return 0;
   if (SleepConditionVariableCS(cond, mutex, (DWORD)(abstime->tv_sec * 1e3 + abstime->tv_nsec / 1e6))) return 0;
-  if (GetLastError() == ERROR_TIMEOUT) {
-    return ETIMEDOUT;
+  DWORD error = GetLastError();
+  if (error == ERROR_TIMEOUT) {
+    return TSDB_CODE_TIMEOUT_ERROR;
   }
-  return EINVAL;
+  return TAOS_SYSTEM_WINAPI_ERROR(error);
 #else
   int32_t code = pthread_cond_timedwait(cond, mutex, abstime);
-  if (code && code != ETIMEDOUT) {
-    terrno = TAOS_SYSTEM_ERROR(code);
-    return terrno;
+  if(code == ETIMEDOUT) {
+    return TSDB_CODE_TIMEOUT_ERROR;
+  } else if (code) {
+    return TAOS_SYSTEM_ERROR(code);
+  } else {
+    return 0;
   }
-  return code;
 #endif
 }