From a05be9019eaf99c76eecbca6ce7e373a79be8fd8 Mon Sep 17 00:00:00 2001
From: ideawu <3202758+ideawu@users.noreply.github.com>
Date: Sat, 11 Jan 2020 12:31:51 +0800
Subject: [PATCH] renamed: util/strings.h -> util/string_util.h

---
 src/backend_sync.cpp                  | 2 +-
 src/client/SSDB_impl.cpp              | 2 +-
 src/net/proc.h                        | 2 +-
 src/net/server.cpp                    | 2 +-
 src/serv.cpp                          | 2 +-
 src/ssdb/binlog.cpp                   | 2 +-
 src/ssdb/options.cpp                  | 2 +-
 src/util/Makefile-ios                 | 2 +-
 src/util/app.cpp                      | 2 +-
 src/util/bytes.h                      | 2 +-
 src/util/config.cpp                   | 2 +-
 src/util/line.h                       | 2 +-
 src/util/{strings.h => string_util.h} | 0
 tools/leveldb-import.cpp              | 2 +-
 tools/ssdb-dump.cpp                   | 2 +-
 tools/ssdb-migrate.cpp                | 2 +-
 tools/ssdb-repair.cpp                 | 2 +-
 17 files changed, 16 insertions(+), 16 deletions(-)
 rename src/util/{strings.h => string_util.h} (100%)

diff --git a/src/backend_sync.cpp b/src/backend_sync.cpp
index 76fad82f4..d6f48393e 100644
--- 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
index 0005e8dae..52b691c47 100644
--- 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
index 1ffcd44c4..c2358e924 100644
--- 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
index d7a278d5e..efef74d53 100644
--- 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
index dd6727cf0..4e41dc98e 100644
--- 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
index edd7253f4..be71d4855 100644
--- 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
index 95d53012a..7ad5f2e6e 100644
--- 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
index 42be19219..9b9cc77ec 100644
--- 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
index e276d3449..b80bdd2de 100644
--- 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
index 19a6060c9..0e42838b5 100644
--- 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
index 1285ba8a5..55c856b57 100644
--- 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
index f100e5deb..5e2b3ca6f 100644
--- 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 b/src/util/string_util.h
similarity index 100%
rename from src/util/strings.h
rename to src/util/string_util.h
diff --git a/tools/leveldb-import.cpp b/tools/leveldb-import.cpp
index 921eb8eac..8cb26ce2c 100755
--- 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
index 83f1235b8..b19c92216 100755
--- 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
index 076c1713f..4faafd7e3 100644
--- 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
index 07f20b869..ea99ae82a 100755
--- 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");