proxmox-mirrors/vma-to-pbs
1
0
Fork 0
mirror of https://git.proxmox.com/git/vma-to-pbs synced 2025-04-28 16:28:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pass args by reference to create_pbs_backup_task

Browse Source 
Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
This commit is contained in:
Filip Schauer 2024-07-10 16:57:31 +02:00 committed by Fabian Grünbichler
parent 0d24b49bf4
commit 2dd0dc023d
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/vma2pbs.rs
View File

@ -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}"); 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); println!("PBS repository: {}", args.pbs_repository);
if let Some(ns) = &args.namespace { if let Some(ns) = &args.namespace {
println!("PBS namespace: {}", ns); 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 mut pbs_err: *mut c_char = ptr::null_mut();
let pbs_repository_cstr = CString::new(args.pbs_repository)?; let pbs_repository_cstr = CString::new(args.pbs_repository.as_str())?;
let ns_cstr = CString::new(args.namespace.unwrap_or("".to_string()))?; let ns_cstr = CString::new(args.namespace.as_deref().unwrap_or(""))?;
let backup_id_cstr = CString::new(args.backup_id)?; let backup_id_cstr = CString::new(args.backup_id.as_str())?;
let pbs_password_cstr = CString::new(args.pbs_password)?; let pbs_password_cstr = CString::new(args.pbs_password.as_str())?;
let fingerprint_cstr = CString::new(args.fingerprint)?; let fingerprint_cstr = CString::new(args.fingerprint.as_str())?;
let keyfile_cstr = args.keyfile.map(|v| CString::new(v).unwrap()); let keyfile_cstr = args
.keyfile
.as_ref()
.map(|v| CString::new(v.as_str()).unwrap());
let keyfile_ptr = keyfile_cstr let keyfile_ptr = keyfile_cstr
.as_ref() .as_ref()
.map(|v| v.as_ptr()) .map(|v| v.as_ptr())
.unwrap_or(ptr::null()); .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 let key_password_ptr = key_password_cstr
.as_ref() .as_ref()
.map(|v| v.as_ptr()) .map(|v| v.as_ptr())
.unwrap_or(ptr::null()); .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 let master_keyfile_ptr = master_keyfile_cstr
.as_ref() .as_ref()
.map(|v| v.as_ptr()) .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 vma_reader = VmaReader::new(vma_file)?;
let pbs = create_pbs_backup_task(args)?; let pbs = create_pbs_backup_task(&args)?;
defer! { defer! {
proxmox_backup_disconnect(pbs); proxmox_backup_disconnect(pbs);