diff --git a/include/util/tqueue.h b/include/util/tqueue.h
index cfa5a65c2a..d51184edfc 100644
--- a/include/util/tqueue.h
+++ b/include/util/tqueue.h
@@ -13,8 +13,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_UTIL_QUEUE_H
-#define _TD_UTIL_QUEUE_H
+#ifndef _TD_UTIL_QUEUE_H_
+#define _TD_UTIL_QUEUE_H_
+
 #include "os.h"
 
 #ifdef __cplusplus
@@ -47,7 +48,7 @@ typedef void (*FItems)(void *ahandle, STaosQall *qall, int32_t numOfItems);
 STaosQueue *taosOpenQueue();
 void        taosCloseQueue(STaosQueue *queue);
 void        taosSetQueueFp(STaosQueue *queue, FItem itemFp, FItems itemsFp);
-void *      taosAllocateQitem(int32_t size);
+void       *taosAllocateQitem(int32_t size);
 void        taosFreeQitem(void *pItem);
 int32_t     taosWriteQitem(STaosQueue *queue, void *pItem);
 int32_t     taosReadQitem(STaosQueue *queue, void **ppItem);
@@ -80,4 +81,4 @@ int32_t taosGetQsetItemsNumber(STaosQset *qset);
 }
 #endif
 
-#endif /*_TD_UTIL_QUEUE_H*/
+#endif /*_TD_UTIL_QUEUE_H_*/
diff --git a/source/util/src/tqueue.c b/source/util/src/tqueue.c
index 0f6e2610c5..0003522033 100644
--- a/source/util/src/tqueue.c
+++ b/source/util/src/tqueue.c
@@ -30,19 +30,19 @@ typedef struct STaosQueue {
   int32_t         itemSize;
   int32_t         numOfItems;
   int32_t         threadId;
-  STaosQnode *    head;
-  STaosQnode *    tail;
-  STaosQueue *    next;     // for queue set
-  STaosQset *     qset;     // for queue set
-  void *          ahandle;  // for queue set
+  STaosQnode     *head;
+  STaosQnode     *tail;
+  STaosQueue     *next;     // for queue set
+  STaosQset      *qset;     // for queue set
+  void           *ahandle;  // for queue set
   FItem           itemFp;
   FItems          itemsFp;
   pthread_mutex_t mutex;
 } STaosQueue;
 
 typedef struct STaosQset {
-  STaosQueue *    head;
-  STaosQueue *    current;
+  STaosQueue     *head;
+  STaosQueue     *current;
   pthread_mutex_t mutex;
   int32_t         numOfQueues;
   int32_t         numOfItems;
@@ -82,7 +82,7 @@ void taosSetQueueFp(STaosQueue *queue, FItem itemFp, FItems itemsFp) {
 void taosCloseQueue(STaosQueue *queue) {
   if (queue == NULL) return;
   STaosQnode *pTemp;
-  STaosQset * qset;
+  STaosQset  *qset;
 
   pthread_mutex_lock(&queue->mutex);
   STaosQnode *pNode = queue->head;