From c0d1bf63bcec4a945b7072ce047fcab907ff4246 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Fri, 5 May 2023 01:14:56 -0700
Subject: [PATCH] Clean up logging on C++ side

---
 native/src/base/logging.cpp | 17 +++++++----------
 native/src/base/logging.hpp |  2 --
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/native/src/base/logging.cpp b/native/src/base/logging.cpp
index 0654683e1..325554e66 100644
--- a/native/src/base/logging.cpp
+++ b/native/src/base/logging.cpp
@@ -18,8 +18,6 @@ static int fmt_and_log_with_rs(LogLevel level, const char *fmt, va_list ap) {
     return ret;
 }
 
-int (*cpp_logger)(LogLevel level, const char *fmt, va_list ap) = fmt_and_log_with_rs;
-
 // Used to override external C library logging
 extern "C" int magisk_log_print(int prio, const char *tag, const char *fmt, ...) {
     LogLevel level;
@@ -52,17 +50,16 @@ extern "C" int magisk_log_print(int prio, const char *tag, const char *fmt, ...)
     }
     va_list argv;
     va_start(argv, fmt);
-    int ret = cpp_logger(level, fmt_buf, argv);
+    int ret = fmt_and_log_with_rs(level, fmt_buf, argv);
     va_end(argv);
     return ret;
 }
 
-#define LOG_BODY(level) { \
-    va_list argv;        \
-    va_start(argv, fmt); \
-    cpp_logger(LogLevel::level, fmt, argv); \
-    va_end(argv);        \
-}
+#define LOG_BODY(level)   \
+    va_list argv;         \
+    va_start(argv, fmt);  \
+    fmt_and_log_with_rs(LogLevel::level, fmt, argv); \
+    va_end(argv);         \
 
 // LTO will optimize out the NOP function
 #if MAGISK_DEBUG
@@ -76,5 +73,5 @@ void LOGE(const char *fmt, ...) { LOG_BODY(Error) }
 
 // Export raw symbol to fortify compat
 extern "C" void __vloge(const char* fmt, va_list ap) {
-    cpp_logger(LogLevel::Error, fmt, ap);
+    fmt_and_log_with_rs(LogLevel::Error, fmt, ap);
 }
diff --git a/native/src/base/logging.hpp b/native/src/base/logging.hpp
index ac0a3dc4e..2e706186f 100644
--- a/native/src/base/logging.hpp
+++ b/native/src/base/logging.hpp
@@ -5,8 +5,6 @@
 
 #include <base-rs.hpp>
 
-extern int (*cpp_logger)(LogLevel level, const char *fmt, va_list ap);
-
 void LOGD(const char *fmt, ...) __printflike(1, 2);
 void LOGI(const char *fmt, ...) __printflike(1, 2);
 void LOGW(const char *fmt, ...) __printflike(1, 2);