From: Filip Schauer <f.schauer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH vma-to-pbs v3 1/2] pass args by reference to create_pbs_backup_task
Date: Wed, 10 Jul 2024 16:57:31 +0200 [thread overview]
Message-ID: <20240710145732.142784-2-f.schauer@proxmox.com> (raw)
In-Reply-To: <20240710145732.142784-1-f.schauer@proxmox.com>
Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
---
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
next prev parent reply other threads:[~2024-07-10 14:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-10 14:57 [pbs-devel] [PATCH vma-to-pbs v3 0/2] add support for notes and logs Filip Schauer
2024-07-10 14:57 ` Filip Schauer [this message]
2024-07-10 14:57 ` [pbs-devel] [PATCH vma-to-pbs v3 2/2] " Filip Schauer
2024-07-11 8:50 ` [pbs-devel] applied-series: [PATCH vma-to-pbs v3 0/2] " Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240710145732.142784-2-f.schauer@proxmox.com \
--to=f.schauer@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal