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

Remove useless Option wrapper

This commit is contained in:
Steven Fackler 2014-02-16 12:16:39 -08:00
parent d259ffe0ce
commit ed8cf91a3c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ssl/mod.rs
View File

@ -16,7 +16,7 @@ mod tests;
static mut INIT: Once = ONCE_INIT; static mut INIT: Once = ONCE_INIT;
static mut VERIFY_IDX: c_int = -1; static mut VERIFY_IDX: c_int = -1;
static mut MUTEXES: Option<*mut ~[NativeMutex]> = None; static mut MUTEXES: *mut ~[NativeMutex] = 0 as *mut ~[NativeMutex];
fn init() { fn init() {
unsafe { unsafe {
@ -29,7 +29,7 @@ fn init() {
let num_locks = ffi::CRYPTO_num_locks(); let num_locks = ffi::CRYPTO_num_locks();
let mutexes = ~vec::from_fn(num_locks as uint, |_| NativeMutex::new()); let mutexes = ~vec::from_fn(num_locks as uint, |_| NativeMutex::new());
MUTEXES = Some(cast::transmute(mutexes)); MUTEXES = cast::transmute(mutexes);
ffi::CRYPTO_set_locking_callback(locking_function); ffi::CRYPTO_set_locking_callback(locking_function);
}); });
@ -67,7 +67,7 @@ pub enum SslVerifyMode {
extern "C" fn locking_function(mode: c_int, n: c_int, _file: *c_char, extern "C" fn locking_function(mode: c_int, n: c_int, _file: *c_char,
_line: c_int) { _line: c_int) {
unsafe { unsafe {
let mutex = &mut (*MUTEXES.unwrap())[n as uint]; let mutex = &mut (*MUTEXES)[n as uint];
if mode & ffi::CRYPTO_LOCK != 0 { if mode & ffi::CRYPTO_LOCK != 0 {
mutex.lock_noguard(); mutex.lock_noguard();