Skip to content

Fixed unit_name for Initialize #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rex-schilasky merged 1 commit into from
Aug 21, 2025
Merged

Fixed unit_name for Initialize #79

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions rustecal-core/src/core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,11 @@ impl Ecal {
config: Option<&Configuration>,
) -> Result<(), RustecalError> {
// Convert the unit name (if any), mapping CString errors
let (name_ptr, _): (*const i8, Option<CString>) = if let Some(name) = unit_name {
let c = CString::new(name)
.map_err(|e| RustecalError::Internal(format!("invalid unit name: {e}")))?;
(c.as_ptr(), Some(c))
let name: CString = if let Some(name) = unit_name {
CString::new(name)
.map_err(|e| RustecalError::Internal(format!("invalid unit name: {e}")))?
} else {
(ptr::null(), None)
CString::new("").unwrap()
};

// Determine pointer to eCAL_Configuration (or null)
Expand All @@ -57,7 +56,8 @@ impl Ecal {
.unwrap_or(ptr::null_mut());

// Call the C API and map its return code
let ret = unsafe { rustecal_sys::eCAL_Initialize(name_ptr, &components.bits(), cfg_ptr) };
let ret =
unsafe { rustecal_sys::eCAL_Initialize(name.as_ptr(), &components.bits(), cfg_ptr) };
check(ret)
}

Expand Down
Loading