include libfastcommon header files start with fastcommon/

happyfish100 · Jun 29, 2018 · b1423a3 · b1423a3
1 parent 99526a2
commit b1423a3
Show file tree

Hide file tree

Showing 88 changed files with 2,189 additions and 255 deletions.
diff --git a/client/client_func.c b/client/client_func.c
@@ -19,13 +19,13 @@
 #include <errno.h>
 #include <time.h>
 #include "fdfs_define.h"
-#include "logger.h"
+#include "fastcommon/logger.h"
 #include "fdfs_global.h"
-#include "base64.h"
-#include "sockopt.h"
-#include "shared_func.h"
-#include "ini_file_reader.h"
-#include "connection_pool.h"
+#include "fastcommon/base64.h"
+#include "fastcommon/sockopt.h"
+#include "fastcommon/shared_func.h"
+#include "fastcommon/ini_file_reader.h"
+#include "fastcommon/connection_pool.h"
 #include "tracker_types.h"
 #include "tracker_proto.h"
 #include "client_global.h"

diff --git a/client/client_func.h b/client/client_func.h
@@ -10,7 +10,7 @@
 
 #include "tracker_types.h"
 #include "client_global.h"
-#include "ini_file_reader.h"
+#include "fastcommon/ini_file_reader.h"
 
 #ifndef _CLIENT_FUNC_H_
 #define _CLIENT_FUNC_H_

diff --git a/client/client_global.h b/client/client_global.h
@@ -11,7 +11,7 @@
 #ifndef _CLIENT_GLOBAL_H
 #define _CLIENT_GLOBAL_H
 
-#include "common_define.h"
+#include "fastcommon/common_define.h"
 #include "tracker_types.h"
 #include "fdfs_shared_func.h"
 

diff --git a/client/fdfs_append_file.c b/client/fdfs_append_file.c
@@ -14,7 +14,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "fdfs_client.h"
-#include "logger.h"
+#include "fastcommon/logger.h"
 
 int main(int argc, char *argv[])
 {

diff --git a/client/fdfs_appender_test.c b/client/fdfs_appender_test.c
@@ -15,9 +15,9 @@
 #include <sys/stat.h>
 #include "fdfs_client.h"
 #include "fdfs_global.h"
-#include "base64.h"
-#include "sockopt.h"
-#include "logger.h"
+#include "fastcommon/base64.h"
+#include "fastcommon/sockopt.h"
+#include "fastcommon/logger.h"
 #include "fdfs_http_shared.h"
 
 int writeToFileCallback(void *arg, const int64_t file_size, const char *data, \

diff --git a/client/fdfs_appender_test1.c b/client/fdfs_appender_test1.c
@@ -15,9 +15,9 @@
 #include <sys/stat.h>
 #include "fdfs_client.h"
 #include "fdfs_global.h"
-#include "base64.h"
-#include "sockopt.h"
-#include "logger.h"
+#include "fastcommon/base64.h"
+#include "fastcommon/sockopt.h"
+#include "fastcommon/logger.h"
 #include "fdfs_http_shared.h"
 
 int writeToFileCallback(void *arg, const int64_t file_size, const char *data, \

diff --git a/client/fdfs_client.h b/client/fdfs_client.h
@@ -9,7 +9,7 @@
 #ifndef FDFS_CLIENT_H
 #define FDFS_CLIENT_H
 
-#include "shared_func.h"
+#include "fastcommon/shared_func.h"
 #include "tracker_types.h"
 #include "tracker_proto.h"
 #include "tracker_client.h"

diff --git a/client/fdfs_crc32.c b/client/fdfs_crc32.c
@@ -14,7 +14,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "hash.h"
+#include "fastcommon/hash.h"
 
 int main(int argc, char *argv[])
 {

diff --git a/client/fdfs_delete_file.c b/client/fdfs_delete_file.c
@@ -14,7 +14,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "fdfs_client.h"
-#include "logger.h"
+#include "fastcommon/logger.h"
 
 int main(int argc, char *argv[])
 {

diff --git a/client/fdfs_download_file.c b/client/fdfs_download_file.c
@@ -14,7 +14,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "fdfs_client.h"
-#include "logger.h"
+#include "fastcommon/logger.h"
 
 int main(int argc, char *argv[])
 {

diff --git a/client/fdfs_file_info.c b/client/fdfs_file_info.c
@@ -14,7 +14,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "fdfs_client.h"
-#include "logger.h"
+#include "fastcommon/logger.h"
 
 int main(int argc, char *argv[])
 {

diff --git a/client/fdfs_monitor.c b/client/fdfs_monitor.c
@@ -13,8 +13,8 @@
 #include <errno.h>
 #include <signal.h>
 #include <sys/types.h>
-#include "sockopt.h"
-#include "logger.h"
+#include "fastcommon/sockopt.h"
+#include "fastcommon/logger.h"
 #include "client_global.h"
 #include "fdfs_global.h"
 #include "fdfs_client.h"

diff --git a/client/fdfs_test.c b/client/fdfs_test.c
@@ -15,9 +15,9 @@
 #include <sys/stat.h>
 #include "fdfs_client.h"
 #include "fdfs_global.h"
-#include "base64.h"
-#include "sockopt.h"
-#include "logger.h"
+#include "fastcommon/base64.h"
+#include "fastcommon/sockopt.h"
+#include "fastcommon/logger.h"
 #include "fdfs_http_shared.h"
 
 int writeToFileCallback(void *arg, const int64_t file_size, const char *data, \

diff --git a/client/fdfs_test1.c b/client/fdfs_test1.c
@@ -15,10 +15,10 @@
 #include <sys/stat.h>
 #include "fdfs_client.h"
 #include "fdfs_global.h"
-#include "base64.h"
+#include "fastcommon/base64.h"
 #include "fdfs_http_shared.h"
-#include "sockopt.h"
-#include "logger.h"
+#include "fastcommon/sockopt.h"
+#include "fastcommon/logger.h"
 
 int writeToFileCallback(void *arg, const int64_t file_size, const char *data, \
                 const int current_size)

diff --git a/client/fdfs_upload_appender.c b/client/fdfs_upload_appender.c
@@ -13,7 +13,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "fdfs_client.h"
-#include "logger.h"
+#include "fastcommon/logger.h"
 
 int main(int argc, char *argv[])
 {

diff --git a/client/fdfs_upload_file.c b/client/fdfs_upload_file.c
@@ -14,7 +14,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "fdfs_client.h"
-#include "logger.h"
+#include "fastcommon/logger.h"
 
 static void usage(char *argv[])
 {

diff --git a/client/storage_client.c b/client/storage_client.c
@@ -18,18 +18,18 @@
 #include <errno.h>
 #include <time.h>
 #include "fdfs_define.h"
-#include "logger.h"
+#include "fastcommon/logger.h"
 #include "fdfs_global.h"
-#include "sockopt.h"
-#include "shared_func.h"
+#include "fastcommon/sockopt.h"
+#include "fastcommon/shared_func.h"
 #include "tracker_types.h"
 #include "tracker_proto.h"
 #include "client_func.h"
 #include "tracker_client.h"
 #include "storage_client.h"
 #include "storage_client1.h"
 #include "client_global.h"
-#include "base64.h"
+#include "fastcommon/base64.h"
 
 static struct base64_context the_base64_context;
 static int the_base64_context_inited = 0;

diff --git a/client/test/fdfs_monitor.c b/client/test/fdfs_monitor.c