From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id AFF5B1FF2C6 for ; Wed, 10 Jul 2024 16:57:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 454E9DFE0; Wed, 10 Jul 2024 16:58:11 +0200 (CEST) From: Filip Schauer To: pbs-devel@lists.proxmox.com Date: Wed, 10 Jul 2024 16:57:31 +0200 Message-Id: <20240710145732.142784-2-f.schauer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240710145732.142784-1-f.schauer@proxmox.com> References: <20240710145732.142784-1-f.schauer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.060 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH vma-to-pbs v3 1/2] pass args by reference to create_pbs_backup_task X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Signed-off-by: Filip Schauer --- src/vma2pbs.rs | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/src/vma2pbs.rs b/src/vma2pbs.rs index 199cf50..35abdcd 100644 --- a/src/vma2pbs.rs +++ b/src/vma2pbs.rs @@ -52,7 +52,7 @@ fn handle_pbs_error(pbs_err: *mut c_char, function_name: &str) -> Result<(), Err bail!("{function_name} failed: {pbs_err_str}"); } -fn create_pbs_backup_task(args: BackupVmaToPbsArgs) -> Result<*mut ProxmoxBackupHandle, Error> { +fn create_pbs_backup_task(args: &BackupVmaToPbsArgs) -> Result<*mut ProxmoxBackupHandle, Error> { println!("PBS repository: {}", args.pbs_repository); if let Some(ns) = &args.namespace { println!("PBS namespace: {}", ns); @@ -65,22 +65,31 @@ fn create_pbs_backup_task(args: BackupVmaToPbsArgs) -> Result<*mut ProxmoxBackup let mut pbs_err: *mut c_char = ptr::null_mut(); - let pbs_repository_cstr = CString::new(args.pbs_repository)?; - let ns_cstr = CString::new(args.namespace.unwrap_or("".to_string()))?; - let backup_id_cstr = CString::new(args.backup_id)?; - let pbs_password_cstr = CString::new(args.pbs_password)?; - let fingerprint_cstr = CString::new(args.fingerprint)?; - let keyfile_cstr = args.keyfile.map(|v| CString::new(v).unwrap()); + let pbs_repository_cstr = CString::new(args.pbs_repository.as_str())?; + let ns_cstr = CString::new(args.namespace.as_deref().unwrap_or(""))?; + let backup_id_cstr = CString::new(args.backup_id.as_str())?; + let pbs_password_cstr = CString::new(args.pbs_password.as_str())?; + let fingerprint_cstr = CString::new(args.fingerprint.as_str())?; + let keyfile_cstr = args + .keyfile + .as_ref() + .map(|v| CString::new(v.as_str()).unwrap()); let keyfile_ptr = keyfile_cstr .as_ref() .map(|v| v.as_ptr()) .unwrap_or(ptr::null()); - let key_password_cstr = args.key_password.map(|v| CString::new(v).unwrap()); + let key_password_cstr = args + .key_password + .as_ref() + .map(|v| CString::new(v.as_str()).unwrap()); let key_password_ptr = key_password_cstr .as_ref() .map(|v| v.as_ptr()) .unwrap_or(ptr::null()); - let master_keyfile_cstr = args.master_keyfile.map(|v| CString::new(v).unwrap()); + let master_keyfile_cstr = args + .master_keyfile + .as_ref() + .map(|v| CString::new(v.as_str()).unwrap()); let master_keyfile_ptr = master_keyfile_cstr .as_ref() .map(|v| v.as_ptr()) @@ -353,7 +362,7 @@ pub fn backup_vma_to_pbs(args: BackupVmaToPbsArgs) -> Result<(), Error> { }; let vma_reader = VmaReader::new(vma_file)?; - let pbs = create_pbs_backup_task(args)?; + let pbs = create_pbs_backup_task(&args)?; defer! { proxmox_backup_disconnect(pbs); -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel