T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reuse errno_from_ioerror to simplify error handling

Browse Source
This commit is contained in:
Marcin Mielniczuk
2019-08-08 17:30:19 +02:00
committed by Jakub Konka
parent e18175c556
commit 92c2b563fc
8 changed files with 31 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sys/unix/hostcalls_impl/fs.rs
View File

@@ -3,8 +3,8 @@
use super::fs_helpers::*;
use crate::helpers::systemtime_to_timestamp;
use crate::hostcalls_impl::PathGet;
use crate::sys::errno_from_ioerror;
use crate::sys::host_impl;
use crate::sys::{errno_from_host, errno_from_ioerror};
use crate::{host, wasm32, Result};
use nix::libc::{self, c_long, c_void, off_t};
use std::convert::TryInto;
@@ -18,13 +18,11 @@ pub(crate) fn fd_pread(
buf: &mut [u8],
offset: host::__wasi_filesize_t,
) -> Result<usize> {
file.read_at(buf, offset)
.map_err(|e| e.raw_os_error().map_or(host::__WASI_EIO, errno_from_host))
file.read_at(buf, offset).map_err(errno_from_ioerror)
}
pub(crate) fn fd_pwrite(file: &File, buf: &[u8], offset: host::__wasi_filesize_t) -> Result<usize> {
file.write_at(buf, offset)
.map_err(|e| e.raw_os_error().map_or(host::__WASI_EIO, errno_from_host))
file.write_at(buf, offset).map_err(errno_from_ioerror)
}
pub(crate) fn fd_fdstat_get(fd: &File) -> Result<host::__wasi_fdflags_t> {