From bcd0dcafcba31b7239faf1d582871f8fa83d69e9 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sat, 15 Jul 2017 21:46:11 -0700
Subject: Rustfmt

---
 openssl/src/util.rs | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'openssl/src/util.rs')

diff --git a/openssl/src/util.rs b/openssl/src/util.rs
index f4883976..58abd9ec 100644
--- a/openssl/src/util.rs
+++ b/openssl/src/util.rs
@@ -35,12 +35,14 @@ impl<F> Drop for CallbackState<F> {
     }
 }
 
-pub unsafe extern fn invoke_passwd_cb_old<F>(buf: *mut c_char,
-                                             size: c_int,
-                                             _rwflag: c_int,
-                                             cb_state: *mut c_void)
-                                             -> c_int
-    where F: FnOnce(&mut [c_char]) -> usize
+pub unsafe extern "C" fn invoke_passwd_cb_old<F>(
+    buf: *mut c_char,
+    size: c_int,
+    _rwflag: c_int,
+    cb_state: *mut c_void,
+) -> c_int
+where
+    F: FnOnce(&mut [c_char]) -> usize,
 {
     let callback = &mut *(cb_state as *mut CallbackState<F>);
 
@@ -61,12 +63,14 @@ pub unsafe extern fn invoke_passwd_cb_old<F>(buf: *mut c_char,
 /// Password callback function, passed to private key loading functions.
 ///
 /// `cb_state` is expected to be a pointer to a `CallbackState`.
-pub unsafe extern fn invoke_passwd_cb<F>(buf: *mut c_char,
-                                         size: c_int,
-                                         _rwflag: c_int,
-                                         cb_state: *mut c_void)
-                                         -> c_int
-    where F: FnOnce(&mut [u8]) -> Result<usize, ErrorStack>
+pub unsafe extern "C" fn invoke_passwd_cb<F>(
+    buf: *mut c_char,
+    size: c_int,
+    _rwflag: c_int,
+    cb_state: *mut c_void,
+) -> c_int
+where
+    F: FnOnce(&mut [u8]) -> Result<usize, ErrorStack>,
 {
     let callback = &mut *(cb_state as *mut CallbackState<F>);
 
-- 
cgit v1.2.3