diff options
| author | Szczepan Zalega <szczepan@nitrokey.com> | 2017-09-20 12:55:16 +0200 |
|---|---|---|
| committer | Szczepan Zalega <szczepan@nitrokey.com> | 2017-09-20 12:55:16 +0200 |
| commit | eb447c7ff965abe92bf49dbf404447b1808322c0 (patch) | |
| tree | 9309e6614f23cc5cda6042e685b24eaa0a6b5522 /include/stick20_commands.h | |
| parent | 7a04ee7dd3fad10e30581d22956234aeff2b2f3a (diff) | |
| parent | a57ed65f90c2ffda245c93aaa4aa710b605550d7 (diff) | |
| download | libnitrokey-eb447c7ff965abe92bf49dbf404447b1808322c0.tar.gz libnitrokey-eb447c7ff965abe92bf49dbf404447b1808322c0.tar.bz2 | |
Merge branch 'windows_MSVC2017' into OSX_merge_cleaned
Diffstat (limited to 'include/stick20_commands.h')
| -rw-r--r-- | include/stick20_commands.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/stick20_commands.h b/include/stick20_commands.h index f4da337..eb58af7 100644 --- a/include/stick20_commands.h +++ b/include/stick20_commands.h @@ -111,7 +111,7 @@ namespace nitrokey { std::string dissect() const { std::stringstream ss; ss << "_padding:" << std::endl - << ::nitrokey::misc::hexdump((const char *) (_padding), + << ::nitrokey::misc::hexdump((const uint8_t *) (_padding), sizeof _padding); print_to_ss((int) SendCounter_u8); print_to_ss((int) SendDataType_u8); @@ -138,9 +138,9 @@ namespace nitrokey { union{ uint8_t VersionInfo_au8[4]; struct { - uint8_t __reserved; + uint8_t _reserved; uint8_t minor; - uint8_t __reserved2; + uint8_t _reserved2; uint8_t major; } __packed versionInfo; } __packed; |