Merge pull request #166 from Achiefs/165-fix-codescan

Fix codescan issues
Achiefs · Jul 12, 2024 · ab29209 · ab29209
2 parents 51789f2 + 8aafbf7
commit ab29209
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/src/appconfig.rs b/src/appconfig.rs
@@ -349,10 +349,8 @@ impl AppConfig {
     // ------------------------------------------------------------------------
 
     pub fn get_labels(&self, index: usize, array: Array) -> Vec<String> {
-        match array[index]["labels"].clone().into_vec() {
-            Some(labels) => labels,
-            None => Vec::new()
-        }.to_vec().iter().map(|element| String::from(element.as_str().unwrap()) ).collect()
+        array[index]["labels"].clone().into_vec().unwrap_or_default()
+        .to_vec().iter().map(|element| String::from(element.as_str().unwrap()) ).collect()
     }
 
     // ------------------------------------------------------------------------
@@ -399,10 +397,8 @@ impl AppConfig {
     // ------------------------------------------------------------------------
 
     pub fn get_integrations(&self, index: usize, array: Array) -> Vec<Integration> {
-        let data = match array[index]["integrations"].clone().into_vec() {
-            Some(integrations) => integrations,
-            None => Vec::new()
-        };
+        let default = array[index]["integrations"].clone().into_vec();
+        let data = default.unwrap_or_default();
         let mut integrations: Vec<Integration> = Vec::new();
         data.iter().for_each(|info|
             integrations.push(Integration::new(

diff --git a/src/logreader.rs b/src/logreader.rs
@@ -110,10 +110,10 @@ pub fn extract_fields(data: Vec<HashMap<String, String>>) -> (SHashMap,
 
     data.iter().for_each(|v| {
         match v["type"].as_str() {
-            "SYSCALL" => syscall = v.clone(),
+            "SYSCALL" => syscall.clone_from(v),
             "PATH" => paths.push(v.clone()),
-            "CWD" => cwd = v.clone(),
-            "PROCTITLE" => proctitle = v.clone(),
+            "CWD" => cwd.clone_from(v),
+            "PROCTITLE" => proctitle.clone_from(v),
             _ => error!("Unidentified Audit field")
         }
     });