chore: improve naming

Author: branchseer

crates/fspy/src/windows/mod.rs

@@ -52,27 +52,27 @@ impl PathAccessIterable {
 
 #[derive(Debug, Clone)]
 pub struct SpyImpl {
-    asni_dll_path_with_nul: Arc<CStr>,
+    ansi_dll_path_with_nul: Arc<CStr>,
 }
 
 impl SpyImpl {
     pub fn init_in(path: &Path) -> io::Result<Self> {
         let dll_path = INTERPOSE_CDYLIB.write_to(&path, ".dll").unwrap();
 
         let wide_dll_path = dll_path.as_os_str().encode_wide().collect::<Vec<u16>>();
-        let mut asni_dll_path =
+        let mut ansi_dll_path =
             winsafe::WideCharToMultiByte(CP::ACP, WC::NoValue, &wide_dll_path, None, None)
                 .map_err(|err| io::Error::from_raw_os_error(err.raw() as i32))?;
 
-        asni_dll_path.push(0);
+        ansi_dll_path.push(0);
 
-        let asni_dll_path_with_nul =
-            unsafe { CStr::from_bytes_with_nul_unchecked(asni_dll_path.as_slice()) };
-        Ok(Self { asni_dll_path_with_nul: asni_dll_path_with_nul.into() })
+        let ansi_dll_path_with_nul =
+            unsafe { CStr::from_bytes_with_nul_unchecked(ansi_dll_path.as_slice()) };
+        Ok(Self { ansi_dll_path_with_nul: ansi_dll_path_with_nul.into() })
     }
 
     pub(crate) async fn spawn(&self, command: Command) -> Result<TrackedChild, SpawnError> {
-        let asni_dll_path_with_nul = Arc::clone(&self.asni_dll_path_with_nul);
+        let ansi_dll_path_with_nul = Arc::clone(&self.ansi_dll_path_with_nul);
         let mut command = command.into_tokio_command();
 
         command.creation_flags(CREATE_SUSPENDED);
@@ -87,7 +87,7 @@ impl SpyImpl {
                 let std_child = std_command.spawn()?;
                 *spawn_success = true;
 
-                let mut dll_paths = asni_dll_path_with_nul.as_ptr().cast::<c_char>();
+                let mut dll_paths = ansi_dll_path_with_nul.as_ptr().cast::<c_char>();
                 let process_handle = std_child.as_raw_handle().cast::<winapi::ctypes::c_void>();
                 let success =
                     unsafe { DetourUpdateProcessWithDll(process_handle, &mut dll_paths, 1) };
@@ -97,7 +97,7 @@ impl SpyImpl {
 
                 let payload = Payload {
                     channel_conf: channel_conf.clone(),
-                    asni_dll_path_with_nul: asni_dll_path_with_nul.to_bytes(),
+                    ansi_dll_path_with_nul: ansi_dll_path_with_nul.to_bytes(),
                 };
                 let payload_bytes = bincode::encode_to_vec(payload, BINCODE_CONFIG).unwrap();
                 let success = unsafe {

crates/fspy_preload_windows/src/windows/client.rs

@@ -52,8 +52,8 @@ impl<'a> Client<'a> {
         }
     }
 
-    pub fn asni_dll_path(&self) -> &'a CStr {
-        unsafe { CStr::from_bytes_with_nul_unchecked(self.payload.asni_dll_path_with_nul) }
+    pub fn ansi_dll_path(&self) -> &'a CStr {
+        unsafe { CStr::from_bytes_with_nul_unchecked(self.payload.ansi_dll_path_with_nul) }
     }
 }
 

crates/fspy_preload_windows/src/windows/detours/create_process.rs

@@ -148,7 +148,7 @@ static DETOUR_CREATE_PROCESS_W: Detour<
                     lp_current_directory,
                     lp_startup_info,
                     lp_process_information,
-                    client.asni_dll_path().as_ptr().cast(),
+                    client.ansi_dll_path().as_ptr().cast(),
                     Some(create_process_with_payload_w),
                 )
             }
@@ -261,7 +261,7 @@ static DETOUR_CREATE_PROCESS_A: Detour<
                     lp_current_directory,
                     lp_startup_info,
                     lp_process_information,
-                    client.asni_dll_path().as_ptr().cast(),
+                    client.ansi_dll_path().as_ptr().cast(),
                     Some(create_process_with_payload_a),
                 )
             }

crates/fspy_shared/src/windows/mod.rs

@@ -10,5 +10,5 @@ DEFINE_GUID!(PAYLOAD_ID, 0xfc4845f1, 0x3a8b, 0x4f05, 0xa3, 0xd3, 0xa5, 0xe9, 0xe
 #[derive(Encode, BorrowDecode, Debug, Clone)]
 pub struct Payload<'a> {
     pub channel_conf: ChannelConf,
-    pub asni_dll_path_with_nul: &'a [u8],
+    pub ansi_dll_path_with_nul: &'a [u8],
 }