src/decoders/trx-ftx/src/common/callsign_hash.rs

@@ -160,18 +160,14 @@ impl CallsignHashTable {
         let mut idx = start_idx;
 
         loop {
-            match &self.entries[idx] {
+            let entry = self.entries[idx].as_ref()?;
-                Some(entry) => {
+            let stored = (entry.hash & HASH22_MASK) >> shift;
-                    let stored = (entry.hash & HASH22_MASK) >> shift;
+            if stored == target {
-                    if stored == target {
+                return Some(entry.callsign.clone());
-                        return Some(entry.callsign.clone());
+            }
-                    }
+            idx = (idx + 1) % CALLSIGN_HASHTABLE_SIZE;
-                    idx = (idx + 1) % CALLSIGN_HASHTABLE_SIZE;
+            if idx == start_idx {
-                    if idx == start_idx {
+                return None;
-                        return None;
-                    }
-                }
-                None => return None,
             }
         }
     }

src/decoders/trx-ftx/src/common/text.rs

@@ -64,10 +64,8 @@ pub fn charn(mut c: i32, table: CharTable) -> char {
                 return EXTRAS[c as usize];
             }
         }
-        CharTable::AlphanumSpaceSlash => {
+        CharTable::AlphanumSpaceSlash if c == 0 => {
-            if c == 0 {
+            return '/';
-                return '/';
-            }
         }
         _ => {}
     }
@@ -116,10 +114,8 @@ pub fn nchar(c: char, table: CharTable) -> Option<i32> {
             '?' => return Some(n + 4),
             _ => {}
         },
-        CharTable::AlphanumSpaceSlash => {
+        CharTable::AlphanumSpaceSlash if c == '/' => {
-            if c == '/' {
+            return Some(n);
-                return Some(n);
-            }
         }
         _ => {}
     }