Port hex_to_int from C to Rust

Author: ishwarthecodddr

src/lib_ccx/utility.c

@@ -16,6 +16,9 @@ extern void ccxr_timestamp_to_srttime(uint64_t timestamp, char *buffer);
 extern void ccxr_timestamp_to_vtttime(uint64_t timestamp, char *buffer);
 extern void ccxr_millis_to_date(uint64_t timestamp, char *buffer, enum ccx_output_date_format date_format, char millis_separator);
 extern int ccxr_stringztoms(const char *s, struct ccx_boundary_time *bt);
+#ifndef DISABLE_RUST
+extern int ccxr_hex_to_int(char high, char low);
+#endif
 
 static uint32_t crc32_table[] = {
     0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9,
@@ -266,6 +269,9 @@ void sleep_secs(int secs)
 
 int hex_to_int(char high, char low)
 {
+#ifndef DISABLE_RUST
+	return ccxr_hex_to_int(high, low);
+#else
 	unsigned char h, l;
 	if (high >= '0' && high <= '9')
 		h = high - '0';
@@ -280,6 +286,7 @@ int hex_to_int(char high, char low)
 	else
 		return -1;
 	return h * 16 + l;
+#endif
 }
 int hex_string_to_int(char *string, int len)
 {

src/rust/lib_ccxr/src/util/hex.rs

@@ -0,0 +1,28 @@
+pub fn hex_to_int(high: char, low: char) -> i32 {
+    let h = match high {
+        '0'..='9' => high as i32 - '0' as i32,
+        'a'..='f' => high as i32 - 'a' as i32 + 10,
+        _ => return -1,
+    };
+    let l = match low {
+        '0'..='9' => low as i32 - '0' as i32,
+        'a'..='f' => low as i32 - 'a' as i32 + 10,
+        _ => return -1,
+    };
+    h * 16 + l
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_hex_to_int() {
+        assert_eq!(hex_to_int('0', '0'), 0);
+        assert_eq!(hex_to_int('f', 'f'), 255);
+        assert_eq!(hex_to_int('a', '0'), 160);
+        assert_eq!(hex_to_int('0', 'a'), 10);
+        assert_eq!(hex_to_int('g', '0'), -1);
+        assert_eq!(hex_to_int('0', 'g'), -1);
+    }
+}

src/rust/lib_ccxr/src/util/mod.rs

@@ -13,6 +13,7 @@
 pub mod bits;
 pub mod encoders_helper;
 pub mod encoding;
+pub mod hex;
 pub mod levenshtein;
 pub mod log;
 pub mod time;

src/rust/src/libccxr_exports/mod.rs

@@ -5,6 +5,7 @@ pub mod demuxer;
 pub mod demuxerdata;
 pub mod net;
 pub mod time;
+pub mod util;
 use crate::ccx_options;
 use lib_ccxr::util::log::*;
 use lib_ccxr::util::{bits::*, levenshtein::*};

src/rust/src/libccxr_exports/util.rs

@@ -0,0 +1,7 @@
+use lib_ccxr::util::hex;
+use std::ffi::c_char;
+
+#[no_mangle]
+pub extern "C" fn ccxr_hex_to_int(high: c_char, low: c_char) -> i32 {
+    hex::hex_to_int(high as u8 as char, low as u8 as char)
+}