diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-02-09 11:18:52 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-02-09 11:18:52 +0100 |
| commit | 82890bc9840f77973fa7c48d72d9e51004c75f40 (patch) | |
| tree | dc75d9ad991d368ebe6dbd6bac591e813fe228dd /talpid_openvpn_plugin/src | |
| parent | b460c4c138ad283746e12604975d9d1235381ed4 (diff) | |
| parent | 9d551d691a5b9981fb2c1d80801031889ca022a0 (diff) | |
| download | mullvadvpn-82890bc9840f77973fa7c48d72d9e51004c75f40.tar.xz mullvadvpn-82890bc9840f77973fa7c48d72d9e51004c75f40.zip | |
Merge branch 'error-chain'
Diffstat (limited to 'talpid_openvpn_plugin/src')
| -rw-r--r-- | talpid_openvpn_plugin/src/ffi/parse.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/talpid_openvpn_plugin/src/ffi/parse.rs b/talpid_openvpn_plugin/src/ffi/parse.rs index db26335d27..d694f1efb7 100644 --- a/talpid_openvpn_plugin/src/ffi/parse.rs +++ b/talpid_openvpn_plugin/src/ffi/parse.rs @@ -28,7 +28,7 @@ error_chain!{ /// terminated. Likewise, if any string pointed to is not properly null-terminated it may crash. pub unsafe fn string_array(mut ptr: *const *const c_char) -> Result<Vec<String>> { if ptr.is_null() { - Err(Error::from(ErrorKind::Null)) + Err(ErrorKind::Null.into()) } else { let mut strings = Vec::new(); while !(*ptr).is_null() { |