diff options
-rw-r--r-- | NK_C_API.cc | 6 | ||||
-rw-r--r-- | NK_C_API.h | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/NK_C_API.cc b/NK_C_API.cc index 5d8c3f4..0e3fa1f 100644 --- a/NK_C_API.cc +++ b/NK_C_API.cc @@ -1,5 +1,7 @@ -#include <cstring> #include "NK_C_API.h" +#include <iostream> +#include "include/NitrokeyManager.h" +#include <cstring> #include "include/LibraryException.h" #include "include/cxx_semantics.h" @@ -8,7 +10,6 @@ using namespace nitrokey; static uint8_t NK_last_command_status = 0; static const int max_string_field_length = 100; - template <typename T> T* duplicate_vector_and_clear(std::vector<T> &v){ auto d = new T[v.size()]; @@ -169,6 +170,7 @@ void clear_string(std::string &s){ std::fill(s.begin(), s.end(), ' '); } + NK_C_API const char * NK_status() { auto m = NitrokeyManager::instance(); return get_with_string_result([&](){ @@ -1,10 +1,7 @@ #ifndef LIBNITROKEY_NK_C_API_H #define LIBNITROKEY_NK_C_API_H -#include <iostream> -#include <string> -#include "include/NitrokeyManager.h" -#include "include/inttypes.h" +#include <stdint.h> #define NK_C_API |