diff options
author | Robin Krahl <robin.krahl@ireas.org> | 2019-01-17 13:38:28 +0000 |
---|---|---|
committer | Robin Krahl <robin.krahl@ireas.org> | 2019-01-20 21:08:52 +0000 |
commit | c191e875492ff8aeab1b4493b87486cd265f0edc (patch) | |
tree | 5892f3787c3a67dac859a3dba5d056034bf1bcc4 /src/util.rs | |
parent | c3e551dd40142bcd2552972d549f31ad7483621d (diff) | |
download | nitrokey-rs-c191e875492ff8aeab1b4493b87486cd265f0edc.tar.gz nitrokey-rs-c191e875492ff8aeab1b4493b87486cd265f0edc.tar.bz2 |
Introduce the Error::UnexpectedError variant
The UnexpectedError variant is used when a libnitrokey function returns
a value that violates the function’s contract, for example if a function
returns a null pointer although it guarantees to never return null.
Previously, we returned a CommandError::Unspecified in these cases.
Diffstat (limited to 'src/util.rs')
-rw-r--r-- | src/util.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/util.rs b/src/util.rs index 2738fce..79b8c34 100644 --- a/src/util.rs +++ b/src/util.rs @@ -5,7 +5,7 @@ use libc::{c_void, free}; use rand_core::RngCore; use rand_os::OsRng; -use crate::error::{CommandError, Error, LibraryError}; +use crate::error::{Error, LibraryError}; /// Log level for libnitrokey. /// @@ -36,7 +36,7 @@ pub fn owned_str_from_ptr(ptr: *const c_char) -> String { pub fn result_from_string(ptr: *const c_char) -> Result<String, Error> { if ptr.is_null() { - return Err(CommandError::Undefined.into()); + return Err(Error::UnexpectedError); } unsafe { let s = owned_str_from_ptr(ptr); @@ -65,7 +65,7 @@ pub fn get_last_result() -> Result<(), Error> { pub fn get_last_error() -> Error { return match get_last_result() { - Ok(()) => CommandError::Undefined.into(), + Ok(()) => Error::UnexpectedError, Err(err) => err, }; } |