aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2019-01-15 16:00:18 +0100
committerSzczepan Zalega <szczepan@nitrokey.com>2019-01-15 16:00:18 +0100
commit0a359ceaa7cc08d5e7069729c0501931e0dbeb82 (patch)
treed516b24697bf84522fdbcabbdf72421ddcec386e
parente6628cff6e84fa5450304e7045909dc7ab71348c (diff)
parentbe6fd465ded13b4dd5b8ea10834a296efb8f1424 (diff)
downloadlibnitrokey-0a359ceaa7cc08d5e7069729c0501931e0dbeb82.tar.gz
libnitrokey-0a359ceaa7cc08d5e7069729c0501931e0dbeb82.tar.bz2
Merge branch 'pr_143' into contributions
Return -2 if an error occured in NK_get_progress_bar_value Fixes #143
-rw-r--r--NK_C_API.cc4
-rw-r--r--NK_C_API.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/NK_C_API.cc b/NK_C_API.cc
index 7d0a10e..aa2d452 100644
--- a/NK_C_API.cc
+++ b/NK_C_API.cc
@@ -697,9 +697,9 @@ NK_C_API char* NK_get_SD_usage_data_as_string() {
NK_C_API int NK_get_progress_bar_value() {
auto m = NitrokeyManager::instance();
- return get_with_result([&]() {
+ return std::get<1>(get_with_status([&]() {
return m->get_progress_bar_value();
- });
+ }, -2));
}
NK_C_API int NK_get_major_firmware_version() {
diff --git a/NK_C_API.h b/NK_C_API.h
index b1bdf1e..43e5631 100644
--- a/NK_C_API.h
+++ b/NK_C_API.h
@@ -747,7 +747,8 @@ extern "C" {
/**
* Get progress value of current long operation.
* Storage only
- * @return int in range 0-100 or -1 if device is not busy
+ * @return int in range 0-100 or -1 if device is not busy or -2 if an
+ * error occured
*/
NK_C_API int NK_get_progress_bar_value();