mirror of
https://github.com/loot/libloot.git
synced 2026-07-27 14:16:01 -07:00
Remove LogLevel::Fatal
It's never used.
This commit is contained in:
@@ -37,8 +37,7 @@ enum struct LogLevel : unsigned int {
|
||||
debug,
|
||||
info,
|
||||
warning,
|
||||
error,
|
||||
fatal
|
||||
error
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
+1
-5
@@ -23,8 +23,6 @@ extern const uint8_t LIBLOOT_LOG_LEVEL_WARNING;
|
||||
|
||||
extern const uint8_t LIBLOOT_LOG_LEVEL_ERROR;
|
||||
|
||||
extern const uint8_t LIBLOOT_LOG_LEVEL_FATAL;
|
||||
|
||||
void libloot_set_logging_callback(void (*callback)(uint8_t, const char*, void*),
|
||||
void* context);
|
||||
}
|
||||
@@ -48,7 +46,7 @@ LogLevel convert(uint8_t level) {
|
||||
} else if (level == LIBLOOT_LOG_LEVEL_ERROR) {
|
||||
return LogLevel::error;
|
||||
} else {
|
||||
return LogLevel::fatal;
|
||||
return LogLevel::error;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,8 +62,6 @@ loot::rust::LogLevel convert(LogLevel level) {
|
||||
return loot::rust::LogLevel::Warning;
|
||||
case LogLevel::error:
|
||||
return loot::rust::LogLevel::Error;
|
||||
case LogLevel::fatal:
|
||||
return loot::rust::LogLevel::Fatal;
|
||||
default:
|
||||
return loot::rust::LogLevel::Trace;
|
||||
}
|
||||
|
||||
@@ -195,7 +195,6 @@ impl TryFrom<ffi::LogLevel> for libloot::LogLevel {
|
||||
ffi::LogLevel::Info => Ok(libloot::LogLevel::Info),
|
||||
ffi::LogLevel::Warning => Ok(libloot::LogLevel::Warning),
|
||||
ffi::LogLevel::Error => Ok(libloot::LogLevel::Error),
|
||||
ffi::LogLevel::Fatal => Ok(libloot::LogLevel::Fatal),
|
||||
_ => Err(UnsupportedEnumValueError),
|
||||
}
|
||||
}
|
||||
@@ -261,7 +260,6 @@ mod ffi {
|
||||
Info,
|
||||
Warning,
|
||||
Error,
|
||||
Fatal,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
@@ -712,9 +710,6 @@ pub static LIBLOOT_LOG_LEVEL_WARNING: c_uchar = 3;
|
||||
#[unsafe(no_mangle)]
|
||||
pub static LIBLOOT_LOG_LEVEL_ERROR: c_uchar = 4;
|
||||
|
||||
#[unsafe(no_mangle)]
|
||||
pub static LIBLOOT_LOG_LEVEL_FATAL: c_uchar = 5;
|
||||
|
||||
fn to_u8(value: libloot::LogLevel) -> u8 {
|
||||
match value {
|
||||
libloot::LogLevel::Trace => LIBLOOT_LOG_LEVEL_TRACE,
|
||||
@@ -722,7 +717,6 @@ fn to_u8(value: libloot::LogLevel) -> u8 {
|
||||
libloot::LogLevel::Info => LIBLOOT_LOG_LEVEL_INFO,
|
||||
libloot::LogLevel::Warning => LIBLOOT_LOG_LEVEL_WARNING,
|
||||
libloot::LogLevel::Error => LIBLOOT_LOG_LEVEL_ERROR,
|
||||
libloot::LogLevel::Fatal => LIBLOOT_LOG_LEVEL_FATAL,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -139,7 +139,7 @@ TEST(SetLogLevel, shouldOnlyRunTheCallbackForMessagesAtOrAboveTheGivenLevel) {
|
||||
loggedMessages.push_back(std::make_pair(level, std::string(string)));
|
||||
};
|
||||
SetLoggingCallback(callback);
|
||||
SetLogLevel(LogLevel::fatal);
|
||||
SetLogLevel(LogLevel::error);
|
||||
|
||||
try {
|
||||
CreateGameHandle(GameType::tes4, "dummy");
|
||||
|
||||
@@ -141,7 +141,6 @@ pub enum LogLevel {
|
||||
Info,
|
||||
Warning,
|
||||
Error,
|
||||
Fatal,
|
||||
}
|
||||
|
||||
impl From<LogLevel> for libloot::LogLevel {
|
||||
@@ -152,7 +151,6 @@ impl From<LogLevel> for libloot::LogLevel {
|
||||
LogLevel::Info => libloot::LogLevel::Info,
|
||||
LogLevel::Warning => libloot::LogLevel::Warning,
|
||||
LogLevel::Error => libloot::LogLevel::Error,
|
||||
LogLevel::Fatal => libloot::LogLevel::Fatal,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -165,7 +163,6 @@ impl From<libloot::LogLevel> for LogLevel {
|
||||
libloot::LogLevel::Info => LogLevel::Info,
|
||||
libloot::LogLevel::Warning => LogLevel::Warning,
|
||||
libloot::LogLevel::Error => LogLevel::Error,
|
||||
libloot::LogLevel::Fatal => LogLevel::Fatal,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
-4
@@ -45,7 +45,6 @@ pub enum LogLevel {
|
||||
Info,
|
||||
Warning,
|
||||
Error,
|
||||
Fatal,
|
||||
}
|
||||
|
||||
impl std::fmt::Display for LogLevel {
|
||||
@@ -56,7 +55,6 @@ impl std::fmt::Display for LogLevel {
|
||||
LogLevel::Info => write!(f, "info"),
|
||||
LogLevel::Warning => write!(f, "warning"),
|
||||
LogLevel::Error => write!(f, "error"),
|
||||
LogLevel::Fatal => write!(f, "fatal"),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -68,7 +66,7 @@ impl From<LogLevel> for log::Level {
|
||||
LogLevel::Debug => log::Level::Debug,
|
||||
LogLevel::Info => log::Level::Info,
|
||||
LogLevel::Warning => log::Level::Warn,
|
||||
LogLevel::Error | LogLevel::Fatal => log::Level::Error,
|
||||
LogLevel::Error => log::Level::Error,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -321,7 +319,6 @@ mod tests {
|
||||
assert!(!is_log_enabled(LogLevel::Info));
|
||||
assert!(is_log_enabled(LogLevel::Warning));
|
||||
assert!(is_log_enabled(LogLevel::Error));
|
||||
assert!(is_log_enabled(LogLevel::Fatal));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user