diff options
| author | Daniel Mueller <deso@posteo.net> | 2019-08-12 22:07:44 -0700 |
|---|---|---|
| committer | Daniel Mueller <deso@posteo.net> | 2019-08-12 22:07:44 -0700 |
| commit | d86a4bb717f9930f9cbc49008d6c4ee10783da14 (patch) | |
| tree | b77ba026d07cfbce3039dd768628e2761284c990 /nitrokey/src/util.rs | |
| parent | 3bc2a5572fb428f4d3038df979344a65b8ef67ff (diff) | |
| download | nitrocli-d86a4bb717f9930f9cbc49008d6c4ee10783da14.tar.gz nitrocli-d86a4bb717f9930f9cbc49008d6c4ee10783da14.tar.bz2 | |
Update nitrokey crate to 0.4.0-alpha.2
This change updates the dependency to nitrokey to version 0.4.0-alpha.2.
In addition to minor interface changes for the get_*_firmware_version
and get_*_retry_count functions, several functions that change the
device state now require a mutable handle to the nitrokey. Hence, this
patch a number of function signatures to accept mutable device objects.
Import subrepo nitrokey/:nitrokey at 34efcfadf1436102e42144f710edabaa2c4b55cd
Diffstat (limited to 'nitrokey/src/util.rs')
| -rw-r--r-- | nitrokey/src/util.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nitrokey/src/util.rs b/nitrokey/src/util.rs index b7e8cd3..fdb73c3 100644 --- a/nitrokey/src/util.rs +++ b/nitrokey/src/util.rs @@ -53,6 +53,10 @@ pub fn result_from_string(ptr: *const c_char) -> Result<String, Error> { } } +pub fn result_or_error<T>(value: T) -> Result<T, Error> { + get_last_result().and(Ok(value)) +} + pub fn get_command_result(value: c_int) -> Result<(), Error> { if value == 0 { Ok(()) |