From 0042a808b06e8d85701123c10f972e4a90ab7350 Mon Sep 17 00:00:00 2001 From: auronandace Date: Tue, 6 Jan 2026 10:08:13 +0000 Subject: [PATCH] utmp and wctype header cleanup --- src/header/utmp/mod.rs | 2 +- src/header/wctype/alpha.rs | 2 +- src/header/wctype/casecmp.rs | 2 +- src/header/wctype/mod.rs | 6 +++++- src/header/wctype/punct.rs | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/header/utmp/mod.rs b/src/header/utmp/mod.rs index 72fa344ac6..26c85f026a 100644 --- a/src/header/utmp/mod.rs +++ b/src/header/utmp/mod.rs @@ -4,7 +4,7 @@ use crate::{ header::{sys_ioctl, unistd}, - platform::types::*, + platform::types::{c_int, c_void}, }; /// See . diff --git a/src/header/wctype/alpha.rs b/src/header/wctype/alpha.rs index 9cae98893b..621046e069 100644 --- a/src/header/wctype/alpha.rs +++ b/src/header/wctype/alpha.rs @@ -2,7 +2,7 @@ // Licensed under the MIT license // Copyright 2005-2020 Rich Felker, et al. -use crate::platform::types::*; +use crate::platform::types::c_uchar; pub fn is(wc: usize) -> c_uchar { if wc < 0x20000 { diff --git a/src/header/wctype/casecmp.rs b/src/header/wctype/casecmp.rs index bea9e58ad4..64700bdb9e 100644 --- a/src/header/wctype/casecmp.rs +++ b/src/header/wctype/casecmp.rs @@ -2,7 +2,7 @@ // Licensed under the MIT license // Copyright 2005-2020 Rich Felker, et al. -use crate::platform::types::*; +use crate::platform::types::{c_int, c_uchar, c_uint, wint_t}; const tab: [c_uchar; 2666] = [ 7, 8, 9, 10, 11, 12, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 13, 6, 6, 14, 6, 6, 6, 6, 6, 6, 6, 6, 15, diff --git a/src/header/wctype/mod.rs b/src/header/wctype/mod.rs index bc1f7aa391..610017481d 100644 --- a/src/header/wctype/mod.rs +++ b/src/header/wctype/mod.rs @@ -8,7 +8,11 @@ // TODO: *_l functions use self::casecmp::casemap; -use crate::{c_str::CStr, header::ctype, platform::types::*}; +use crate::{ + c_str::CStr, + header::ctype, + platform::types::{c_char, c_int, wint_t}, +}; mod alpha; mod casecmp; diff --git a/src/header/wctype/punct.rs b/src/header/wctype/punct.rs index 9d47abe5b0..140a21a659 100644 --- a/src/header/wctype/punct.rs +++ b/src/header/wctype/punct.rs @@ -2,7 +2,7 @@ // Licensed under the MIT license // Copyright 2005-2020 Rich Felker, et al. -use crate::platform::types::*; +use crate::platform::types::c_uchar; pub fn is(wc: usize) -> c_uchar { if wc < 0x20000 {