Skip to content

Commit 118e61e

Browse files
aero_syscall: rename AeroSyscallError to SyscallError
Signed-off-by: Andy-Python-Programmer <[email protected]>
1 parent c7dfb77 commit 118e61e

File tree

20 files changed

+215
-234
lines changed

20 files changed

+215
-234
lines changed

src/aero_kernel/src/arch/x86_64/signals.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020
use aero_syscall::signal::{SigProcMask, SignalFlags};
21-
use aero_syscall::AeroSyscallError;
21+
use aero_syscall::SyscallError;
2222

2323
use crate::userland;
2424
use crate::userland::scheduler;
@@ -116,7 +116,7 @@ pub fn syscall_check_signals(syscall_result: isize, stack: &mut InterruptStack)
116116
let old_mask = signals.blocked_mask();
117117

118118
let syscall_rresult = aero_syscall::isize_as_syscall_result(syscall_result);
119-
let restart_syscall = syscall_rresult == Err(AeroSyscallError::EINTR)
119+
let restart_syscall = syscall_rresult == Err(SyscallError::EINTR)
120120
&& entry.flags().contains(SignalFlags::SA_RESTART);
121121

122122
#[cfg(feature = "syslog")]

src/aero_kernel/src/arch/x86_64/syscall.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use aero_syscall::AeroSyscallError;
1+
use aero_syscall::SyscallError;
22
use raw_cpuid::CpuId;
33

44
use crate::arch::gdt::GdtEntryType;
@@ -19,7 +19,7 @@ const ARCH_SET_FS: usize = 0x1002;
1919
const ARCH_GET_FS: usize = 0x1003;
2020
const ARCH_GET_GS: usize = 0x1004;
2121

22-
fn arch_prctl(command: usize, address: usize) -> Result<usize, AeroSyscallError> {
22+
fn arch_prctl(command: usize, address: usize) -> Result<usize, SyscallError> {
2323
match command {
2424
ARCH_SET_FS => unsafe {
2525
let _guard = IrqGuard::new();
@@ -55,7 +55,7 @@ fn arch_prctl(command: usize, address: usize) -> Result<usize, AeroSyscallError>
5555
.get_gs_base()
5656
.as_u64() as usize),
5757

58-
_ => Err(AeroSyscallError::EINVAL),
58+
_ => Err(SyscallError::EINVAL),
5959
}
6060
}
6161

src/aero_kernel/src/fs/epoll.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020
use aero_syscall::prelude::EPollEvent;
21-
use aero_syscall::AeroSyscallError;
21+
use aero_syscall::SyscallError;
2222

2323
use alloc::sync::Arc;
2424
use hashbrown::HashMap;
@@ -44,11 +44,11 @@ impl EPoll {
4444
///
4545
/// ## Errors
4646
/// * `EEXIST`: The event already exists at `fd`.
47-
pub fn add_event(&self, fd: usize, event: EPollEvent) -> Result<(), AeroSyscallError> {
47+
pub fn add_event(&self, fd: usize, event: EPollEvent) -> Result<(), SyscallError> {
4848
let mut events = self.events.lock_irq();
4949

5050
if events.get(&fd).is_some() {
51-
return Err(AeroSyscallError::EEXIST);
51+
return Err(SyscallError::EEXIST);
5252
}
5353

5454
events.insert(fd, event);

src/aero_kernel/src/fs/file_table.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,10 @@ impl FileTable {
229229
fd: usize,
230230
hint: DuplicateHint,
231231
flags: OpenFlags,
232-
) -> Result<usize, aero_syscall::AeroSyscallError> {
232+
) -> Result<usize, aero_syscall::SyscallError> {
233233
let handle = self
234234
.get_handle(fd)
235-
.ok_or(aero_syscall::AeroSyscallError::EINVAL)?;
235+
.ok_or(aero_syscall::SyscallError::EINVAL)?;
236236

237237
let find_from = |files: &mut Vec<Option<Arc<FileHandle>>>, start: usize| {
238238
let array = &mut files[start..];

src/aero_kernel/src/fs/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
use core::mem;
2121

22-
use aero_syscall::AeroSyscallError;
22+
use aero_syscall::SyscallError;
2323
use alloc::collections::BTreeMap;
2424
use alloc::string::String;
2525
use alloc::sync::Arc;
@@ -136,7 +136,7 @@ pub enum FileSystemError {
136136
ConnectionRefused,
137137
}
138138

139-
impl From<FileSystemError> for AeroSyscallError {
139+
impl From<FileSystemError> for SyscallError {
140140
fn from(error: FileSystemError) -> Self {
141141
match error {
142142
FileSystemError::NotSupported => Self::EACCES,

0 commit comments

Comments
 (0)