code quality

sniper00 · Aug 10, 2024 · 3326989 · 3326989
1 parent d7fb8e4
commit 3326989
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 13 deletions.
diff --git a/common/string.hpp b/common/string.hpp
@@ -192,7 +192,6 @@ namespace moon
         return r;
     }
 
-    //format string
     inline std::string format(const char* fmt, ...)
     {
         if (!fmt) return std::string("");
@@ -255,8 +254,7 @@ namespace moon
     //" /t/n/r"
     inline std::string_view trim_right(std::string_view v)
     {
-        const auto words_end(v.find_last_not_of(" \t\n\r"));
-        if (words_end != std::string_view::npos) {
+        if (const auto words_end(v.find_last_not_of(" \t\n\r")); words_end != std::string_view::npos) {
             v.remove_suffix(v.size() - words_end - 1);
         }
         return v;
@@ -271,8 +269,7 @@ namespace moon
 
     inline std::string_view trim(std::string_view v)
     {
-        const auto words_end(v.find_last_not_of(" \t\n\r"));
-        if (words_end != std::string_view::npos) {
+        if (const auto words_end(v.find_last_not_of(" \t\n\r")); words_end != std::string_view::npos) {
             v.remove_suffix(v.size() - words_end - 1);
         }
         const auto words_begin(v.find_first_not_of(" \t\n\r"));
@@ -282,11 +279,14 @@ namespace moon
 
     inline void replace(std::string& src, std::string_view old, std::string_view strnew)
     {
-        for (std::string::size_type pos(0); pos != std::string::npos; pos += strnew.size()) {
-            if ((pos = src.find(old, pos)) != std::string::npos)
-                src.replace(pos, old.size(), strnew);
-            else
-                break;
+        if (old.empty()) {
+            return;
+        }
+
+        std::string::size_type pos = 0;
+        while ((pos = src.find(old, pos)) != std::string::npos) {
+            src.replace(pos, old.size(), strnew);
+            pos += strnew.size();
         }
     }
 
@@ -316,7 +316,7 @@ namespace moon
     }
 
     //! case insensitive
-    inline bool iequal_string_locale(const std::string&str1, const std::string& str2, const std::locale& Loc = std::locale())
+    inline bool iequal_string_locale(std::string_view str1, std::string_view str2, const std::locale& Loc = std::locale())
     {
         if (str1.size() != str2.size())
             return false;
@@ -373,6 +373,22 @@ namespace moon
         return res;
     }
 
+    inline std::string escape_non_printable(std::string_view input) {
+        static constexpr std::string_view hex = "0123456789abcdef";
+        std::string res;
+        for (char ch : input) {
+            if (isprint(static_cast<unsigned char>(ch))) {
+                res.push_back(ch);
+            } else {
+                res.push_back('\\');
+                res.push_back('x');
+                res.push_back(hex[ch >> 4]);
+                res.push_back(hex[ch & 0xf]);
+            }
+        }
+        return res;
+    }
+
     template<typename TString>
     struct ihash_string_functor
     {

diff --git a/moon-src/core/worker.cpp b/moon-src/core/worker.cpp
@@ -255,12 +255,12 @@ namespace moon
                             CONSOLE_DEBUG("Dead service [%08X] recv message from [%08X]: %s.",
                                 receiver,
                                 sender,
-                                moon::hex_string({ msg.data(),msg.size() }).data()
+                                moon::escape_non_printable({ msg.data(),msg.size() }).data()
                             );
                         }else{
                             std::string str = moon::format("Attemp call dead service [%08X]: %s."
                             , receiver
-                            , moon::hex_string({ msg.data(),msg.size() }).data());
+                            , moon::escape_non_printable({ msg.data(),msg.size() }).data());
                             msg.set_sessionid(-msg.sessionid());
                             server_->response(sender, str, msg.sessionid(), PTYPE_ERROR);
                         }