fff

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
OSSystems · Mar 1, 2021 · f995cf6 · f995cf6
1 parent 560d9ee
commit f995cf6
Showing 1 changed file with 4 additions and 13 deletions.
diff --git a/src/ffi/mod.rs b/src/ffi/mod.rs
@@ -52,17 +52,10 @@ unsafe fn restore_locale(old_locale: libc::locale_t) {
 }
 
 #[cfg(windows)]
-unsafe fn set_utf8_locale() -> Option<ffi::CString> {
+unsafe fn set_utf8_locale() -> *mut i8 {
     let locale = b".UTF-8\0";
 
-    let old_locale = {
-        let old_locale = libc::setlocale(libc::LC_CTYPE, ptr::null());
-        if old_locale.is_null() {
-            None
-        } else {
-            Some(ffi::CStr::from_ptr(old_locale).to_owned())
-        }
-    };
+    let old_locale = libc::setlocale(libc::LC_CTYPE, ptr::null());
 
     libc::setlocale(
         libc::LC_CTYPE,
@@ -73,8 +66,6 @@ unsafe fn set_utf8_locale() -> Option<ffi::CString> {
 }
 
 #[cfg(windows)]
-unsafe fn restore_locale(old_locale: Option<ffi::CString>) {
-    if let Some(old_locale) = old_locale {
-        libc::setlocale(libc::LC_CTYPE, old_locale.as_ptr());
-    }
+unsafe fn restore_locale(old_locale: *mut i8) {
+    libc::setlocale(libc::LC_CTYPE, old_locale);
 }