min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More cleanup

This commit is contained in:
Steven Fackler 2016-11-05 13:15:14 -07:00
parent ac36d542fd
commit 52feaae59f
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openssl/src/stack.rs
View File

@ -115,11 +115,6 @@ impl<T: Stackable> IntoIter<T> {
fn stack_len(&self) -> c_int { fn stack_len(&self) -> c_int {
unsafe { OPENSSL_sk_num(self.stack as *mut _) } 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> { impl<T: Stackable> Drop for IntoIter<T> {
@ -139,10 +134,9 @@ impl<T: Stackable> Iterator for IntoIter<T> {
if self.idx == self.stack_len() { if self.idx == self.stack_len() {
None None
} else { } else {
let idx = self.idx; let ptr = OPENSSL_sk_value(self.stack as *mut _, self.idx);
self.idx += 1; self.idx += 1;
let v = self.get(idx); Some(T::from_ptr(ptr as *mut _))
Some(v)
} }
} }
} }