diff options
| author | Brendan Zabarauskas <bjzaba@yahoo.com.au> | 2014-06-14 23:11:33 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-06-18 17:01:34 -0700 |
| commit | b84d17d4d77b04e1b7784d95e0c3cb2dca16f344 (patch) | |
| tree | 141c8efaedcff726d54b07b9f8cf2a9d06f1e1ad /src/libnative | |
| parent | 87c529c43a41e0c04a468cd2b301013df629b040 (diff) | |
| download | rust-b84d17d4d77b04e1b7784d95e0c3cb2dca16f344.tar.gz rust-b84d17d4d77b04e1b7784d95e0c3cb2dca16f344.zip | |
Use ByteOrder methods instead of free-standing functions
Diffstat (limited to 'src/libnative')
| -rw-r--r-- | src/libnative/io/net.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libnative/io/net.rs b/src/libnative/io/net.rs index 8cf0c3bf062..f0cd2d966cb 100644 --- a/src/libnative/io/net.rs +++ b/src/libnative/io/net.rs @@ -11,6 +11,7 @@ use alloc::arc::Arc; use libc; use std::mem; +use std::mem::ByteOrder; use std::rt::mutex; use std::rt::rtio; use std::rt::rtio::{IoResult, IoError}; @@ -27,10 +28,10 @@ use super::util; #[cfg(unix)] pub type sock_t = super::file::fd_t; pub fn htons(u: u16) -> u16 { - mem::to_be16(u) + u.to_big_endian() } pub fn ntohs(u: u16) -> u16 { - mem::from_be16(u) + ByteOrder::from_big_endian(u) } enum InAddr { @@ -46,7 +47,7 @@ fn ip_to_inaddr(ip: rtio::IpAddr) -> InAddr { (c as u32 << 8) | (d as u32 << 0); InAddr(libc::in_addr { - s_addr: mem::from_be32(ip) + s_addr: ByteOrder::from_big_endian(ip) }) } rtio::Ipv6Addr(a, b, c, d, e, f, g, h) => { @@ -180,7 +181,7 @@ pub fn sockaddr_to_addr(storage: &libc::sockaddr_storage, let storage: &libc::sockaddr_in = unsafe { mem::transmute(storage) }; - let ip = mem::to_be32(storage.sin_addr.s_addr as u32); + let ip = (storage.sin_addr.s_addr as u32).to_big_endian(); let a = (ip >> 24) as u8; let b = (ip >> 16) as u8; let c = (ip >> 8) as u8; |
