From cea71ae627e5d5d3214485f473bd56fccdb6305b Mon Sep 17 00:00:00 2001 From: auronandace Date: Wed, 21 Jan 2026 10:50:36 +0000 Subject: [PATCH] sgtty and sys_ioctl header cleanup --- src/header/sgtty/mod.rs | 2 +- src/header/sys_ioctl/linux.rs | 5 ++++- src/header/sys_ioctl/mod.rs | 2 +- src/header/sys_ioctl/redox/drm.rs | 2 +- src/header/sys_ioctl/redox/mod.rs | 5 ++++- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/header/sgtty/mod.rs b/src/header/sgtty/mod.rs index 0ec736c686..7d5890468a 100644 --- a/src/header/sgtty/mod.rs +++ b/src/header/sgtty/mod.rs @@ -1,6 +1,6 @@ //! sgtty implementation that won't work on redox because no ioctl -use crate::{header::sys_ioctl::*, platform::types::*}; +use crate::{header::sys_ioctl::sgttyb, platform::types::c_int}; #[unsafe(no_mangle)] pub extern "C" fn gtty(fd: c_int, out: *mut sgttyb) -> c_int { diff --git a/src/header/sys_ioctl/linux.rs b/src/header/sys_ioctl/linux.rs index 67d15c13e9..62d5946c0a 100644 --- a/src/header/sys_ioctl/linux.rs +++ b/src/header/sys_ioctl/linux.rs @@ -1,6 +1,9 @@ use crate::{ error::ResultExt, - platform::{Sys, types::*}, + platform::{ + Sys, + types::{c_int, c_ulong, c_void}, + }, }; #[unsafe(no_mangle)] diff --git a/src/header/sys_ioctl/mod.rs b/src/header/sys_ioctl/mod.rs index a5892f9a17..2b80f7536f 100644 --- a/src/header/sys_ioctl/mod.rs +++ b/src/header/sys_ioctl/mod.rs @@ -1,6 +1,6 @@ //! ioctl implementation for linux -use crate::platform::types::*; +use crate::platform::types::{c_char, c_ushort}; // This is used from sgtty #[repr(C)] diff --git a/src/header/sys_ioctl/redox/drm.rs b/src/header/sys_ioctl/redox/drm.rs index 674fcffa4c..eab2f428a0 100644 --- a/src/header/sys_ioctl/redox/drm.rs +++ b/src/header/sys_ioctl/redox/drm.rs @@ -5,7 +5,7 @@ use redox_ioctl::{IoctlData, drm::*}; use crate::{ error::{Errno, Result}, header::errno::EINVAL, - platform::types::*, + platform::types::c_int, }; use super::IoctlBuffer; diff --git a/src/header/sys_ioctl/redox/mod.rs b/src/header/sys_ioctl/redox/mod.rs index 05134d56c3..bfcdb1efdd 100644 --- a/src/header/sys_ioctl/redox/mod.rs +++ b/src/header/sys_ioctl/redox/mod.rs @@ -8,7 +8,10 @@ use crate::{ errno::{self, EINVAL}, fcntl, termios, }, - platform::{self, Pal, Sys, types::*}, + platform::{ + self, Pal, Sys, + types::{c_int, c_ulong, c_ulonglong, c_void, pid_t}, + }, }; use super::winsize;