diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-05-19 08:03:55 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-05-19 08:03:55 +0200 |
| commit | 5a29ec07f4d0bc41da0b64435ff156ff37e88c22 (patch) | |
| tree | d406200f56af2118901d657b7efa26886fed3e38 /openvpn_ffi/src/parse.rs | |
| parent | 2f2c5b853ab376948e61e9f371cc724ac07ab5bb (diff) | |
| parent | 927888f8767f814f98c666af854ba03a09909897 (diff) | |
| download | mullvadvpn-5a29ec07f4d0bc41da0b64435ff156ff37e88c22.tar.xz mullvadvpn-5a29ec07f4d0bc41da0b64435ff156ff37e88c22.zip | |
Merge branch 'openvpn-event-dispatcher'
Diffstat (limited to 'openvpn_ffi/src/parse.rs')
| -rw-r--r-- | openvpn_ffi/src/parse.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openvpn_ffi/src/parse.rs b/openvpn_ffi/src/parse.rs index 787883fd70..6d0c42c06f 100644 --- a/openvpn_ffi/src/parse.rs +++ b/openvpn_ffi/src/parse.rs @@ -52,7 +52,7 @@ pub unsafe fn string_array(mut ptr: *const *const c_char) -> Result<Vec<String>> /// # Segfaults /// /// Uses `string_array` internally and will segfault for the same reasons as that function. -pub unsafe fn env(envptr: *const *const c_char) -> Result<HashMap<String, String>> { +pub unsafe fn env(envptr: *const *const c_char) -> Result<::OpenVpnEnv> { let mut map = HashMap::new(); for string in string_array(envptr)? { let mut iter = string.splitn(2, '='); |