From 9d6896cc168ac3fa757b272d5fcac835b073ebaf Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Fri, 31 Jul 2020 08:17:20 +0000
Subject: [PATCH] [TD-992]

---
 src/os/src/alpine/alpineEnv.c | 1 -
 src/os/src/detail/osDir.c     | 2 --
 src/os/src/detail/osFile.c    | 1 -
 src/os/src/detail/osString.c  | 1 -
 src/os/src/detail/osSysinfo.c | 2 --
 src/os/src/detail/osTime.c    | 6 ++----
 src/os/src/detail/osTimer.c   | 2 --
 src/os/src/linux64/linuxEnv.c | 1 -
 8 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/os/src/alpine/alpineEnv.c b/src/os/src/alpine/alpineEnv.c
index 0a9d81311a..4f84412075 100644
--- a/src/os/src/alpine/alpineEnv.c
+++ b/src/os/src/alpine/alpineEnv.c
@@ -16,7 +16,6 @@
 #define _DEFAULT_SOURCE
 #include "os.h"
 #include "tglobal.h"
-#include "tulog.h"
 
 void osInit() {
   strcpy(configDir, "/etc/taos");
diff --git a/src/os/src/detail/osDir.c b/src/os/src/detail/osDir.c
index c8d63f621e..9496b74405 100644
--- a/src/os/src/detail/osDir.c
+++ b/src/os/src/detail/osDir.c
@@ -17,7 +17,6 @@
 #include "os.h"
 #include "tglobal.h"
 #include "tulog.h"
-#include "osSysinfo.h"
 
 #ifndef TAOS_OS_FUNC_DIR
 
@@ -65,5 +64,4 @@ void taosMvDir(char* destDir, char *srcDir) {
   uInfo("shell cmd:%s is executed", shellCmd);
 }
 
-
 #endif
\ No newline at end of file
diff --git a/src/os/src/detail/osFile.c b/src/os/src/detail/osFile.c
index ad6be83e41..516b7bb19e 100644
--- a/src/os/src/detail/osFile.c
+++ b/src/os/src/detail/osFile.c
@@ -15,7 +15,6 @@
 
 #define _DEFAULT_SOURCE
 #include "os.h"
-#include "osRand.h"
 
 #ifndef TAOS_OS_FUNC_FILE_GETTMPFILEPATH
 void taosGetTmpfilePath(const char *fileNamePrefix, char *dstPath) {
diff --git a/src/os/src/detail/osString.c b/src/os/src/detail/osString.c
index b4b8c9a294..31ffd6b87c 100644
--- a/src/os/src/detail/osString.c
+++ b/src/os/src/detail/osString.c
@@ -16,7 +16,6 @@
 #define _DEFAULT_SOURCE
 #include "os.h"
 #include "tglobal.h"
-#include "taosdef.h"
 
 #ifndef TAOS_OS_FUNC_STRING_STR2INT64
 int64_t tsosStr2int64(char *str) {
diff --git a/src/os/src/detail/osSysinfo.c b/src/os/src/detail/osSysinfo.c
index 06000be81e..a03199e8d1 100644
--- a/src/os/src/detail/osSysinfo.c
+++ b/src/os/src/detail/osSysinfo.c
@@ -18,8 +18,6 @@
 #include "tconfig.h"
 #include "tglobal.h"
 #include "tulog.h"
-#include "tsystem.h"
-#include "taosdef.h"
 
 #ifndef TAOS_OS_FUNC_SYSINFO
 
diff --git a/src/os/src/detail/osTime.c b/src/os/src/detail/osTime.c
index 28c13165fa..6d41692d80 100644
--- a/src/os/src/detail/osTime.c
+++ b/src/os/src/detail/osTime.c
@@ -17,12 +17,10 @@
 #define _XOPEN_SOURCE
 #define _DEFAULT_SOURCE
 
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-
+#include "os.h"
 #include "taosdef.h"
 #include "tutil.h"
+
 /*
  * mktime64 - Converts date to seconds.
  * Converts Gregorian date to seconds since 1970-01-01 00:00:00.
diff --git a/src/os/src/detail/osTimer.c b/src/os/src/detail/osTimer.c
index c425d1732e..22f7b94c3a 100644
--- a/src/os/src/detail/osTimer.c
+++ b/src/os/src/detail/osTimer.c
@@ -15,8 +15,6 @@
 
 #define _DEFAULT_SOURCE
 #include "os.h"
-#include "taosdef.h"
-#include "tglobal.h"
 #include "ttimer.h"
 #include "tulog.h"
 
diff --git a/src/os/src/linux64/linuxEnv.c b/src/os/src/linux64/linuxEnv.c
index 0a9d81311a..4f84412075 100644
--- a/src/os/src/linux64/linuxEnv.c
+++ b/src/os/src/linux64/linuxEnv.c
@@ -16,7 +16,6 @@
 #define _DEFAULT_SOURCE
 #include "os.h"
 #include "tglobal.h"
-#include "tulog.h"
 
 void osInit() {
   strcpy(configDir, "/etc/taos");
-- 
GitLab