summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohannes Schilling <dario@deaktualisierung.org>2019-05-31 22:30:41 +0200
committerJohannes Schilling <dario@deaktualisierung.org>2019-05-31 22:30:41 +0200
commitee439049a09736f96d30497e4f288ee09985789e (patch)
treed462e99a9b7f3099b023eafece8540c01fa4c543 /src
parent0e0b28c09faf5aeae77c99254ed177c127a01317 (diff)
downloadnix-ee439049a09736f96d30497e4f288ee09985789e.zip
libc::uint8_t deprecated in favor of rust u8
Diffstat (limited to 'src')
-rw-r--r--src/sys/socket/sockopt.rs16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/sys/socket/sockopt.rs b/src/sys/socket/sockopt.rs
index a489eaff..4727698b 100644
--- a/src/sys/socket/sockopt.rs
+++ b/src/sys/socket/sockopt.rs
@@ -2,7 +2,7 @@ use super::{GetSockOpt, SetSockOpt};
use Result;
use errno::Errno;
use sys::time::TimeVal;
-use libc::{self, c_int, uint8_t, c_void, socklen_t};
+use libc::{self, c_int, c_void, socklen_t};
use std::mem;
use std::os::unix::io::RawFd;
use std::ffi::{OsStr, OsString};
@@ -485,19 +485,19 @@ unsafe impl<'a> Set<'a, bool> for SetBool {
/// Getter for an `u8` value.
struct GetU8 {
len: socklen_t,
- val: uint8_t,
+ val: u8,
}
unsafe impl Get<u8> for GetU8 {
unsafe fn blank() -> Self {
GetU8 {
- len: mem::size_of::<uint8_t>() as socklen_t,
+ len: mem::size_of::<u8>() as socklen_t,
val: mem::zeroed(),
}
}
fn ffi_ptr(&mut self) -> *mut c_void {
- &mut self.val as *mut uint8_t as *mut c_void
+ &mut self.val as *mut u8 as *mut c_void
}
fn ffi_len(&mut self) -> *mut socklen_t {
@@ -505,23 +505,23 @@ unsafe impl Get<u8> for GetU8 {
}
unsafe fn unwrap(self) -> u8 {
- assert!(self.len as usize == mem::size_of::<uint8_t>(), "invalid getsockopt implementation");
+ assert!(self.len as usize == mem::size_of::<u8>(), "invalid getsockopt implementation");
self.val as u8
}
}
/// Setter for an `u8` value.
struct SetU8 {
- val: uint8_t,
+ val: u8,
}
unsafe impl<'a> Set<'a, u8> for SetU8 {
fn new(val: &'a u8) -> SetU8 {
- SetU8 { val: *val as uint8_t }
+ SetU8 { val: *val as u8 }
}
fn ffi_ptr(&self) -> *const c_void {
- &self.val as *const uint8_t as *const c_void
+ &self.val as *const u8 as *const c_void
}
fn ffi_len(&self) -> socklen_t {