tbuffer

include/util/taoserror.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_UTIL_TAOS_ERROR_H_
-#define _TD_UTIL_TAOS_ERROR_H_
+#ifndef _TD_UTIL_ERROR_H_
+#define _TD_UTIL_ERROR_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -469,4 +469,4 @@ int32_t* taosGetErrno();
 }
 #endif
 
-#endif /*_TD_UTIL_TAOS_ERROR_H_*/
+#endif /*_TD_UTIL_ERROR_H_*/

include/util/tarray.h

@@ -16,7 +16,6 @@
 #ifndef _TD_UTIL_ARRAY_H
 #define _TD_UTIL_ARRAY_H
 
-#include "os.h"
 #include "talgo.h"
 
 #ifdef __cplusplus

include/util/tbuffer.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_UTIL_BUFFER_H
-#define _TD_UTIL_BUFFER_H
+#ifndef _TD_UTIL_BUFFER_H_
+#define _TD_UTIL_BUFFER_H_
 
 #include "os.h"
 
@@ -87,12 +87,10 @@ typedef struct SBufferWriter {
   void* (*allocator)(void*, size_t);
 } SBufferWriter;
 
-////////////////////////////////////////////////////////////////////////////////
 // common functions & macros for both reader & writer
 
 #define tbufTell(buf) ((buf)->pos)
 
-////////////////////////////////////////////////////////////////////////////////
 /* ------------------------ BUFFER WRITER FUNCTIONS AND MACROS ------------------------ */
 // *Allocator*, function to allocate memory, will use 'realloc' if NULL
 // *Endian*, if true, writer functions of primitive types will do 'hton' automatically
@@ -167,4 +165,4 @@ double      tbufReadDouble(SBufferReader* buf);
 }
 #endif
 
-#endif /*_TD_UTIL_BUFFER_H*/
+#endif /*_TD_UTIL_BUFFER_H_*/

source/util/src/tbuffer.c

@@ -14,11 +14,8 @@
  */
 
 #define _DEFAULT_SOURCE
-
 #include "tbuffer.h"
 #include "texception.h"
-#include "os.h"
-//#include "taoserror.h"
 
 typedef union Un4B {
   uint32_t ui;