diff options
| author | Brendan Zabarauskas <bjzaba@yahoo.com.au> | 2014-06-17 15:47:31 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-06-18 17:01:34 -0700 |
| commit | cb8ca2dafdbcdedcaeb2573dccd3b3e4a26cae44 (patch) | |
| tree | 09546de154e03eb8ea3a47865128700ef130c3e0 /src/librustuv | |
| parent | 779ca97525176bc1d764f1b88906363290fcf851 (diff) | |
| download | rust-cb8ca2dafdbcdedcaeb2573dccd3b3e4a26cae44.tar.gz rust-cb8ca2dafdbcdedcaeb2573dccd3b3e4a26cae44.zip | |
Shorten endian conversion method names
The consensus on #14917 was that the proposed names were too long.
Diffstat (limited to 'src/librustuv')
| -rw-r--r-- | src/librustuv/net.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/librustuv/net.rs b/src/librustuv/net.rs index aa7fab2565d..82693acb1e9 100644 --- a/src/librustuv/net.rs +++ b/src/librustuv/net.rs @@ -30,8 +30,8 @@ use uvll; /// Generic functions related to dealing with sockaddr things //////////////////////////////////////////////////////////////////////////////// -pub fn htons(u: u16) -> u16 { u.to_big_endian() } -pub fn ntohs(u: u16) -> u16 { Int::from_big_endian(u) } +pub fn htons(u: u16) -> u16 { u.to_be() } +pub fn ntohs(u: u16) -> u16 { Int::from_be(u) } pub fn sockaddr_to_addr(storage: &libc::sockaddr_storage, len: uint) -> rtio::SocketAddr { @@ -41,7 +41,7 @@ pub fn sockaddr_to_addr(storage: &libc::sockaddr_storage, let storage: &libc::sockaddr_in = unsafe { mem::transmute(storage) }; - let ip = (storage.sin_addr.s_addr as u32).to_big_endian(); + let ip = (storage.sin_addr.s_addr as u32).to_be(); let a = (ip >> 24) as u8; let b = (ip >> 16) as u8; let c = (ip >> 8) as u8; @@ -89,7 +89,7 @@ fn addr_to_sockaddr(addr: rtio::SocketAddr) -> (libc::sockaddr_storage, uint) { (*storage).sin_family = libc::AF_INET as libc::sa_family_t; (*storage).sin_port = htons(addr.port); (*storage).sin_addr = libc::in_addr { - s_addr: Int::from_big_endian(ip), + s_addr: Int::from_be(ip), }; mem::size_of::<libc::sockaddr_in>() |
