From: Jason Ish <jason.ish@oisf.net>
Date: Tue, 25 Aug 2020 19:17:55 +0000 (-0600)
Subject: rust/log: minor cleanup
X-Git-Tag: suricata-6.0.0-rc1~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=647e304f4bc4ecd10f605b80d708f4ec1ae9aef7;p=thirdparty%2Fsuricata.git

rust/log: minor cleanup

Group functions for setting and getting the log level
together.
---

diff --git a/rust/src/log.rs b/rust/src/log.rs
index ff958592dd..90f8a27106 100644
--- a/rust/src/log.rs
+++ b/rust/src/log.rs
@@ -46,6 +46,17 @@ pub fn get_log_level() -> i32 {
     }
 }
 
+pub fn log_set_level(level: i32) {
+    unsafe {
+        LEVEL = level;
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn rs_log_set_level(level: i32) {
+    log_set_level(level);
+}
+
 fn basename(filename: &str) -> &str {
     let path = Path::new(filename);
     for os_str in path.file_name() {
@@ -159,17 +170,6 @@ macro_rules!SCLogDebug {
     ($one:expr, $($arg:tt)*) => { let _ = &$one; SCLogDebug!($($arg)*); };
 }
 
-#[no_mangle]
-pub extern "C" fn rs_log_set_level(level: i32) {
-    log_set_level(level);
-}
-
-pub fn log_set_level(level: i32) {
-    unsafe {
-        LEVEL = level;
-    }
-}
-
 /// SCLogMessage wrapper. If the Suricata C context is not registered
 /// a more basic log format will be used (for example, when running
 /// Rust unit tests).