feat: finish todos

LiteLDev · Nov 9, 2024 · 4b74748 · 4b74748
1 parent d844740
commit 4b74748
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/src/ll/core/tweak/ModifyInfomation.cpp b/src/ll/core/tweak/ModifyInfomation.cpp
@@ -42,29 +42,28 @@ LL_STATIC_HOOK(
 
 auto serverLogger = io::LoggerRegistry::getInstance().getOrCreate("Server");
 
-// int _vscprintf(const char* format, va_list pargs) { // TODO: move to predefine
-//     int     retval;
-//     va_list argcopy;
-//     va_copy(argcopy, pargs);
-//     retval = vsnprintf(nullptr, 0, format, argcopy);
-//     va_end(argcopy);
-//     return retval;
-// }
-// vsnprintf(buffer.data(), buffer.size(), pszFormat, va);
+int printfbufc(const char* format, va_list const& pargs) {
+    int     retval;
+    va_list argcopy;
+    va_copy(argcopy, pargs);
+    retval = vsnprintf(nullptr, 0, format, argcopy);
+    va_end(argcopy);
+    return retval;
+}
 
 LL_STATIC_HOOK(BedrockLogOutHook, HookPriority::Normal, BedrockLogOut, void, uint priority, char const* pszFormat, ...)
 try {
     bool        success = false;
     std::string buffer;
     va_list     va;
     va_start(va, pszFormat);
-    auto bufferCount = _vscprintf(pszFormat, va);
+    auto bufferCount = printfbufc(pszFormat, va);
     if (bufferCount >= 0) {
         success = true;
     }
     if (success && bufferCount > 0) {
         buffer = std::string(bufferCount, '\0');
-        vsprintf_s(buffer.data(), buffer.size() + 1, pszFormat, va);
+        vsnprintf(buffer.data(), buffer.size() + 1, pszFormat, va);
     }
     va_end(va);
 

diff --git a/src/mc/nbt/detail/SnbtErrorCode.cpp b/src/mc/nbt/detail/SnbtErrorCode.cpp
@@ -50,10 +50,9 @@ struct snbt_category : public std::error_category {
     [[nodiscard]] char const* name() const noexcept override { return "snbt"; }
 };
 
-// TODO: move to predefine  [[_Clang::__require_constant_initialization__]]
-
 inline std::error_category const& snbt_category() noexcept {
-    return std::_Immortalize_memcpy_image<struct snbt_category>();
+    static constexpr struct snbt_category ins;
+    return ins;
 }
 ll::Unexpected makeSnbtError(SnbtErrorCode code) {
     return makeErrorCodeError(std::error_code{fmt::underlying(code), snbt_category()});