Remove the "-1 errno" e() function.

src/platform/linux/mod.rs

@@ -64,15 +64,6 @@ pub fn e_raw(sys: usize) -> Result<usize> {
         Ok(sys)
     }
 }
-pub fn e(sys: usize) -> usize {
-    match e_raw(sys) {
-        Ok(value) => value,
-        Err(Errno(errcode)) => {
-            ERRNO.set(errcode as c_int);
-            !0
-        }
-    }
-}
 
 pub struct Sys;
 

src/platform/linux/signal.rs

@@ -3,7 +3,7 @@ use core::{mem, ptr::addr_of};
 
 use super::{
     super::{types::*, PalSignal},
-    e, e_raw, Sys,
+    e_raw, Sys,
 };
 use crate::{
     error::{Errno, Result},

src/platform/mod.rs

@@ -13,7 +13,7 @@ pub use self::pal::{Pal, PalEpoll, PalPtrace, PalSignal, PalSocket};
 
 mod pal;
 
-pub use self::sys::{e, Sys};
+pub use self::sys::Sys;
 
 #[cfg(all(not(feature = "no_std"), target_os = "linux"))]
 #[path = "linux/mod.rs"]

src/platform/redox/extra.rs

@@ -1,16 +1,22 @@
 use core::{ptr, slice};
 
-use crate::platform::{sys::e, types::*};
+use crate::{
+    error::{Errno, ResultExt},
+    platform::types::*,
+};
 use syscall::{error::*, F_SETFD, F_SETFL};
 
 pub use redox_rt::proc::FdGuard;
 
 #[no_mangle]
 pub unsafe extern "C" fn redox_fpath(fd: c_int, buf: *mut c_void, count: size_t) -> ssize_t {
-    e(syscall::fpath(
+    syscall::fpath(
         fd as usize,
         slice::from_raw_parts_mut(buf as *mut u8, count),
-    )) as ssize_t
+    )
+    .map_err(Errno::from)
+    .map(|l| l as ssize_t)
+    .or_minus_one_errno()
 }
 
 pub fn pipe2(fds: &mut [c_int], flags: usize) -> syscall::error::Result<()> {

src/platform/redox/mod.rs

@@ -74,17 +74,6 @@ macro_rules! path_from_c_str {
 
 use self::{exec::Executable, path::canonicalize};
 
-// TODO: Remove
-pub fn e(sys: syscall::error::Result<usize>) -> usize {
-    match sys {
-        Ok(ok) => ok,
-        Err(err) => {
-            ERRNO.set(err.errno as c_int);
-            !0
-        }
-    }
-}
-
 pub struct Sys;
 
 impl Pal for Sys {

src/platform/redox/signal.rs

@@ -1,6 +1,6 @@
 use super::{
     super::{types::*, Pal, PalSignal},
-    e, Sys,
+    Sys,
 };
 use crate::{
     error::{Errno, Result},

src/platform/redox/socket.rs

@@ -5,7 +5,7 @@ use syscall::{self, flag::*};
 
 use super::{
     super::{types::*, Pal, PalSocket, ERRNO},
-    e, Sys,
+    Sys,
 };
 use crate::{
     error::{Errno, Result, ResultExt},