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

Add Stack::pop

This commit is contained in:
Steven Fackler 2016-11-05 13:40:53 -07:00
parent 52feaae59f
commit ed69d6b037
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
openssl/src/stack.rs
View File

@ -40,18 +40,7 @@ impl<T: Stackable> Stack<T> {
impl<T: Stackable> Drop for Stack<T> {
fn drop(&mut self) {
unsafe {
loop {
let ptr = OPENSSL_sk_pop(self.as_stack());
if ptr.is_null() {
break;
}
// Build the owned version of the object just to run
// its `drop` implementation and delete the item.
T::from_ptr(ptr as *mut _);
}
while let Some(_) = self.pop() {}
OPENSSL_sk_free(self.0 as *mut _);
}
}
@ -209,6 +198,18 @@ impl<T: Stackable> StackRef<T> {
}
}
/// Removes the last element from the stack and returns it.
pub fn pop(&mut self) -> Option<T> {
unsafe {
let ptr = OPENSSL_sk_pop(self.as_stack());
if ptr.is_null() {
None
} else {
Some(T::from_ptr(ptr as *mut _))
}
}
}
unsafe fn _get(&self, idx: usize) -> *mut T::CType {
OPENSSL_sk_value(self.as_stack(), idx as c_int) as *mut _
}