hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: use c_char instead of i8/u8

Browse Source
This commit is contained in:
Kingtous 2023-04-10 16:54:50 +08:00
parent 1883c05b76
commit dc7692952b
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api.rs
View File

@ -1,8 +1,10 @@
use std::ffi::c_char;
use crate::plugins::PLUGIN_REGISTRAR; use crate::plugins::PLUGIN_REGISTRAR;
// API provided by RustDesk. // API provided by RustDesk.
pub type LoadPluginFunc = fn(*const i8) -> i32; pub type LoadPluginFunc = fn(*const c_char) -> i32;
pub type UnloadPluginFunc = fn(*const i8) -> i32; pub type UnloadPluginFunc = fn(*const c_char) -> i32;
#[repr(C)] #[repr(C)]
pub struct RustDeskApiTable { pub struct RustDeskApiTable {
@ -11,12 +13,12 @@ pub struct RustDeskApiTable {
} }
#[no_mangle] #[no_mangle]
fn load_plugin(path: *const i8) -> i32 { fn load_plugin(path: *const c_char) -> i32 {
PLUGIN_REGISTRAR.load_plugin(path) PLUGIN_REGISTRAR.load_plugin(path)
} }
#[no_mangle] #[no_mangle]
fn unload_plugin(path: *const i8) -> i32 { fn unload_plugin(path: *const c_char) -> i32 {
PLUGIN_REGISTRAR.unload_plugin(path) PLUGIN_REGISTRAR.unload_plugin(path)
} }

4
src/plugins.rs
View File

@ -75,7 +75,7 @@ pub struct PluginRegistar<P: Plugin> {
} }
impl<P: Plugin> PluginRegistar<P> { impl<P: Plugin> PluginRegistar<P> {
pub fn load_plugin(&self, path: *const i8) -> i32 { pub fn load_plugin(&self, path: *const c_char) -> i32 {
let p = unsafe { CStr::from_ptr(path) }; let p = unsafe { CStr::from_ptr(path) };
let lib_path = p.to_str().unwrap_or("").to_owned(); let lib_path = p.to_str().unwrap_or("").to_owned();
let lib = unsafe { libloading::Library::new(lib_path.as_str()) }; let lib = unsafe { libloading::Library::new(lib_path.as_str()) };
@ -100,7 +100,7 @@ impl<P: Plugin> PluginRegistar<P> {
-1 -1
} }
pub fn unload_plugin(&self, path: *const i8) -> i32 { pub fn unload_plugin(&self, path: *const c_char) -> i32 {
let p = unsafe { CStr::from_ptr(path) }; let p = unsafe { CStr::from_ptr(path) };
let lib_path = p.to_str().unwrap_or("").to_owned(); let lib_path = p.to_str().unwrap_or("").to_owned();
match PLUGIN_REGISTRAR.plugins.write().unwrap().remove(&lib_path) { match PLUGIN_REGISTRAR.plugins.write().unwrap().remove(&lib_path) {