aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2016-10-24 16:19:00 +0200
committerSzczepan Zalega <szczepan@nitrokey.com>2016-11-26 18:56:23 +0100
commit33a2d790e0a68d243bc1d9e9f75590b141d85c7f (patch)
treec3c01a9b6939c3eca40cc215e00d0b6e29ad763a
parent6eca4d657aafddcb9685df4b599a8913ac075b3a (diff)
downloadlibnitrokey-33a2d790e0a68d243bc1d9e9f75590b141d85c7f.tar.gz
libnitrokey-33a2d790e0a68d243bc1d9e9f75590b141d85c7f.tar.bz2
Fix printing macro
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
-rw-r--r--include/command.h3
-rw-r--r--include/stick20_commands.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/include/command.h b/include/command.h
index 6e3525e..5ac1d7f 100644
--- a/include/command.h
+++ b/include/command.h
@@ -18,7 +18,7 @@ namespace nitrokey {
}
};
-#define print_to_ss(x) ( ss << " #x:\t" << (x) << std::endl );
+#define print_to_ss(x) ( ss << " " << (#x) <<":\t" << (x) << std::endl );
template<CommandID cmd_id>
class PasswordCommand : public Command<cmd_id> {
@@ -48,5 +48,6 @@ namespace nitrokey {
};
}
}
+#undef print_to_ss
#endif
diff --git a/include/stick20_commands.h b/include/stick20_commands.h
index b3dbacf..5679681 100644
--- a/include/stick20_commands.h
+++ b/include/stick20_commands.h
@@ -15,7 +15,7 @@ namespace nitrokey {
* STICK20 protocol command ids
* a superset (almost) of STICK10
*/
-#define print_to_ss(x) ( ss << " #x:\t" << (x) << std::endl );
+#define print_to_ss(x) ( ss << " " << (#x) <<":\t" << (x) << std::endl );
namespace stick20 {
enum class PasswordKind : uint8_t {