From 6c6625e9addbbe3e97df735232625509999f0721 Mon Sep 17 00:00:00 2001
From: Michael Mikovsky <77305074+Astatin3@users.noreply.github.com>
Date: Fri, 20 Feb 2026 14:34:32 -0700
Subject: [PATCH] Make the log macro's definition more consise

---
 Cargo.toml                               |  2 +-
 src/logger/log_disabled.rs               |  6 ++++
 src/logger/{macros.rs => log_enabled.rs} | 28 ---------------
 src/logger/macros_disabled.rs            | 45 ------------------------
 src/logger/mod.rs                        | 33 +++++++++++++++--
 ush-payload/src/main.rs                  | 10 +++---
 6 files changed, 44 insertions(+), 80 deletions(-)
 create mode 100644 src/logger/log_disabled.rs
 rename src/logger/{macros.rs => log_enabled.rs} (63%)
 delete mode 100644 src/logger/macros_disabled.rs

diff --git a/Cargo.toml b/Cargo.toml
index f96a363..18808f0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ version = "0.1.0"
 edition = "2024"
 
 authors = ["ASTATIN3"]
-include = ["LICENSE-APACHE", "LICENSE-MIT", "**/*.rs", "Cargo.toml"]
+include = ["LICENSE", "**/*.rs", "Cargo.toml"]
 
 [workspace]
 members = [
diff --git a/src/logger/log_disabled.rs b/src/logger/log_disabled.rs
new file mode 100644
index 0000000..cb3540f
--- /dev/null
+++ b/src/logger/log_disabled.rs
@@ -0,0 +1,6 @@
+// Macros that are used that just drop the inside variables
+#[macro_export]
+macro_rules! log {
+    ($level:expr, $fmt:tt) => {{}};
+    ($level:expr, $fmt:tt, $($arg:expr),*) => {{}};
+}
diff --git a/src/logger/macros.rs b/src/logger/log_enabled.rs
similarity index 63%
rename from src/logger/macros.rs
rename to src/logger/log_enabled.rs
index ce01c69..967b608 100644
--- a/src/logger/macros.rs
+++ b/src/logger/log_enabled.rs
@@ -33,31 +33,3 @@ macro_rules! log {
         );
     }};
 }
-
-#[macro_export]
-macro_rules! debug {
-    ($($arg:tt)*) => {
-        $crate::log!($crate::logger::LogLevel::Debug, $($arg)*)
-    };
-}
-
-#[macro_export]
-macro_rules! info {
-    ($($arg:tt)*) => {
-        $crate::log!($crate::logger::LogLevel::Info, $($arg)*)
-    };
-}
-
-#[macro_export]
-macro_rules! warn {
-    ($($arg:tt)*) => {
-        $crate::log!($crate::logger::LogLevel::Warn, $($arg)*)
-    };
-}
-
-#[macro_export]
-macro_rules! error {
-    ($($arg:tt)*) => {
-        $crate::log!($crate::logger::LogLevel::Error, $($arg)*)
-    };
-}
diff --git a/src/logger/macros_disabled.rs b/src/logger/macros_disabled.rs
deleted file mode 100644
index ab203ab..0000000
--- a/src/logger/macros_disabled.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Macros that are used that just drop the inside variables
-
-#[macro_export]
-macro_rules! debug {
-    ($fmt:tt) => {{
-        let _ = $fmt;
-    }};
-    ($fmt:tt, $($arg:expr),*) => {{
-        let _ = $fmt;
-        $(let _ = $arg;)*
-    }};
-}
-
-#[macro_export]
-macro_rules! info {
-    ($fmt:tt) => {{
-        let _ = $fmt;
-    }};
-    ($fmt:tt, $($arg:expr),*) => {{
-        let _ = $fmt;
-        $(let _ = $arg;)*
-    }};
-}
-
-#[macro_export]
-macro_rules! warn {
-    ($fmt:tt) => {{
-        let _ = $fmt;
-    }};
-    ($fmt:tt, $($arg:expr),*) => {{
-        let _ = $fmt;
-        $(let _ = $arg;)*
-    }};
-}
-
-#[macro_export]
-macro_rules! error {
-    ($fmt:tt) => {{
-        let _ = $fmt;
-    }};
-    ($fmt:tt, $($arg:expr),*) => {{
-        let _ = $fmt;
-        $(let _ = $arg;)*
-    }};
-}
diff --git a/src/logger/mod.rs b/src/logger/mod.rs
index e74e6a3..9aeb0cb 100644
--- a/src/logger/mod.rs
+++ b/src/logger/mod.rs
@@ -1,9 +1,9 @@
 // Choose if the macros are enabled based on the feature setting
 #[cfg(feature = "log")]
-pub mod macros;
+mod log_enabled;
 
 #[cfg(not(feature = "log"))]
-pub mod macros_disabled;
+mod log_disabled;
 
 mod pretty_logger;
 
@@ -81,3 +81,32 @@ pub type SetupLogger = extern "C" fn(logger: &'static dyn Logger);
 pub extern "C" fn setup_logger(logger: &'static dyn Logger) {
     set_logger(logger);
 }
+
+// Macro Definitions
+#[macro_export]
+macro_rules! debug {
+    ($($arg:tt)*) => {
+        $crate::log!($crate::logger::LogLevel::Debug, $($arg)*)
+    };
+}
+
+#[macro_export]
+macro_rules! info {
+    ($($arg:tt)*) => {
+        $crate::log!($crate::logger::LogLevel::Info, $($arg)*)
+    };
+}
+
+#[macro_export]
+macro_rules! warn {
+    ($($arg:tt)*) => {
+        $crate::log!($crate::logger::LogLevel::Warn, $($arg)*)
+    };
+}
+
+#[macro_export]
+macro_rules! error {
+    ($($arg:tt)*) => {
+        $crate::log!($crate::logger::LogLevel::Error, $($arg)*)
+    };
+}
diff --git a/ush-payload/src/main.rs b/ush-payload/src/main.rs
index ed57533..46b4cf1 100644
--- a/ush-payload/src/main.rs
+++ b/ush-payload/src/main.rs
@@ -1,6 +1,8 @@
+#![macro_use]
+extern crate unshell;
+
 use unshell::{
     Value, info,
-    logger::{Record, log},
     obfuscate::{junk_asm, symbol},
     tree::{Tree, TreeElement, symbols},
 };
@@ -31,9 +33,9 @@ fn test123(manager: &mut Tree) -> bool {
 
     let is_null = result.is_null();
 
-    if let Ok(result) = serde_json::from_value::<Record>(result) {
-        log(&result);
-    }
+    // if let Ok(result) = serde_json::from_value::<Record>(result) {
+    //     log(&result);
+    // }
 
     is_null