astatin3/unshell
1
0
Fork 0
mirror of https://github.com/Astatin3/unshell.git synced 2026-06-08 22:38:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make the log macro's definition more consise

Browse Source
This commit is contained in:
Michael Mikovsky
2026-02-20 14:34:32 -07:00
parent 219c7254fb
commit 6c6625e9ad
6 changed files with 44 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.toml
+1 -1
View File
@@ -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 = [
src/logger/log_disabled.rs
+6
View File
@@ -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),*) => {{}};
}
src/logger/macros.rs → src/logger/log_enabled.rs
-28
View File
@@ -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)*)
};
}
src/logger/macros_disabled.rs
-45
View File
@@ -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;)*
}};
}
src/logger/mod.rs
+31 -2
View File
@@ -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)*)
};
}
ush-payload/src/main.rs
+6 -4
View File
@@ -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