简化一点代码

kekeimiku · Jun 5, 2024 · f5d43e4 · f5d43e4
1 parent ee09d02
commit f5d43e4
Show file tree

Hide file tree

Showing 3 changed files with 242 additions and 227 deletions.
diff --git a/libptrscan/src/ffi/error.rs b/libptrscan/src/ffi/error.rs
@@ -70,7 +70,7 @@ pub unsafe extern "C" fn get_last_error(code: c_int) -> *const c_char {
     } else if code == CALL_ERROR {
         // cbindgen 还没支持 c"message" 一类的c字符串...
         const {
-            let bytes = concat!("call error", "\0").as_bytes();
+            let bytes = concat!("function call error", "\0").as_bytes();
             CStr::from_bytes_with_nul_unchecked(bytes).as_ptr()
         }
     } else if code == NO_NULL {

diff --git a/libptrscan/src/ffi/ptrscan.rs b/libptrscan/src/ffi/ptrscan.rs
@@ -200,7 +200,7 @@ pub unsafe extern "C" fn ptrscan_scan_pointer_chain(
     param: FFIParam,
     pathname: *const c_char,
 ) -> c_int {
-    let FFIParam { addr, depth, srange, lrange, node, last, max, .. } = param;
+    let FFIParam { addr, depth, srange, lrange, node, last, max, cycle, .. } = param;
 
     let range = (srange.left, srange.right);
     let lrange = lrange.as_ref().copied().map(|r| (r.left, r.right));
@@ -215,7 +215,7 @@ pub unsafe extern "C" fn ptrscan_scan_pointer_chain(
     #[rustfmt::skip]
     let param = UserParam {
         param: Param { depth, addr, srange: range, lrange },
-        node, last, max,
+        node, last, max, cycle
     };
 
     try_result!(pointer_chain_scan(pointer_map, pathname, param));