Fixed format and clippy warnings

m-1-k-3 · Nov 30, 2024 · 58c3dc3 · 58c3dc3
1 parent 20dbd10
commit 58c3dc3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/binwalk.rs b/src/binwalk.rs
@@ -33,7 +33,6 @@ impl BinwalkError {
     }
 }
 
-
 /// Analysis results returned by Binwalk::analyze
 #[derive(Debug, Default, Clone, Serialize, Deserialize)]
 pub struct AnalysisResults {
@@ -145,7 +144,7 @@ impl Binwalk {
         if let Some(target_file) = target_file_name {
             // Set the target file path, make it an absolute path
             match path::absolute(&target_file) {
-                Err(e) => {
+                Err(_) => {
                     return Err(BinwalkError::new(&format!(
                         "Failed to get absolute path for '{}'",
                         target_file
@@ -160,7 +159,7 @@ impl Binwalk {
             if let Some(extraction_directory) = output_directory {
                 // Make the extraction directory an absolute path
                 match path::absolute(&extraction_directory) {
-                    Err(e) => {
+                    Err(_) => {
                         return Err(BinwalkError::new(&format!(
                             "Failed to get absolute path for '{}'",
                             extraction_directory
@@ -179,7 +178,7 @@ impl Binwalk {
                     &new_instance.base_output_directory,
                 ) {
                     Err(e) => {
-                        return Err(BinwalkError::new( &format!(
+                        return Err(BinwalkError::new(&format!(
                             "Failed to initialize extraction directory: {}",
                             e
                         )));

diff --git a/src/main.rs b/src/main.rs
@@ -89,14 +89,19 @@ fn main() {
     }
 
     // Initialize binwalk
-    let binwalker = binwalk::Binwalk::configure(
+    let binwalker = match binwalk::Binwalk::configure(
         cliargs.file_name,
         output_directory,
         cliargs.include,
         cliargs.exclude,
         None,
         cliargs.search_all,
-    ).expect("Binwalk initialization failed");
+    ) {
+        Err(e) => {
+            panic!("Binwalk initialization failed: {}", e.message);
+        }
+        Ok(bw) => bw,
+    };
 
     // If the user specified --threads, honor that request; else, auto-detect available parallelism
     let available_workers = cliargs.threads.unwrap_or_else(|| {