Skip to content

Commit b3dc608

Browse files
committed
Revert mmap changes
1 parent 21f6825 commit b3dc608

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/sys/mman.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -425,12 +425,14 @@ pub unsafe fn mmap<F: AsFd>(
425425
length: NonZeroUsize,
426426
prot: ProtFlags,
427427
flags: MapFlags,
428-
f: F,
428+
f: Option<F>,
429429
offset: off_t,
430430
) -> Result<*mut c_void> {
431-
let ptr = addr.map_or(std::ptr::null_mut(), |a| a.get() as *mut c_void);
431+
let ptr =
432+
addr.map_or(std::ptr::null_mut(), |a| usize::from(a) as *mut c_void);
433+
432434

433-
let fd = f.as_fd().as_raw_fd();
435+
let fd = f.map(|f| f.as_fd().as_raw_fd()).unwrap_or(-1);
434436
let ret =
435437
libc::mmap(ptr, length.into(), prot.bits(), flags.bits(), fd, offset);
436438

0 commit comments

Comments
 (0)