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

Clean up init stuff

This commit is contained in:
Steven Fackler 2015-10-05 22:05:58 +01:00
parent 201624a32d
commit 0ca71a98ff
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openssl-sys/src/lib.rs
View File

@ -252,10 +252,10 @@ extern fn locking_function(mode: c_int, n: c_int, _file: *const c_char,
} }
pub fn init() { pub fn init() {
static mut INIT: Once = ONCE_INIT; static INIT: Once = ONCE_INIT;
unsafe { INIT.call_once(|| {
INIT.call_once(|| { unsafe {
SSL_library_init(); SSL_library_init();
SSL_load_error_strings(); SSL_load_error_strings();
@ -270,9 +270,9 @@ pub fn init() {
GUARDS = mem::transmute(guards); GUARDS = mem::transmute(guards);
CRYPTO_set_locking_callback(locking_function); CRYPTO_set_locking_callback(locking_function);
unsafe{ rust_openssl_set_id_callback(); } rust_openssl_set_id_callback();
}) }
} })
} }
pub unsafe fn SSL_CTX_set_options(ssl: *mut SSL_CTX, op: u64) -> u64 { pub unsafe fn SSL_CTX_set_options(ssl: *mut SSL_CTX, op: u64) -> u64 {

5
openssl-sys/src/openssl_shim.c
View File

@ -10,12 +10,11 @@
unsigned long thread_id() unsigned long thread_id()
{ {
unsigned long ret = (unsigned long)pthread_self(); return (unsigned long) pthread_self();
return ret;
} }
void rust_openssl_set_id_callback() { void rust_openssl_set_id_callback() {
CRYPTO_set_id_callback((unsigned long (*)())thread_id); CRYPTO_set_id_callback(thread_id);
} }
#else #else