t100

Author: vatsalkeshav

src/rust/lib_ccxr/src/isdbs/isdbs.rs

@@ -71,11 +71,11 @@ pub unsafe fn freep(arg: *mut *mut c_void) {
     }
 }
 
-const LIST_POISON1: *mut ListHead = 0x001 as *mut ListHead;
-const LIST_POISON2: *mut ListHead = 0x002 as *mut ListHead;
+pub const LIST_POISON1: *mut ListHead = 0x001 as *mut ListHead;
+pub const LIST_POISON2: *mut ListHead = 0x002 as *mut ListHead;
 
 #[no_mangle]
-unsafe fn __list_del(prev: *mut ListHead, next: *mut ListHead) {
+pub unsafe fn __list_del(prev: *mut ListHead, next: *mut ListHead) {
     (*next).prev = prev;
     (*prev).next = next;
 }
@@ -205,7 +205,7 @@ pub unsafe fn list_add_tail(elem: *mut ListHead, head: *mut ListHead) {
     __list_add(elem, (*head).prev, head);
 }
 
-fn list_for_each_entry<F>(head: *mut ListHead, member: usize, mut func: F)
+pub fn list_for_each_entry<F>(head: *mut ListHead, member: usize, mut func: F)
 where
     F: FnMut(*mut ISDBText),
 {
@@ -219,7 +219,7 @@ where
     }
 }
 
-fn list_add(elem: &mut ListHead, head: &mut ListHead) {
+pub fn list_add(elem: &mut ListHead, head: &mut ListHead) {
     unsafe {
         __list_add(elem, head, (*head).next);
     }
@@ -313,7 +313,7 @@ pub fn ccx_strstr_ignorespace(str1: *const c_char, str2: *const c_char) -> i32 {
     }
 }
 
-fn list_empty(head: &ListHead) -> bool {
+pub fn list_empty(head: &ListHead) -> bool {
     head.next as *mut _ == head as *const _ as *mut _
 }
 

src/rust/lib_ccxr/src/isdbs/tests.rs

@@ -5,6 +5,8 @@ use std::os::raw::{c_char, c_int, c_long, c_uchar, c_uint, c_ulonglong, c_void};
 use crate::isdbs::isdbd::*;
 use crate::isdbs::isdbs::*;
 
+use std::ffi::CStr;
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -123,12 +125,7 @@ mod tests {
                     font_size: 0,
                     font_scale: FScale { fscx: 0, fscy: 0 },
                     cell_spacing: 0,
-                    cursor_pos: DispArea {
-                        x: 0,
-                        y: 0,
-                        w: 0,
-                        h: 0,
-                    },
+                    cursor_pos: ISDBPos { x: 0, y: 0 },
                     ccc: 0,
                     acps: 0,
                 },
@@ -162,12 +159,7 @@ mod tests {
             font_scale: FScale { fscx: 0, fscy: 0 },
             format: WritingFormat::None,
             cell_spacing: 0,
-            cursor_pos: DispArea {
-                x: 0,
-                y: 0,
-                w: 0,
-                h: 0,
-            },
+            cursor_pos: ISDBPos { x: 0, y: 0 },
             ccc: 0,
             acps: 0,
         };
@@ -220,12 +212,7 @@ mod tests {
             },
             format: WritingFormat::None,
             cell_spacing: 0,
-            cursor_pos: DispArea {
-                x: 0,
-                y: 0,
-                w: 0,
-                h: 0,
-            },
+            cursor_pos: ISDBPos { x: 0, y: 0 },
             ccc: 0,
             acps: 0,
         };
@@ -290,9 +277,6 @@ mod tests {
         }
     }
 
-    use super::*;
-    use std::ptr;
-
     #[test]
     fn test___list_del() {
         let mut head = ListHead {
@@ -411,9 +395,6 @@ mod tests {
         }
     }
 
-    use super::*;
-    use std::ptr;
-
     #[test]
     fn test_list_for_each_entry_safe() {
         let mut head = ListHead {
@@ -685,12 +666,7 @@ mod tests {
             },
             format: WritingFormat::None,
             cell_spacing: 0,
-            cursor_pos: DispArea {
-                x: 0,
-                y: 0,
-                w: 0,
-                h: 0,
-            },
+            cursor_pos: ISDBPos { x: 0, y: 0 },
             ccc: 0,
             acps: 0,
         };
@@ -719,7 +695,7 @@ mod tests {
             buf: unsafe { alloc(Layout::from_size_align(128, 1).unwrap()) } as *mut i8,
             used: 0,
             len: 128,
-            pos: Position { x: 0, y: 0 },
+            pos: ISDBPos { x: 0, y: 0 },
             txt_tail: ptr::null_mut(),
             timestamp: 0,
             refcount: 0,
@@ -737,9 +713,6 @@ mod tests {
         }
     }
 
-    use super::*;
-    use std::ptr;
-
     #[test]
     fn test_list_add() {
         let mut head = ListHead {
@@ -893,7 +866,7 @@ mod tests {
     }
 
     #[test]
-    fn test_ccx_strstr_ignorespace() {
+    fn test_ccx_strstr_ignorespace_1() {
         let str1 = CString::new("hello world").unwrap();
         let str2 = CString::new("hello  world").unwrap();
         let result = ccx_strstr_ignorespace(str1.as_ptr(), str2.as_ptr());
@@ -980,7 +953,7 @@ mod tests {
     }
 
     #[test]
-    fn test_ccx_strstr_ignorespace() {
+    fn test_ccx_strstr_ignorespace_2() {
         let str1 = CString::new("hello world").unwrap();
         let str2 = CString::new("hello  world").unwrap();
         let result = ccx_strstr_ignorespace(str1.as_ptr(), str2.as_ptr());