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

Merge pull request #359 from alexcrichton/nightly-fixes 

Fix nightly warnings about zero-sized fn pointers
This commit is contained in:
Steven Fackler 2016-03-11 13:14:38 -08:00
parent 88ded2cec5 3467cf343f
commit 450d275648
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openssl/src/ssl/mod.rs
View File

@ -569,7 +569,8 @@ impl SslContext {
pub fn set_servername_callback(&mut self, callback: Option<ServerNameCallback>) { pub fn set_servername_callback(&mut self, callback: Option<ServerNameCallback>) {
unsafe { unsafe {
ffi::SSL_CTX_set_ex_data(self.ctx, SNI_IDX, mem::transmute(callback)); ffi::SSL_CTX_set_ex_data(self.ctx, SNI_IDX, mem::transmute(callback));
let f: extern "C" fn() = mem::transmute(raw_sni); let f: extern "C" fn(_, _, _) -> _ = raw_sni;
let f: extern "C" fn() = mem::transmute(f);
ffi_extras::SSL_CTX_set_tlsext_servername_callback(self.ctx, Some(f)); ffi_extras::SSL_CTX_set_tlsext_servername_callback(self.ctx, Some(f));
} }
} }
@ -586,7 +587,8 @@ impl SslContext {
ffi::SSL_CTX_set_ex_data(self.ctx, SNI_IDX, mem::transmute(Some(callback))); ffi::SSL_CTX_set_ex_data(self.ctx, SNI_IDX, mem::transmute(Some(callback)));
ffi_extras::SSL_CTX_set_tlsext_servername_arg(self.ctx, mem::transmute(data)); ffi_extras::SSL_CTX_set_tlsext_servername_arg(self.ctx, mem::transmute(data));
let f: extern "C" fn() = mem::transmute(raw_sni_with_data::<T>); let f: extern "C" fn(_, _, _) -> _ = raw_sni_with_data::<T>;
let f: extern "C" fn() = mem::transmute(f);
ffi_extras::SSL_CTX_set_tlsext_servername_callback(self.ctx, Some(f)); ffi_extras::SSL_CTX_set_tlsext_servername_callback(self.ctx, Some(f));
} }
} }