checksum: rename algo len to bitlen to avoid confusion

RenjiSann · RenjiSann · commit 42997a2be441 · 2024-12-06T21:28:56.000+01:00
diff --git a/src/uucore/src/lib/features/checksum.rs b/src/uucore/src/lib/features/checksum.rs
@@ -317,7 +317,7 @@ fn print_file_report<W: Write>(
     }
 }
 
-pub fn detect_algo(algo: &str, length: Option<usize>) -> UResult<HashAlgorithm> {
+pub fn detect_algo(algo: &str, bitlen: Option<usize>) -> UResult<HashAlgorithm> {
     match algo {
         ALGORITHM_OPTIONS_SYSV => Ok(HashAlgorithm {
             name: ALGORITHM_OPTIONS_SYSV,
@@ -366,7 +366,7 @@ pub fn detect_algo(algo: &str, length: Option<usize>) -> UResult<HashAlgorithm>
         }),
         ALGORITHM_OPTIONS_BLAKE2B | "b2sum" => {
             // Set default length to 512 if None
-            let bits = length.unwrap_or(512);
+            let bits = bitlen.unwrap_or(512);
             if bits == 512 {
                 Ok(HashAlgorithm {
                     name: ALGORITHM_OPTIONS_BLAKE2B,
@@ -393,7 +393,7 @@ pub fn detect_algo(algo: &str, length: Option<usize>) -> UResult<HashAlgorithm>
         }),
         ALGORITHM_OPTIONS_SHAKE128 | "shake128sum" => {
             let bits =
-                length.ok_or_else(|| USimpleError::new(1, "--bits required for SHAKE128"))?;
+                bitlen.ok_or_else(|| USimpleError::new(1, "--bits required for SHAKE128"))?;
             Ok(HashAlgorithm {
                 name: ALGORITHM_OPTIONS_SHAKE128,
                 create_fn: Box::new(|| Box::new(Shake128::new())),
@@ -402,15 +402,15 @@ pub fn detect_algo(algo: &str, length: Option<usize>) -> UResult<HashAlgorithm>
         }
         ALGORITHM_OPTIONS_SHAKE256 | "shake256sum" => {
             let bits =
-                length.ok_or_else(|| USimpleError::new(1, "--bits required for SHAKE256"))?;
+                bitlen.ok_or_else(|| USimpleError::new(1, "--bits required for SHAKE256"))?;
             Ok(HashAlgorithm {
                 name: ALGORITHM_OPTIONS_SHAKE256,
                 create_fn: Box::new(|| Box::new(Shake256::new())),
                 bits,
             })
         }
         //ALGORITHM_OPTIONS_SHA3 | "sha3" => (
-        _ if algo.starts_with("sha3") => create_sha3(length),
+        _ if algo.starts_with("sha3") => create_sha3(bitlen),
 
         _ => Err(ChecksumError::UnknownAlgorithm.into()),
     }
@@ -621,15 +621,17 @@ fn identify_algo_name_and_length(
         return None;
     }
 
-    let bits = line_info.algo_bitlen.map_or(Some(None), |bits| {
-        if bits % 8 == 0 {
-            Some(Some(bits / 8))
-        } else {
-            None // Return None to signal a divisibility issue
+    let bitlen = if let Some(b) = line_info.algo_bitlen {
+        if b % 8 != 0 {
+            // Improperly formatted line : the given length is incorrect.
+            return None;
         }
-    })?;
+        Some(b / 8)
+    } else {
+        None
+    };
 
-    Some((algorithm, bits))
+    Some((algorithm, bitlen))
 }
 
 /// Parses a checksum line, detect the algorithm to use, read the file and produce
@@ -677,7 +679,7 @@ fn process_checksum_line(
             .ok_or(LineCheckError::ImproperlyFormatted)?;
 
         // If the algo_name is provided, we use it, otherwise we try to detect it
-        let (algo_name, length) = if line_info.is_algo_based() {
+        let (algo_name, algo_bitlen) = if line_info.is_algo_based() {
             identify_algo_name_and_length(&line_info, cli_algo_name)
                 .ok_or(LineCheckError::ImproperlyFormatted)?
         } else if let Some(a) = cli_algo_name {
@@ -696,7 +698,7 @@ fn process_checksum_line(
             return Err(LineCheckError::ImproperlyFormatted);
         };
 
-        let mut algo = detect_algo(&algo_name, length)?;
+        let mut algo = detect_algo(&algo_name, algo_bitlen)?;
 
         let (filename_to_check_unescaped, prefix) = unescape_filename(filename_to_check);
 
