Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbc4b642 authored Aug 04, 2023 by Yun-hao Chung Committed by Gerrit Code Review Aug 04, 2023

Merge "Floss: Fix build warnings in SigData" into main

parents ba3eea1e 44505907

system/gd/rust/linux/client/src/dbus_iface.rs

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -731,7 +731,7 @@ impl IBluetooth for BluetoothDBus {
	dbus_generated!()		dbus_generated!()
	}		}

	fn init(&mut self, init_flags: Vec<String>) -> bool {		fn init(&mut self, _init_flags: Vec<String>) -> bool {
	// Not implemented by server		// Not implemented by server
	true		true
	}		}

system/gd/rust/linux/service/src/iface_bluetooth.rs

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -441,7 +441,7 @@ impl IBluetooth for IBluetoothDBus {
	}		}

	// Not exposed over D-Bus. The stack is automatically initialized when the daemon starts.		// Not exposed over D-Bus. The stack is automatically initialized when the daemon starts.
	fn init(&mut self, init_flags: Vec<String>) -> bool {		fn init(&mut self, _init_flags: Vec<String>) -> bool {
	dbus_generated!()		dbus_generated!()
	}		}

system/gd/rust/linux/service/src/main.rs

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -431,7 +431,7 @@ fn main() -> Result<(), Box<dyn Error>> {

	lazy_static! {		lazy_static! {
	/// Data needed for signal handling.		/// Data needed for signal handling.
	static ref SIG_DATA: Mutex<Option<(Sender<Message>, Arc<(SigData)>)>> = Mutex::new(None);		static ref SIG_DATA: Mutex<Option<(Sender<Message>, Arc<SigData>)>> = Mutex::new(None);
	}		}

	extern "C" fn handle_sigterm(_signum: i32) {		extern "C" fn handle_sigterm(_signum: i32) {

system/gd/rust/linux/stack/src/bluetooth.rs

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -509,7 +509,7 @@ pub struct Bluetooth {
	discoverable_timeout: Option<JoinHandle<()>>,		discoverable_timeout: Option<JoinHandle<()>>,

	/// Used to notify signal handler that we have turned off the stack.		/// Used to notify signal handler that we have turned off the stack.
	sig_notifier: Arc<(SigData)>,		sig_notifier: Arc<SigData>,
	}		}

	impl Bluetooth {		impl Bluetooth {
	@@ -518,7 +518,7 @@ impl Bluetooth {
	adapter_index: i32,		adapter_index: i32,
	hci_index: i32,		hci_index: i32,
	tx: Sender<Message>,		tx: Sender<Message>,
	sig_notifier: Arc<(SigData)>,		sig_notifier: Arc<SigData>,
	intf: Arc<Mutex<BluetoothInterface>>,		intf: Arc<Mutex<BluetoothInterface>>,
	bluetooth_admin: Arc<Mutex<Box<BluetoothAdmin>>>,		bluetooth_admin: Arc<Mutex<Box<BluetoothAdmin>>>,
	bluetooth_gatt: Arc<Mutex<Box<BluetoothGatt>>>,		bluetooth_gatt: Arc<Mutex<Box<BluetoothGatt>>>,