aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2016-10-24 14:44:38 +0200
committerSzczepan Zalega <szczepan@nitrokey.com>2016-11-26 18:56:22 +0100
commitec8b19e231390e25860218000d77d622d94782c7 (patch)
treecaf7dea4e4ccc990518becdb3994b8a2fc8ba480
parent24dc03cac985dd76b72f3b1982b3d1ff4535c676 (diff)
downloadlibnitrokey-ec8b19e231390e25860218000d77d622d94782c7.tar.gz
libnitrokey-ec8b19e231390e25860218000d77d622d94782c7.tar.bz2
Remove obsolete macro
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
-rw-r--r--include/stick20_commands.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/include/stick20_commands.h b/include/stick20_commands.h
index 75bce1c..b3dbacf 100644
--- a/include/stick20_commands.h
+++ b/include/stick20_commands.h
@@ -147,7 +147,6 @@ namespace nitrokey {
CommandTransaction;
};
-#define d(x) ss << " "#x":\t" << (int)x << std::endl;
class GetDeviceStatus : Command<CommandID::GET_DEVICE_STATUS> {
public:
@@ -167,10 +166,10 @@ namespace nitrokey {
std::string dissect() const {
std::stringstream ss;
- d(command_counter);
- d(last_command);
- d(status);
- d(progress_bar_value);
+ print_to_ss((int)command_counter);
+ print_to_ss((int)last_command);
+ print_to_ss((int)status);
+ print_to_ss((int)progress_bar_value);
ss << "_padding:\t"
<< ::nitrokey::misc::hexdump((const char *) (_padding),
sizeof _padding);
@@ -182,8 +181,6 @@ namespace nitrokey {
CommandTransaction;
};
-#undef d
-
// TODO fix original nomenclature
class SendSetReadonlyToUncryptedVolume : public PasswordCommand<CommandID::ENABLE_READONLY_UNCRYPTED_LUN> {};