Merge pull request #1324 from ideawu/dev

renamed: util/strings.h -> util/string_util.h
ideawu · Jan 11, 2020 · 16a032b · 16a032b
2 parents 6007293 + a05be90
commit 16a032b
Show file tree

Hide file tree

Showing 17 changed files with 16 additions and 16 deletions.
diff --git a/src/backend_sync.cpp b/src/backend_sync.cpp
@@ -9,7 +9,7 @@ found in the LICENSE file.
 #include <string>
 #include "backend_sync.h"
 #include "util/log.h"
-#include "util/strings.h"
+#include "util/string_util.h"
 
 BackendSync::BackendSync(SSDBImpl *ssdb, int sync_speed){
 	thread_quit = false;

diff --git a/src/client/SSDB_impl.cpp b/src/client/SSDB_impl.cpp
@@ -1,5 +1,5 @@
 #include "SSDB_impl.h"
-#include "util/strings.h"
+#include "util/string_util.h"
 #include <signal.h>
 
 namespace ssdb{

diff --git a/src/net/proc.h b/src/net/proc.h
@@ -124,7 +124,7 @@ class ProcMap
 
 
 
-#include "../util/strings.h"
+#include "../util/string_util.h"
 
 template<class T>
 static std::string serialize_req(T &req){

diff --git a/src/net/server.cpp b/src/net/server.cpp
@@ -4,7 +4,7 @@ Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 */
 #include "server.h"
-#include "../util/strings.h"
+#include "../util/string_util.h"
 #include "../util/file.h"
 #include "../util/config.h"
 #include "../util/log.h"

diff --git a/src/serv.cpp b/src/serv.cpp
@@ -5,7 +5,7 @@ found in the LICENSE file.
 */
 #include "version.h"
 #include "util/log.h"
-#include "util/strings.h"
+#include "util/string_util.h"
 #include "serv.h"
 #include "net/proc.h"
 #include "net/server.h"

diff --git a/src/ssdb/binlog.cpp b/src/ssdb/binlog.cpp
@@ -7,7 +7,7 @@ found in the LICENSE file.
 #include "const.h"
 #include "../include.h"
 #include "../util/log.h"
-#include "../util/strings.h"
+#include "../util/string_util.h"
 #include <map>
 
 /* Binlog */

diff --git a/src/ssdb/options.cpp b/src/ssdb/options.cpp
@@ -4,7 +4,7 @@ Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 */
 #include "options.h"
-#include "../util/strings.h"
+#include "../util/string_util.h"
 
 #ifdef NDEBUG
 	static const int LOG_QUEUE_SIZE  = 20 * 1000 * 1000;

diff --git a/src/util/Makefile-ios b/src/util/Makefile-ios
@@ -21,7 +21,7 @@ all: $(OBJS)
 	ar -rs $(LIB) $(OBJS)
 	rm -rf $(OUTPUT_HEADER_DIR) $(OUTPUT_LIB_DIR)/$(LIB)
 	mkdir -p $(OUTPUT_HEADER_DIR)
-	cp -f config.h bytes.h strings.h $(OUTPUT_HEADER_DIR)
+	cp -f config.h bytes.h string_util.h $(OUTPUT_HEADER_DIR)
 	mv -f $(LIB) $(OUTPUT_LIB_DIR)
 
 .cpp.o:

diff --git a/src/util/app.cpp b/src/util/app.cpp
@@ -3,7 +3,7 @@
 #include "file.h"
 #include "config.h"
 #include "daemon.h"
-#include "strings.h"
+#include "string_util.h"
 #include <stdio.h>
 
 int Application::main(int argc, char **argv){

diff --git a/src/util/bytes.h b/src/util/bytes.h
@@ -6,7 +6,7 @@ found in the LICENSE file.
 #ifndef UTIL_BYTES_H_
 #define UTIL_BYTES_H_
 
-#include "strings.h"
+#include "string_util.h"
 
 // readonly
 // to replace std::string

diff --git a/src/util/config.cpp b/src/util/config.cpp
@@ -5,7 +5,7 @@ found in the LICENSE file.
 */
 #include "log.h"
 #include "config.h"
-#include "strings.h"
+#include "string_util.h"
 
 inline static
 int is_kv_seperator(int ch){

diff --git a/src/util/line.h b/src/util/line.h
@@ -3,7 +3,7 @@
 
 #include <inttypes.h>
 #include <string>
-#include "strings.h"
+#include "string_util.h"
 
 class LineEncoder{
 public:

diff --git a/src/util/strings.h → src/util/string_util.h b/src/util/strings.h → src/util/string_util.h
diff --git a/tools/leveldb-import.cpp b/tools/leveldb-import.cpp
@@ -16,7 +16,7 @@ found in the LICENSE file.
 #include "net/link.h"
 #include "util/log.h"
 #include "util/file.h"
-#include "util/strings.h"
+#include "util/string_util.h"
 
 void welcome(){
 	printf("leveldb-import - Import existing leveldb into ssdb\n");

diff --git a/tools/ssdb-dump.cpp b/tools/ssdb-dump.cpp
@@ -20,7 +20,7 @@ found in the LICENSE file.
 #include "net/link.h"
 #include "util/log.h"
 #include "util/file.h"
-#include "util/strings.h"
+#include "util/string_util.h"
 
 struct Config {
 	std::string ip;

diff --git a/tools/ssdb-migrate.cpp b/tools/ssdb-migrate.cpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 #include "util/log.h"
-#include "util/strings.h"
+#include "util/string_util.h"
 #include "SSDB_client.h"
 
 #define BATCH_SIZE 100

diff --git a/tools/ssdb-repair.cpp b/tools/ssdb-repair.cpp
@@ -16,7 +16,7 @@ found in the LICENSE file.
 
 #include "util/log.h"
 #include "util/file.h"
-#include "util/strings.h"
+#include "util/string_util.h"
 
 void welcome(){
 	printf("ssdb-repair - SSDB repair tool\n");