Skip to content

fix(rust): Remove dead code returning pointer to stack variable #2012

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

Open
cfsmp3 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(rust): Remove dead code returning pointer to stack variable #2012

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
44 changes: 0 additions & 44 deletions src/rust/src/ctorust.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,50 +615,6 @@ impl FromCType<ccx_demux_report> for CcxDemuxReport {
}
}

/// # Safety
/// This function is unsafe because it takes a raw pointer to a C struct.
impl FromCType<*mut PMT_entry> for *mut PMTEntry {
unsafe fn from_ctype(buffer_ptr: *mut PMT_entry) -> Option<Self> {
if buffer_ptr.is_null() {
return None;
}

let buffer = unsafe { &*buffer_ptr };

let program_number = if buffer.program_number != 0 {
buffer.program_number
} else {
0
};

let elementary_pid = if buffer.elementary_PID != 0 {
buffer.elementary_PID
} else {
0
};

let stream_type = if buffer.stream_type != 0 {
StreamType::from_ctype(buffer.stream_type as u32).unwrap_or(StreamType::Unknownstream)
} else {
StreamType::Unknownstream
};

let printable_stream_type = if buffer.printable_stream_type != 0 {
buffer.printable_stream_type
} else {
0
};

let mut pmt_entry = PMTEntry {
program_number,
elementary_pid,
stream_type,
printable_stream_type,
};

Some(&mut pmt_entry as *mut PMTEntry)
}
}
impl FromCType<ccx_bufferdata_type> for BufferdataType {
unsafe fn from_ctype(c_value: ccx_bufferdata_type) -> Option<Self> {
let rust_value = match c_value {
Expand Down
Loading