From 4c0f33e3b3789d5ed917688b00b4ee8324b1b4f8 Mon Sep 17 00:00:00 2001
From: 4lDO2 <4lDO2@protonmail.com>
Date: Wed, 11 Sep 2024 21:23:14 +0200
Subject: [PATCH] Remove seek.rs
---
src/lib.rs | 2 --
src/seek.rs | 43 -------------------------------------------
2 files changed, 45 deletions(-)
delete mode 100644 src/seek.rs
diff --git a/src/lib.rs b/src/lib.rs
index a80d583..4d0fc05 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -18,7 +18,6 @@ pub use self::scheme::Scheme;
pub use self::scheme_block::SchemeBlock;
pub use self::scheme_block_mut::SchemeBlockMut;
pub use self::scheme_mut::SchemeMut;
-pub use self::seek::*;
unsafe fn str_from_raw_parts(ptr: *const u8, len: usize) -> Option<&'static str> {
let slice = slice::from_raw_parts(ptr, len);
@@ -29,7 +28,6 @@ mod scheme;
mod scheme_block;
mod scheme_block_mut;
mod scheme_mut;
-mod seek;
pub struct CallerCtx {
pub pid: usize,
diff --git a/src/seek.rs b/src/seek.rs
deleted file mode 100644
index da893d6..0000000
--- a/src/seek.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-use core::cmp;
-use core::convert::TryFrom;
-use syscall::error::*;
-use syscall::flag::*;
-
-/// Helper for seek calls
-/// In most cases it's easier to use a usize to track the offset and buffer size internally,
-/// but the seek interface uses isize. This wrapper ensures EOVERFLOW errors are returned
-/// as appropriate if the value in the usize can't fit in the isize.
-pub fn calc_seek_offset_usize(
- cur_offset: usize,
- pos: isize,
- whence: usize,
- buf_len: usize,
-) -> Result<isize> {
- let cur_offset = isize::try_from(cur_offset).or_else(|_| Err(Error::new(EOVERFLOW)))?;
- let buf_len = isize::try_from(buf_len).or_else(|_| Err(Error::new(EOVERFLOW)))?;
- calc_seek_offset_isize(cur_offset, pos, whence, buf_len)
-}
-
-/// Helper for seek calls
-/// Result is guaranteed to be positive.
-/// EOVERFLOW returned if the arguments would cause an overflow.
-/// EINVAL returned if the new offset is out of bounds.
-pub fn calc_seek_offset_isize(
- cur_offset: isize,
- pos: isize,
- whence: usize,
- buf_len: isize,
-) -> Result<isize> {
- let new_offset = match whence {
- SEEK_CUR => pos.checked_add(cur_offset),
- SEEK_END => pos.checked_add(buf_len),
- SEEK_SET => Some(pos),
- _ => None,
- };
-
- match new_offset {
- Some(new_offset) if new_offset < 0 => Err(Error::new(EINVAL)),
- Some(new_offset) => Ok(cmp::min(new_offset, buf_len)),
- None => Err(Error::new(EOVERFLOW)),
- }
-}
--
GitLab