Merge pull request #19805 from freemine/pthread_cleanup_push

typo: pthread_cleanup_push/pop better exist in pair

source/os/src/osTimer.c

@@ -114,6 +114,7 @@ static void         *taosProcessAlarmSignal(void *tharg) {
 
   taosThreadCleanupPush(taosDeleteTimer, &timerId);
 
+  do {
     struct itimerspec ts;
     ts.it_value.tv_sec = 0;
     ts.it_value.tv_nsec = 1000000 * MSECONDS_PER_TICK;
@@ -122,7 +123,7 @@ static void         *taosProcessAlarmSignal(void *tharg) {
 
     if (timer_settime(timerId, 0, &ts, NULL)) {
       // printf("Failed to init timer");
-    return NULL;
+      break;
     }
 
     int signo;
@@ -132,9 +133,9 @@ static void         *taosProcessAlarmSignal(void *tharg) {
         continue;
       }
       /* //printf("Signal handling: number %d ......\n", signo); */
-
       callback(0);
     }
+  } while (0);
 
   taosThreadCleanupPop(1);
 

tools/shell/src/shellEngine.c

@@ -1048,10 +1048,11 @@ void *shellThreadLoop(void *arg) {
   taosGetOldTerminalMode();
   taosThreadCleanupPush(shellCleanup, NULL);
 
+  do {
     char *command = taosMemoryMalloc(SHELL_MAX_COMMAND_SIZE);
     if (command == NULL) {
       printf("failed to malloc command\r\n");
-    return NULL;
+      break;
     }
 
     do {
@@ -1068,6 +1069,7 @@ void *shellThreadLoop(void *arg) {
     taosMemoryFreeClear(command);
     shellWriteHistory();
     shellExit();
+  } while (0);
 
   taosThreadCleanupPop(1);
   return NULL;