diff options
Diffstat (limited to 'src/mqueue.rs')
-rw-r--r-- | src/mqueue.rs | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/src/mqueue.rs b/src/mqueue.rs index e24b6800..1625d4ef 100644 --- a/src/mqueue.rs +++ b/src/mqueue.rs @@ -2,8 +2,7 @@ //! //! [Further reading and details on the C API](http://man7.org/linux/man-pages/man7/mq_overview.7.html) -use {Error, Result, from_ffi}; -use errno::Errno; +use errno::{Errno, Result}; use libc::{c_int, c_long, c_char, size_t, mode_t, strlen}; use std::ffi::CString; @@ -80,21 +79,17 @@ impl MqAttr { pub fn mq_open(name: &CString, oflag: MQ_OFlag, mode: Mode, attr: &MqAttr) -> Result<MQd> { let res = unsafe { ffi::mq_open(name.as_ptr(), oflag.bits(), mode.bits() as mode_t, attr as *const MqAttr) }; - if res < 0 { - return Err(Error::Sys(Errno::last())); - } - - Ok(res) + Errno::result(res) } pub fn mq_unlink(name: &CString) -> Result<()> { let res = unsafe { ffi::mq_unlink(name.as_ptr()) }; - from_ffi(res) + Errno::result(res).map(drop) } pub fn mq_close(mqdes: MQd) -> Result<()> { let res = unsafe { ffi::mq_close(mqdes) }; - from_ffi(res) + Errno::result(res).map(drop) } @@ -102,30 +97,20 @@ pub fn mq_receive(mqdes: MQd, message: &mut [u8], msq_prio: u32) -> Result<usize let len = message.len() as size_t; let res = unsafe { ffi::mq_receive(mqdes, message.as_mut_ptr() as *mut c_char, len, &msq_prio) }; - if res < 0 { - return Err(Error::Sys(Errno::last())); - } - - Ok(res as usize) + Errno::result(res).map(|r| r as usize) } pub fn mq_send(mqdes: MQd, message: &CString, msq_prio: u32) -> Result<usize> { let len = unsafe { strlen(message.as_ptr()) as size_t }; let res = unsafe { ffi::mq_send(mqdes, message.as_ptr(), len, msq_prio) }; - if res < 0 { - return Err(Error::Sys(Errno::last())); - } - - Ok(res as usize) + Errno::result(res).map(|r| r as usize) } pub fn mq_getattr(mqd: MQd) -> Result<MqAttr> { let mut attr = MqAttr::new(0, 0, 0, 0); let res = unsafe { ffi::mq_getattr(mqd, &mut attr) }; - if res < 0 { - return Err(Error::Sys(Errno::last())); - } + try!(Errno::result(res)); Ok(attr) } @@ -137,9 +122,7 @@ pub fn mq_getattr(mqd: MQd) -> Result<MqAttr> { pub fn mq_setattr(mqd: MQd, newattr: &MqAttr) -> Result<MqAttr> { let mut attr = MqAttr::new(0, 0, 0, 0); let res = unsafe { ffi::mq_setattr(mqd, newattr as *const MqAttr, &mut attr) }; - if res < 0 { - return Err(Error::Sys(Errno::last())); - } + try!(Errno::result(res)); Ok(attr) } |