refactor

src/util/inc/tkvstore.h

@@ -21,8 +21,6 @@ extern "C" {
 
 #include <stdint.h>
 
-#define KVSTORE_FILE_VERSION ((uint32_t)0)
-
 typedef int (*iterFunc)(void *, void *cont, int contLen);
 typedef void (*afterFunc)(void *);
 
@@ -48,6 +46,7 @@ typedef struct {
 } SKVStore;
 
 #define KVSTORE_MAGIC(s) (s)->info.magic
+#define KVSTORE_FILE_VERSION ((uint32_t)0)
 
 int       tdCreateKVStore(char *fname);
 int       tdDestroyKVStore(char *fname);

src/util/src/tkvstore.c

@@ -17,11 +17,6 @@
 
 #define TAOS_RANDOM_FILE_FAIL_TEST
 
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
 #include "os.h"
 #include "hash.h"
 #include "taoserror.h"
@@ -33,7 +28,6 @@
 #define TD_KVSTORE_HEADER_SIZE 512
 #define TD_KVSTORE_MAJOR_VERSION 1
 #define TD_KVSTORE_MAINOR_VERSION 0
-#define TD_KVSTORE_SNAP_SUFFIX ".snap"
 #define TD_KVSTORE_NEW_SUFFIX ".new"
 #define TD_KVSTORE_INIT_MAGIC 0xFFFFFFFF