refactor(cpp): exturn全局变量改为 static inline

pdt012 · Mar 1, 2023 · b5242dd · b5242dd
1 parent ceb18e9
commit b5242dd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/cpp/src/hsocket/header/HTcpSocket.h b/cpp/src/hsocket/header/HTcpSocket.h
@@ -4,11 +4,12 @@
 
 typedef SOCKET SOCKET;
 
-namespace SocketConfig {
-	extern int RECV_BUFFER_SIZE;
-	extern int FILE_BUFFER_SIZE;
-	const char DEFAULT_DOWNLOAD_PATH[] = "download/";
-}
+class SocketConfig {
+public:
+	static inline int RECV_BUFFER_SIZE = 1024;
+	static inline int FILE_BUFFER_SIZE = 2048;
+	static inline std::string DEFAULT_DOWNLOAD_PATH = "download/";
+};
 
 class HTcpSocket : public HSocket
 {

diff --git a/cpp/src/hsocket/source/HTcpSocket.cpp b/cpp/src/hsocket/source/HTcpSocket.cpp
@@ -6,11 +6,6 @@
 
 #define USE_UNICODE_FILEPATHS
 
-namespace SocketConfig {
-	int RECV_BUFFER_SIZE = 1024;
-	int FILE_BUFFER_SIZE = 2048;
-}
-
 HTcpSocket::HTcpSocket()
 	: HSocket(PF_INET, SOCK_STREAM, IPPROTO_TCP)
 {
@@ -85,8 +80,8 @@ std::string HTcpSocket::recvFile()
 	memcpy_s(&filesize, 4, filesize_b.c_str(), 4);
 	// file content
 	if (!filename.empty() && filesize > 0) {
-		if (!fileutil::exists(SocketConfig::DEFAULT_DOWNLOAD_PATH))
-			fileutil::mkdir(SocketConfig::DEFAULT_DOWNLOAD_PATH);
+		if (!fileutil::exists(SocketConfig::DEFAULT_DOWNLOAD_PATH.c_str()))
+			fileutil::mkdir(SocketConfig::DEFAULT_DOWNLOAD_PATH.c_str());
 		std::string downPath = pathutil::join(SocketConfig::DEFAULT_DOWNLOAD_PATH, filename);
 		int totalRecvSize = 0;  // 收到的字节数
 #ifdef USE_UNICODE_FILEPATHS