Skip to content

fix: Make the code compile on more architectures #1

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Make the code compile on more architectures #1

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
6 changes: 4 additions & 2 deletions src/core/script/script_struct.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ use std::mem::MaybeUninit;
use std::os::fd::{FromRawFd, IntoRawFd};
use std::path::Path;

use libc::c_char;

// From this library
use crate::core::errors::ScriptError;
use crate::core::partition::PartitionList;
Expand Down Expand Up @@ -138,7 +140,7 @@ impl<'fdisk> Script<'fdisk> {
/// otherwise it should emit an I/O Error.
pub fn set_custom_read_line<R>(&mut self, fn_read_line: R) -> Result<(), ScriptError>
where
R: FnMut(&mut File, &mut [i8]) -> io::Result<usize> + 'static,
R: FnMut(&mut File, &mut [c_char]) -> io::Result<usize> + 'static,
{
#[doc(hidden)]
/// Callback function used by the `libfdisk::fdisk_script_read_file` and
Expand All @@ -150,7 +152,7 @@ impl<'fdisk> Script<'fdisk> {
file_stream: *mut libfdisk::FILE,
) -> *mut libc::c_char
where
R: FnMut(&mut File, &mut [i8]) -> io::Result<usize> + 'static,
R: FnMut(&mut File, &mut [c_char]) -> io::Result<usize> + 'static,
{
// Build a temporary Rust `File` object from a C FILE struct.
let rc = unsafe { libc::fileno(file_stream as *mut _) };
Expand Down