Cleanup code and bindings

native/src/core/lib.rs

@@ -34,6 +34,7 @@ mod socket;
 mod su;
 mod zygisk;
 
+#[allow(clippy::needless_lifetimes)]
 #[cxx::bridge]
 pub mod ffi {
     #[repr(i32)]
@@ -71,21 +72,6 @@ pub mod ffi {
         SuManager,
     }
 
-    #[repr(i32)]
-    enum RootAccess {
-        Disabled,
-        AppsOnly,
-        AdbOnly,
-        AppsAndAdb,
-    }
-
-    #[repr(i32)]
-    enum MultiuserMode {
-        OwnerOnly,
-        OwnerManaged,
-        User,
-    }
-
     #[repr(i32)]
     enum MntNsMode {
         Global,
@@ -93,16 +79,6 @@ pub mod ffi {
         Isolate,
     }
 
-    #[derive(Default)]
-    struct DbSettings {
-        root_access: RootAccess,
-        multiuser_mode: MultiuserMode,
-        mnt_ns: MntNsMode,
-        boot_count: i32,
-        denylist: bool,
-        zygisk: bool,
-    }
-
     #[repr(i32)]
     enum SuPolicy {
         Query,
@@ -110,12 +86,6 @@ pub mod ffi {
         Allow,
     }
 
-    struct RootSettings {
-        policy: SuPolicy,
-        log: bool,
-        notify: bool,
-    }
-
     struct ModuleInfo {
         name: String,
         z32: i32,
@@ -242,14 +212,6 @@ pub mod ffi {
 
     // Default constructors
     extern "Rust" {
-        #[Self = DbSettings]
-        #[cxx_name = "New"]
-        fn default() -> DbSettings;
-
-        #[Self = RootSettings]
-        #[cxx_name = "New"]
-        fn default() -> RootSettings;
-
         #[Self = SuRequest]
         #[cxx_name = "New"]
         fn default() -> SuRequest;
@@ -268,17 +230,12 @@ pub mod ffi {
         fn su_daemon_handler(&self, client: i32, cred: &UCred);
         #[cxx_name = "get_manager"]
         unsafe fn get_manager_for_cxx(&self, user: i32, ptr: *mut CxxString, install: bool) -> i32;
-        fn set_module_list(&self, module_list: Vec<ModuleInfo>);
 
-        #[cxx_name = "get_db_settings"]
-        fn get_db_settings_for_cxx(&self, cfg: &mut DbSettings) -> bool;
         fn get_db_setting(&self, key: DbEntryKey) -> i32;
         #[cxx_name = "set_db_setting"]
         fn set_db_setting_for_cxx(&self, key: DbEntryKey, value: i32) -> bool;
         #[cxx_name = "db_exec"]
         fn db_exec_for_cxx(&self, client_fd: i32);
-        #[cxx_name = "get_root_settings"]
-        fn get_root_settings_for_cxx(&self, uid: i32, settings: &mut RootSettings) -> bool;
 
         #[Self = MagiskD]
         #[cxx_name = "Get"]
@@ -287,7 +244,7 @@ pub mod ffi {
     unsafe extern "C++" {
         #[allow(dead_code)]
         fn reboot(self: &MagiskD);
-        fn handle_modules(self: &MagiskD);
+        fn handle_modules(self: &MagiskD) -> Vec<ModuleInfo>;
     }
 }