From ed8cf91a3c14a0d3dadce4e6b46f56531a9cd896 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 16 Feb 2014 12:16:39 -0800
Subject: Remove useless Option wrapper

---
 ssl/mod.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ssl/mod.rs b/ssl/mod.rs
index 413c18f7..706df857 100644
--- a/ssl/mod.rs
+++ b/ssl/mod.rs
@@ -16,7 +16,7 @@ mod tests;
 static mut INIT: Once = ONCE_INIT;
 
 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() {
     unsafe {
@@ -29,7 +29,7 @@ fn init() {
 
             let num_locks = ffi::CRYPTO_num_locks();
             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);
         });
@@ -67,7 +67,7 @@ pub enum SslVerifyMode {
 extern "C" fn locking_function(mode: c_int, n: c_int, _file: *c_char,
                                _line: c_int) {
     unsafe {
-        let mutex = &mut (*MUTEXES.unwrap())[n as uint];
+        let mutex = &mut (*MUTEXES)[n as uint];
 
         if mode & ffi::CRYPTO_LOCK != 0 {
             mutex.lock_noguard();
-- 
cgit v1.2.3