android/SukiSU-Ultra
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

chore(ksud): enable clippy::all, clippy::pedantic && make clippy happy (#617)

Browse Source 
* Revert "chore(ksud): bump ksud's deps (#585)"
* Because it may cause compilation errors.

This reverts commit c8020b2066.

* chore(ksud): remove unused Result

Signed-off-by: Tools-app <localhost.hutao@gmail.com>

* chore(ksud): enable clippy::all, clippy::pedantic && make clippy happy

https://rust-lang.github.io/rust-clippy/master/index.html#map_unwrap_or

https://rust-lang.github.io/rust-clippy/master/index.html#uninlined_format_args

https://rust-lang.github.io/rust-clippy/master/index.html#used_underscore_items

https://rust-lang.github.io/rust-clippy/master/index.html#redundant_closure_for_method_calls

https://rust-lang.github.io/rust-clippy/master/index.html#redundant_pub_crate
...
and use some #![allow(...)] or #[allow(...)]

Signed-off-by: Tools-app <localhost.hutao@gmail.com>

---------

Signed-off-by: Tools-app <localhost.hutao@gmail.com>
This commit is contained in:
生于生时 亡于亡刻
2025-11-22 06:09:45 +08:00
committed by ShirkNeko
parent 6898d82daf
commit 27f6db889a
20 changed files with 829 additions and 784 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
userspace/ksud/src/kpm.rs
View File

@@ -20,6 +20,7 @@ const KPM_INFO: u64 = 5;
const KPM_CONTROL: u64 = 6;
const KPM_VERSION: u64 = 7;
#[allow(clippy::unreadable_literal)]
const KSU_IOCTL_KPM: u32 = 0xc0004bc8; // _IOC(_IOC_READ|_IOC_WRITE, 'K', 200, 0)
#[repr(C)]
@@ -32,7 +33,7 @@ struct KsuKpmCmd {
}
fn kpm_ioctl(cmd: &mut KsuKpmCmd) -> std::io::Result<()> {
ksuctl(KSU_IOCTL_KPM, cmd as *mut _)?;
ksuctl(KSU_IOCTL_KPM, std::ptr::from_mut(cmd))?;
Ok(())
}
@@ -57,7 +58,7 @@ where
control_code: KPM_LOAD,
arg1: path_c.as_ptr() as u64,
arg2: args_c.as_ref().map_or(0, |s| s.as_ptr() as u64),
result_code: &mut result as *mut i32 as u64,
result_code: &raw mut result as u64,
};
kpm_ioctl(&mut cmd)?;
@@ -75,7 +76,7 @@ pub fn kpm_unload(name: &str) -> Result<()> {
control_code: KPM_UNLOAD,
arg1: name_c.as_ptr() as u64,
arg2: 0,
result_code: &mut result as *mut i32 as u64,
result_code: &raw mut result as u64,
};
kpm_ioctl(&mut cmd)?;
@@ -90,7 +91,7 @@ pub fn kpm_num() -> Result<i32> {
control_code: KPM_NUM,
arg1: 0,
arg2: 0,
result_code: &mut result as *mut i32 as u64,
result_code: &raw mut result as u64,
};
kpm_ioctl(&mut cmd)?;
@@ -108,7 +109,7 @@ pub fn kpm_list() -> Result<()> {
control_code: KPM_LIST,
arg1: buf.as_mut_ptr() as u64,
arg2: buf.len() as u64,
result_code: &mut result as *mut i32 as u64,
result_code: &raw mut result as u64,
};
kpm_ioctl(&mut cmd)?;
@@ -127,7 +128,7 @@ pub fn kpm_info(name: &str) -> Result<()> {
control_code: KPM_INFO,
arg1: name_c.as_ptr() as u64,
arg2: buf.as_mut_ptr() as u64,
result_code: &mut result as *mut i32 as u64,
result_code: &raw mut result as u64,
};
kpm_ioctl(&mut cmd)?;
@@ -146,7 +147,7 @@ pub fn kpm_control(name: &str, args: &str) -> Result<i32> {
control_code: KPM_CONTROL,
arg1: name_c.as_ptr() as u64,
arg2: args_c.as_ptr() as u64,
result_code: &mut result as *mut i32 as u64,
result_code: &raw mut result as u64,
};
kpm_ioctl(&mut cmd)?;
@@ -162,7 +163,7 @@ pub fn kpm_version_loader() -> Result<()> {
control_code: KPM_VERSION,
arg1: buf.as_mut_ptr() as u64,
arg2: buf.len() as u64,
result_code: &mut result as *mut i32 as u64,
result_code: &raw mut result as u64,
};
kpm_ioctl(&mut cmd)?;
@@ -180,7 +181,7 @@ pub fn check_kpm_version() -> Result<String> {
control_code: KPM_VERSION,
arg1: buf.as_mut_ptr() as u64,
arg2: buf.len() as u64,
result_code: &mut result as *mut i32 as u64,
result_code: &raw mut result as u64,
};
kpm_ioctl(&mut cmd)?;
@@ -308,7 +309,7 @@ pub fn load_kpm_modules() -> Result<()> {
&& ex == OsStr::new("kpm")
{
match kpm_load(&p, None) {
Ok(_) => ok += 1,
Ok(()) => ok += 1,
Err(e) => {
log::warn!("KPM: load {} failed: {e}", p.display());
ng += 1;