diff --git a/rust/agama-lib/src/storage/client/iscsi.rs b/rust/agama-lib/src/storage/client/iscsi.rs index eddeed34c2..01cb4dfa4c 100644 --- a/rust/agama-lib/src/storage/client/iscsi.rs +++ b/rust/agama-lib/src/storage/client/iscsi.rs @@ -275,7 +275,7 @@ impl<'a> ISCSIClient<'a> { Ok(()) } - pub async fn get_node_proxy(&self, id: u32) -> Result { + pub async fn get_node_proxy(&'a self, id: u32) -> Result, ServiceError> { let proxy = NodeProxy::builder(&self.connection) .path(format!("/org/opensuse/Agama/Storage1/iscsi_nodes/{}", id))? .build() diff --git a/rust/agama-lib/src/storage/client/zfcp.rs b/rust/agama-lib/src/storage/client/zfcp.rs index 9d63d0a2ca..63ad9c27b6 100644 --- a/rust/agama-lib/src/storage/client/zfcp.rs +++ b/rust/agama-lib/src/storage/client/zfcp.rs @@ -50,7 +50,7 @@ pub struct ZFCPClient<'a> { introspectable_proxy: IntrospectableProxy<'a>, } -impl ZFCPClient<'_> { +impl<'a> ZFCPClient<'a> { pub async fn new(connection: Connection) -> Result { let manager_proxy = ManagerProxy::new(&connection).await?; let object_manager_proxy = ObjectManagerProxy::builder(&connection) @@ -130,9 +130,9 @@ impl ZFCPClient<'_> { } async fn get_controller_proxy( - &self, + &'a self, controller_id: &str, - ) -> Result { + ) -> Result, ServiceError> { let dbus = ControllerProxy::builder(&self.connection) .path(ZFCP_CONTROLLER_PREFIX.to_string() + "/" + controller_id)? .build() diff --git a/rust/zypp-agama/zypp-agama-sys/c-layer/callbacks.cxx b/rust/zypp-agama/zypp-agama-sys/c-layer/callbacks.cxx index f76be253ca..a9eba604bb 100644 --- a/rust/zypp-agama/zypp-agama-sys/c-layer/callbacks.cxx +++ b/rust/zypp-agama/zypp-agama-sys/c-layer/callbacks.cxx @@ -1,9 +1,12 @@ -#include +#include #include #include #include "callbacks.h" +// _1 +using namespace boost::placeholders; + struct ProgressReceive : zypp::callback::ReceiveReport { ZyppProgressCallback callback; void *user_data;