Skip to content

Commit

Permalink
fix: Windows FFI mistakenly using BufReader (#98)
Browse files Browse the repository at this point in the history
Another commit fixing a Windows-specific issue. This
time that the BufReader import was removed, and Unix
uses of it in the FFI code were removed, but not for
Windows code, causing compilation failure on Windows.

This commit fixes the issue.

Signed-off-by: Andrew Lilley Brinker <[email protected]>
  • Loading branch information
alilleybrinker authored Feb 14, 2024
1 parent c430359 commit adfad59
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions gitoid/src/ffi/gitoid.rs
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,7 @@ macro_rules! generate_gitoid_ffi_for_hash {
) -> *const [<GitOid $hash_ty $object_ty>] {
let output = catch_panic(|| {
let file = unsafe { File::from_raw_handle(handle) };
let reader = BufReader::new(file);
let gitoid = GitOid::<$hash_ty, $object_ty>::from_reader(reader)?;
let gitoid = GitOid::<$hash_ty, $object_ty>::from_reader(file)?;
let boxed = Box::new(gitoid);
Ok(Box::into_raw(boxed) as *const _)
});
Expand All @@ -266,8 +265,7 @@ macro_rules! generate_gitoid_ffi_for_hash {
let output = catch_panic(|| {
let file = unsafe { File::from_raw_handle(handle) };
let expected_length = expected_length as usize;
let reader = BufReader::new(file);
let gitoid = GitOid::<$hash_ty, $object_ty>::from_reader_with_expected_length(reader, expected_length)?;
let gitoid = GitOid::<$hash_ty, $object_ty>::from_reader_with_expected_length(file, expected_length)?;
let boxed = Box::new(gitoid);
Ok(Box::into_raw(boxed) as *const _)
});
Expand Down

0 comments on commit adfad59

Please sign in to comment.