aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/stack.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-11-05 13:15:14 -0700
committerSteven Fackler <[email protected]>2016-11-05 13:15:14 -0700
commit52feaae59f91c4de368a7942519488aa3beed6f9 (patch)
tree91495ff4acd6e2705c8916971a520293e615c114 /openssl/src/stack.rs
parentSimplify destructor a bit (diff)
downloadrust-openssl-52feaae59f91c4de368a7942519488aa3beed6f9.tar.xz
rust-openssl-52feaae59f91c4de368a7942519488aa3beed6f9.zip
More cleanup
Diffstat (limited to 'openssl/src/stack.rs')
-rw-r--r--openssl/src/stack.rs10
1 files changed, 2 insertions, 8 deletions
diff --git a/openssl/src/stack.rs b/openssl/src/stack.rs
index c56c8230..50694919 100644
--- a/openssl/src/stack.rs
+++ b/openssl/src/stack.rs
@@ -115,11 +115,6 @@ impl<T: Stackable> IntoIter<T> {
fn stack_len(&self) -> c_int {
unsafe { OPENSSL_sk_num(self.stack as *mut _) }
}
-
- unsafe fn get(&mut self, i: c_int) -> T {
- let ptr = OPENSSL_sk_value(self.stack as *mut _, i);
- T::from_ptr(ptr as *mut _)
- }
}
impl<T: Stackable> Drop for IntoIter<T> {
@@ -139,10 +134,9 @@ impl<T: Stackable> Iterator for IntoIter<T> {
if self.idx == self.stack_len() {
None
} else {
- let idx = self.idx;
+ let ptr = OPENSSL_sk_value(self.stack as *mut _, self.idx);
self.idx += 1;
- let v = self.get(idx);
- Some(v)
+ Some(T::from_ptr(ptr as *mut _))
}
}
}