aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/stack.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-11-01 19:36:08 -0700
committerSteven Fackler <[email protected]>2016-11-01 19:36:08 -0700
commitd5a9a239f688f3820db6d61ed77467152dfe72cf (patch)
tree117ea7a5c74dc84eace9d8d7e5bf1743baefc948 /openssl/src/stack.rs
parentClean up stack (diff)
downloadrust-openssl-d5a9a239f688f3820db6d61ed77467152dfe72cf.tar.xz
rust-openssl-d5a9a239f688f3820db6d61ed77467152dfe72cf.zip
More minor cleanup
Diffstat (limited to 'openssl/src/stack.rs')
-rw-r--r--openssl/src/stack.rs19
1 files changed, 8 insertions, 11 deletions
diff --git a/openssl/src/stack.rs b/openssl/src/stack.rs
index e48ebe77..368b6e07 100644
--- a/openssl/src/stack.rs
+++ b/openssl/src/stack.rs
@@ -142,31 +142,28 @@ impl<T: Stackable> Ref<Stack<T>> {
/// Returns a reference to the element at the given index in the
/// stack or `None` if the index is out of bounds
pub fn get(&self, idx: usize) -> Option<&Ref<T>> {
- if idx >= self.len() {
- return None;
- }
-
unsafe {
- let r = Ref::from_ptr(self._get(idx));
+ if idx >= self.len() {
+ return None;
+ }
- Some(r)
+ Some(Ref::from_ptr(self._get(idx)))
}
}
/// Returns a mutable reference to the element at the given index in the
/// stack or `None` if the index is out of bounds
pub fn get_mut(&mut self, idx: usize) -> Option<&mut Ref<T>> {
- if idx >= self.len() {
- return None;
- }
-
unsafe {
+ if idx >= self.len() {
+ return None;
+ }
+
Some(Ref::from_ptr_mut(self._get(idx)))
}
}
unsafe fn _get(&self, idx: usize) -> *mut T::CType {
- assert!(idx <= c_int::max_value() as usize);
OPENSSL_sk_value(self.as_stack(), idx as c_int) as *mut _
}
}