vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'locale-cleanup' into 'master'

Browse Source 
clean up some as casts in locale

See merge request redox-os/relibc!1020
This commit is contained in:
Jeremy Soller
2026-02-19 08:18:23 -07:00
parent 940352affe c8747c97c3
commit 976ed3c276
2 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/header/locale/data.rs
+20 -20
View File
@@ -41,17 +41,17 @@ unsafe impl Sync for lconv {}
pub(crate) const fn posix_lconv() -> lconv {
lconv {
// numeric, non-monetary
decimal_point: b".\0".as_ptr() as *mut c_char,
thousands_sep: b"\0".as_ptr() as *mut c_char,
grouping: b"\0".as_ptr() as *mut c_char,
decimal_point: c".".as_ptr().cast_mut(),
thousands_sep: c"".as_ptr().cast_mut(),
grouping: c"".as_ptr().cast_mut(),
// local monetary
int_curr_symbol: b"\0".as_ptr() as *mut c_char,
currency_symbol: b"\0".as_ptr() as *mut c_char,
mon_decimal_point: b"\0".as_ptr() as *mut c_char,
mon_thousands_sep: b"\0".as_ptr() as *mut c_char,
mon_grouping: b"\0".as_ptr() as *mut c_char,
positive_sign: b"\0".as_ptr() as *mut c_char,
negative_sign: b"\0".as_ptr() as *mut c_char,
int_curr_symbol: c"".as_ptr().cast_mut(),
currency_symbol: c"".as_ptr().cast_mut(),
mon_decimal_point: c"".as_ptr().cast_mut(),
mon_thousands_sep: c"".as_ptr().cast_mut(),
mon_grouping: c"".as_ptr().cast_mut(),
positive_sign: c"".as_ptr().cast_mut(),
negative_sign: c"".as_ptr().cast_mut(),
// delimiters, unspecified
int_frac_digits: c_char::MAX,
frac_digits: c_char::MAX,
@@ -130,16 +130,16 @@ impl LocaleData {
}
fn update_lconv_pointers(&mut self) {
self.lconv.decimal_point = self.decimal_point.as_ptr() as *mut c_char;
self.lconv.thousands_sep = self.thousands_sep.as_ptr() as *mut c_char;
self.lconv.grouping = self.grouping.as_ptr() as *mut c_char;
self.lconv.int_curr_symbol = self.int_curr_symbol.as_ptr() as *mut c_char;
self.lconv.currency_symbol = self.currency_symbol.as_ptr() as *mut c_char;
self.lconv.mon_decimal_point = self.mon_decimal_point.as_ptr() as *mut c_char;
self.lconv.mon_thousands_sep = self.mon_thousands_sep.as_ptr() as *mut c_char;
self.lconv.mon_grouping = self.mon_grouping.as_ptr() as *mut c_char;
self.lconv.positive_sign = self.positive_sign.as_ptr() as *mut c_char;
self.lconv.negative_sign = self.negative_sign.as_ptr() as *mut c_char;
self.lconv.decimal_point = self.decimal_point.as_ptr().cast_mut();
self.lconv.thousands_sep = self.thousands_sep.as_ptr().cast_mut();
self.lconv.grouping = self.grouping.as_ptr().cast_mut();
self.lconv.int_curr_symbol = self.int_curr_symbol.as_ptr().cast_mut();
self.lconv.currency_symbol = self.currency_symbol.as_ptr().cast_mut();
self.lconv.mon_decimal_point = self.mon_decimal_point.as_ptr().cast_mut();
self.lconv.mon_thousands_sep = self.mon_thousands_sep.as_ptr().cast_mut();
self.lconv.mon_grouping = self.mon_grouping.as_ptr().cast_mut();
self.lconv.positive_sign = self.positive_sign.as_ptr().cast_mut();
self.lconv.negative_sign = self.negative_sign.as_ptr().cast_mut();
}
pub fn copy_category(&mut self, other: &Self, category: c_int) {
src/header/locale/mod.rs
+10 -10
View File
@@ -45,7 +45,7 @@ pub unsafe extern "C" fn localeconv() -> *mut lconv {
&raw mut POSIX_LOCALE
}
} else {
let current = current as *mut LocaleData;
let current = current.cast::<LocaleData>();
unsafe { &raw mut (*current).lconv }
}
}
@@ -65,12 +65,12 @@ pub unsafe extern "C" fn setlocale(category: c_int, locale: *const c_char) -> *m
let Some(name) = global.get_name(category) else {
return ptr::null_mut();
};
return name.as_ptr() as *mut c_char;
return name.as_ptr().cast_mut();
}
let name = unsafe { CStr::from_ptr(locale).to_str().unwrap_or("C") };
let locale_file = if name == "" || name == "C" || name == "POSIX" {
let locale_file = if name.is_empty() || name == "C" || name == "POSIX" {
// TODO: name == "" should read from LANG env
Ok(LocaleData::posix())
} else {
@@ -83,7 +83,7 @@ pub unsafe extern "C" fn setlocale(category: c_int, locale: *const c_char) -> *m
let Some(name) = global.set_name(category, CString::from_str(name).unwrap()) else {
return ptr::null_mut();
};
name.as_ptr() as *mut c_char
name.as_ptr().cast_mut()
}
Err(_) => ptr::null_mut(),
}
@@ -103,7 +103,7 @@ pub unsafe extern "C" fn uselocale(newloc: locale_t) -> locale_t {
THREAD_LOCALE = if newloc == LC_GLOBAL_LOCALE {
ptr::null_mut()
} else {
newloc as *mut LocaleData
newloc.cast::<LocaleData>()
}
};
}
@@ -118,7 +118,7 @@ pub unsafe extern "C" fn newlocale(mask: c_int, locale: *const c_char, base: loc
.to_string_lossy()
.into_owned();
let name = name.as_str();
let mut new_locale = if name == "" || name == "C" || name == "POSIX" {
let mut new_locale = if name.is_empty() || name == "C" || name == "POSIX" {
// TODO: name == "" should read from LANG env
Ok(LocaleData::posix())
} else {
@@ -126,7 +126,7 @@ pub unsafe extern "C" fn newlocale(mask: c_int, locale: *const c_char, base: loc
};
if base != LC_GLOBAL_LOCALE {
// borrowing here
let base = base as *const _ as *const LocaleData;
let base = base.cast_const().cast::<LocaleData>();
if let Ok(new_locale) = new_locale.as_mut() {
if let Some(base) = unsafe { base.as_ref() } {
// copy old values if not containing the mask
@@ -140,14 +140,14 @@ pub unsafe extern "C" fn newlocale(mask: c_int, locale: *const c_char, base: loc
}
}
}
new_locale.or_errno_null_mut() as *mut _
new_locale.or_errno_null_mut().cast()
}
/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/freelocale.html>.
#[unsafe(no_mangle)]
pub unsafe extern "C" fn freelocale(loc: locale_t) {
if !loc.is_null() && loc != LC_GLOBAL_LOCALE {
drop(unsafe { Box::from_raw(loc as *mut LocaleData) });
drop(unsafe { Box::from_raw(loc.cast::<LocaleData>()) });
}
}
@@ -161,7 +161,7 @@ pub unsafe extern "C" fn duplocale(loc: locale_t) -> locale_t {
Box::into_raw(LocaleData::posix()) as locale_t
} else {
// borrowing here
let loc = loc as *const _ as *const LocaleData;
let loc = loc.cast_const().cast::<LocaleData>();
Box::into_raw(unsafe { Box::from((*loc).clone()) }) as locale_t
}
}