Removes Errno

Author: ultimaweapon

src/errno/mod.rs

@@ -1,4 +1,3 @@
-use crate::errno::Errno;
 use crate::pcpu::Pcpu;
 use crate::thread::Thread;
 use crate::uio::{IoVec, Uio, UioRw, UioSeg};
@@ -20,11 +19,11 @@ pub unsafe fn openat<K: Kernel>(
     seg: UioSeg,
     flags: OpenFlags,
     mode: c_int,
-) -> Result<OwnedFd<K>, Errno> {
+) -> Result<OwnedFd<K>, NonZero<c_int>> {
     let td = K::Pcpu::curthread();
     let errno = kern.kern_openat(td, fd, path, seg, flags, mode);
 
-    match Errno::new(errno) {
+    match NonZero::new(errno) {
         Some(v) => Err(v),
         None => Ok(OwnedFd {
             kern,

src/fd/mod.rs

@@ -1,7 +1,7 @@
-use crate::errno::Errno;
 use crate::pcpu::Pcpu;
 use crate::Kernel;
 use core::ffi::c_int;
+use core::num::NonZero;
 use core::ptr::null_mut;
 use core::sync::atomic::{fence, AtomicU32, Ordering};
 
@@ -25,12 +25,12 @@ impl<K: Kernel> OwnedFile<K> {
         Self { kern, file }
     }
 
-    pub fn from_fd(kern: K, fd: c_int) -> Result<Self, Errno> {
+    pub fn from_fd(kern: K, fd: c_int) -> Result<Self, NonZero<c_int>> {
         let td = K::Pcpu::curthread();
         let mut fp = null_mut();
         let errno = unsafe { kern.fget(td, fd, &mut fp, 0, null_mut()) };
 
-        match Errno::new(errno) {
+        match NonZero::new(errno) {
             Some(v) => Err(v),
             None => Ok(Self { kern, file: fp }),
         }

src/file/mod.rs

@@ -20,7 +20,6 @@ use core::ops::Deref;
 use core::ptr::{null_mut, read_unaligned, write_unaligned};
 pub use okf_macros::*;
 
-pub mod errno;
 pub mod fd;
 pub mod file;
 pub mod lock;

src/lib.rs

@@ -1,8 +1,8 @@
 pub use self::inet::*;
-use crate::errno::Errno;
 use crate::thread::Thread;
 use crate::Kernel;
 use core::ffi::{c_int, c_short, c_ushort};
+use core::num::NonZero;
 use core::ptr::null_mut;
 
 mod inet;
@@ -20,10 +20,10 @@ pub unsafe fn bind<K: Kernel>(
     so: *mut K::Socket,
     nam: &mut SockAddr,
     td: *mut K::Thread,
-) -> Result<(), Errno> {
+) -> Result<(), NonZero<c_int>> {
     let errno = kern.sobind(so, nam, td);
 
-    match Errno::new(errno) {
+    match NonZero::new(errno) {
         Some(v) => Err(v),
         None => Ok(()),
     }
@@ -37,10 +37,10 @@ pub unsafe fn listen<K: Kernel>(
     so: *mut K::Socket,
     backlog: c_int,
     td: *mut K::Thread,
-) -> Result<(), Errno> {
+) -> Result<(), NonZero<c_int>> {
     let errno = kern.solisten(so, backlog, td);
 
-    match Errno::new(errno) {
+    match NonZero::new(errno) {
         Some(v) => Err(v),
         None => Ok(()),
     }
@@ -73,12 +73,12 @@ impl<K: Kernel> OwnedSocket<K> {
         ty: c_int,
         proto: c_int,
         td: *mut K::Thread,
-    ) -> Result<Self, Errno> {
+    ) -> Result<Self, NonZero<c_int>> {
         let mut sock = null_mut();
         let cred = (*td).cred();
         let errno = kern.socreate(dom, &mut sock, ty, proto, cred, td);
 
-        match Errno::new(errno) {
+        match NonZero::new(errno) {
             Some(v) => Err(v),
             None => Ok(Self { kern, sock }),
         }