summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSebastian Lauwers <sebastian.lauwers@gmail.com>2015-02-21 00:27:54 +0100
committerCarl Lerche <me@carllerche.com>2015-02-20 15:41:53 -0800
commit4abe2fc86d0fcaedc5dff1a841c6276705a976a5 (patch)
tree4e135fdd212d1672ff003624b075135148b2fdb3 /src
parent99ad14f6ed4f1ddb87523d646af18947b68f8297 (diff)
downloadnix-4abe2fc86d0fcaedc5dff1a841c6276705a976a5.zip
Use new ffi:CStr instead of c_str_to_bytes_with_nul
Diffstat (limited to 'src')
-rw-r--r--src/sys/utsname.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sys/utsname.rs b/src/sys/utsname.rs
index 028caa6c..b6641ebb 100644
--- a/src/sys/utsname.rs
+++ b/src/sys/utsname.rs
@@ -1,6 +1,6 @@
use std::mem;
use libc::{c_char};
-use std::ffi::{c_str_to_bytes_with_nul};
+use std::ffi::CStr;
use std::str::from_utf8_unchecked;
mod ffi {
@@ -61,7 +61,7 @@ pub fn uname() -> UtsName {
#[inline]
fn to_str<'a>(s: *const *const c_char) -> &'a str {
unsafe {
- let res = c_str_to_bytes_with_nul(mem::transmute(s));
+ let res = CStr::from_ptr(*s).to_bytes_with_nul();
from_utf8_unchecked(res)
}
}