From 1b771be27789a06f9451de160128b8701a71b6c8 Mon Sep 17 00:00:00 2001 From: rsuntk Date: Tue, 10 Dec 2024 15:13:35 +0700 Subject: [PATCH] ksud: Remove more Dead code, so the compiler doesn't complain Signed-off-by: rsuntk --- userspace/ksud/src/assets.rs | 20 +------------------- userspace/ksud/src/cli.rs | 2 +- userspace/ksud/src/module.rs | 4 ---- 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/userspace/ksud/src/assets.rs b/userspace/ksud/src/assets.rs index e8255c8204a7..126c9fd4eb6e 100644 --- a/userspace/ksud/src/assets.rs +++ b/userspace/ksud/src/assets.rs @@ -7,7 +7,6 @@ use crate::{defs::BINARY_DIR, utils}; pub const RESETPROP_PATH: &str = concatcp!(BINARY_DIR, "resetprop"); pub const BUSYBOX_PATH: &str = concatcp!(BINARY_DIR, "busybox"); -pub const BOOTCTL_PATH: &str = concatcp!(BINARY_DIR, "bootctl"); #[cfg(all(target_arch = "x86_64", target_os = "android"))] #[derive(RustEmbed)] @@ -30,21 +29,4 @@ pub fn ensure_binaries(ignore_if_exist: bool) -> Result<()> { utils::ensure_binary(format!("{BINARY_DIR}{file}"), &asset.data, ignore_if_exist)? } Ok(()) -} - -pub fn copy_assets_to_file(name: &str, dst: impl AsRef) -> Result<()> { - let asset = Asset::get(name).ok_or(anyhow::anyhow!("asset not found: {}", name))?; - std::fs::write(dst, asset.data)?; - Ok(()) -} - -pub fn list_supported_kmi() -> Result> { - let mut list = Vec::new(); - for file in Asset::iter() { - // kmi_name = "xxx_kernelsu.ko" - if let Some(kmi) = file.strip_suffix("_kernelsu.ko") { - list.push(kmi.to_string()); - } - } - Ok(list) -} +} \ No newline at end of file diff --git a/userspace/ksud/src/cli.rs b/userspace/ksud/src/cli.rs index 647d001834d9..cbb8eaf0915d 100644 --- a/userspace/ksud/src/cli.rs +++ b/userspace/ksud/src/cli.rs @@ -1,6 +1,6 @@ use anyhow::{Ok, Result}; use clap::Parser; -use std::path::{Path, PathBuf}; +use std::path::Path; #[cfg(target_os = "android")] use android_logger::Config; diff --git a/userspace/ksud/src/module.rs b/userspace/ksud/src/module.rs index 4971c2f025eb..affb6522a89d 100644 --- a/userspace/ksud/src/module.rs +++ b/userspace/ksud/src/module.rs @@ -409,10 +409,6 @@ pub fn disable_all_modules() -> Result<()> { mark_all_modules(defs::DISABLE_FILE_NAME) } -pub fn uninstall_all_modules() -> Result<()> { - mark_all_modules(defs::REMOVE_FILE_NAME) -} - fn mark_all_modules(flag_file: &str) -> Result<()> { let dir = std::fs::read_dir(MODULE_DIR)?; for entry in dir.flatten() {