diff options
| author | Szczepan Zalega <szczepan@nitrokey.com> | 2017-03-31 13:43:11 +0200 |
|---|---|---|
| committer | Szczepan Zalega <szczepan@nitrokey.com> | 2017-03-31 14:20:58 +0200 |
| commit | bf289b885768ae5db4e15e18f66390595a2b20f3 (patch) | |
| tree | 65c99289e58c9492d2510a7f4d918318c71c7e10 /include | |
| parent | 9892ae74c8e828d163e797b9a309972bbe8ef367 (diff) | |
| download | libnitrokey-bf289b885768ae5db4e15e18f66390595a2b20f3.tar.gz libnitrokey-bf289b885768ae5db4e15e18f66390595a2b20f3.tar.bz2 | |
Fix compilation warnings
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/device.h | 3 | ||||
| -rw-r--r-- | include/stick10_commands.h | 14 |
2 files changed, 7 insertions, 10 deletions
diff --git a/include/device.h b/include/device.h index 674d66b..8bc661a 100644 --- a/include/device.h +++ b/include/device.h @@ -121,12 +121,9 @@ protected: const int m_retry_receiving_count; std::chrono::milliseconds m_retry_timeout; std::chrono::milliseconds m_send_receive_delay; - std::atomic<hid_device *>mp_devhandle; - static std::atomic_int instances_count; - static std::chrono::milliseconds default_delay ; }; diff --git a/include/stick10_commands.h b/include/stick10_commands.h index a50d0ae..74b73a8 100644 --- a/include/stick10_commands.h +++ b/include/stick10_commands.h @@ -476,7 +476,7 @@ class GetPasswordSafeSlotName : Command<CommandID::GET_PW_SAFE_SLOT_NAME> { bool isValid() const { return true; } std::string dissect() const { std::stringstream ss; - ss << " slot_name\t" << (char*)slot_name << std::endl; + ss << " slot_name\t" << (const char*) slot_name << std::endl; return ss.str(); } } __packed; @@ -505,7 +505,7 @@ class GetPasswordSafeSlotPassword bool isValid() const { return true; } std::string dissect() const { std::stringstream ss; - ss << " slot_password\t" << (char*)slot_password << std::endl; + ss << " slot_password\t" << (const char*) slot_password << std::endl; return ss.str(); } } __packed; @@ -534,7 +534,7 @@ class GetPasswordSafeSlotLogin bool isValid() const { return true; } std::string dissect() const { std::stringstream ss; - ss << " slot_login\t" << (char*)slot_login << std::endl; + ss << " slot_login\t" << (const char*) slot_login << std::endl; return ss.str(); } } __packed; @@ -554,8 +554,8 @@ class SetPasswordSafeSlotData : Command<CommandID::SET_PW_SAFE_SLOT_DATA_1> { std::string dissect() const { std::stringstream ss; ss << " slot_number\t" << (int)slot_number << std::endl; - ss << " slot_name\t" << (char*)slot_name << std::endl; - ss << " slot_password\t" << (char*)slot_password << std::endl; + ss << " slot_name\t" << (const char*) slot_name << std::endl; + ss << " slot_password\t" << (const char*) slot_password << std::endl; return ss.str(); } } __packed; @@ -574,7 +574,7 @@ class SetPasswordSafeSlotData2 : Command<CommandID::SET_PW_SAFE_SLOT_DATA_2> { std::string dissect() const { std::stringstream ss; ss << " slot_number\t" << (int)slot_number << std::endl; - ss << " slot_login_name\t" << (char*)slot_login_name << std::endl; + ss << " slot_login_name\t" << (const char*) slot_login_name << std::endl; return ss.str(); } } __packed; @@ -609,7 +609,7 @@ class EnablePasswordSafe : Command<CommandID::PW_SAFE_ENABLE> { bool isValid() const { return true; } std::string dissect() const { std::stringstream ss; - ss << " user_password\t" << (char*) user_password << std::endl; + ss << " user_password\t" << (const char*) user_password << std::endl; return ss.str(); } } __packed; |