From 02421ede929113f66fd3c947981c8c3bb833a665 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Mon, 28 Feb 2022 17:50:50 +0800
Subject: [PATCH] minor changes

---
 include/common/common.h    |  2 +-
 include/common/tep.h       |  3 +--
 include/common/tname.h     |  2 +-
 include/common/ttszip.h    | 21 ++++++++++-----------
 include/common/ttypes.h    |  2 +-
 include/common/tvariant.h  |  2 +-
 include/common/type/type.h | 27 ---------------------------
 7 files changed, 15 insertions(+), 44 deletions(-)
 delete mode 100644 include/common/type/type.h

diff --git a/include/common/common.h b/include/common/common.h
index 4beecd7580..37d20cdb97 100644
--- a/include/common/common.h
+++ b/include/common/common.h
@@ -280,4 +280,4 @@ typedef struct SSessionWindow {
 }
 #endif
 
-#endif  // _TD_COMMON_DEF_H_
+#endif  /*_TD_COMMON_DEF_H_*/
diff --git a/include/common/tep.h b/include/common/tep.h
index e098de4ecf..3b9d379aa4 100644
--- a/include/common/tep.h
+++ b/include/common/tep.h
@@ -23,7 +23,6 @@
 extern "C" {
 #endif
 
-
 typedef struct SCorEpSet {
   int32_t version;
   SEpSet  epSet;
@@ -123,4 +122,4 @@ void*        blockDataDestroy(SSDataBlock* pBlock);
 }
 #endif
 
-#endif  // _TD_COMMON_EP_H_
+#endif  /*_TD_COMMON_EP_H_*/
diff --git a/include/common/tname.h b/include/common/tname.h
index f09cdc81da..6de38a68ee 100644
--- a/include/common/tname.h
+++ b/include/common/tname.h
@@ -67,4 +67,4 @@ SSchema createSchema(uint8_t type, int32_t bytes, int32_t colId, const char* nam
 }
 #endif
 
-#endif  // _TD_COMMON_NAME_H_
+#endif  /*_TD_COMMON_NAME_H_*/
diff --git a/include/common/ttszip.h b/include/common/ttszip.h
index 71d17ebd71..e9f4302320 100644
--- a/include/common/ttszip.h
+++ b/include/common/ttszip.h
@@ -16,7 +16,6 @@
 #ifndef _TD_COMMON_TTSZIP_H_
 #define _TD_COMMON_TTSZIP_H_
 
-
 #include "os.h"
 #include "tdef.h"
 #include "tvariant.h"
@@ -25,8 +24,8 @@
 extern "C" {
 #endif
 
-#define MEM_BUF_SIZE (1 << 20)
-#define TS_COMP_FILE_MAGIC 0x87F5EC4C
+#define MEM_BUF_SIZE           (1 << 20)
+#define TS_COMP_FILE_MAGIC     0x87F5EC4C
 #define TS_COMP_FILE_GROUP_MAX 512
 
 typedef struct STSList {
@@ -62,10 +61,10 @@ typedef struct STSBlock {
  * and the offset of int32_t type is enough
  */
 typedef struct STSGroupBlockInfo {
-  int32_t id;          // group id
-  int32_t offset;      // offset set value in file
-  int32_t numOfBlocks; // number of total blocks
-  int32_t compLen;     // compressed size
+  int32_t id;           // group id
+  int32_t offset;       // offset set value in file
+  int32_t numOfBlocks;  // number of total blocks
+  int32_t compLen;      // compressed size
 } STSGroupBlockInfo;
 
 typedef struct STSGroupBlockInfoEx {
@@ -113,9 +112,9 @@ STSBuf* tsBufClone(STSBuf* pTSBuf);
 
 STSGroupBlockInfo* tsBufGetGroupBlockInfo(STSBuf* pTSBuf, int32_t id);
 
-void    tsBufFlush(STSBuf* pTSBuf);
-void    tsBufResetPos(STSBuf* pTSBuf);
-bool    tsBufNextPos(STSBuf* pTSBuf);
+void tsBufFlush(STSBuf* pTSBuf);
+void tsBufResetPos(STSBuf* pTSBuf);
+bool tsBufNextPos(STSBuf* pTSBuf);
 
 STSElem tsBufGetElem(STSBuf* pTSBuf);
 STSElem tsBufGetElemStartPos(STSBuf* pTSBuf, int32_t id, SVariant* tag);
@@ -145,4 +144,4 @@ bool tsBufIsValidElem(STSElem* pElem);
 }
 #endif
 
-#endif  // _TD_COMMON_TTSZIP_H_
+#endif  /*_TD_COMMON_TTSZIP_H_*/
diff --git a/include/common/ttypes.h b/include/common/ttypes.h
index f33ef92a81..5aa22bdcad 100644
--- a/include/common/ttypes.h
+++ b/include/common/ttypes.h
@@ -231,4 +231,4 @@ void *getDataMax(int32_t type);
 }
 #endif
 
-#endif  // _TD_COMMON_TTYPE_H_
+#endif  /*_TD_COMMON_TTYPE_H_*/
diff --git a/include/common/tvariant.h b/include/common/tvariant.h
index 554c752310..995015fe63 100644
--- a/include/common/tvariant.h
+++ b/include/common/tvariant.h
@@ -64,4 +64,4 @@ int32_t taosVariantTypeSetType(SVariant *pVariant, char type);
 }
 #endif
 
-#endif  // _TD_COMMON_VARIANT_H_
+#endif  /*_TD_COMMON_VARIANT_H_*/
diff --git a/include/common/type/type.h b/include/common/type/type.h
deleted file mode 100644
index 3cbea6edbb..0000000000
--- a/include/common/type/type.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _TD_TYPE_H_
-#define _TD_TYPE_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*_TD_TYPE_H_*/
\ No newline at end of file