diff options
| author | Szczepan Zalega <szczepan@nitrokey.com> | 2020-07-28 11:50:38 +0200 | 
|---|---|---|
| committer | Szczepan Zalega <szczepan@nitrokey.com> | 2020-07-28 11:50:38 +0200 | 
| commit | 080b88a018e0cca01d3e89ef264173c332ab4eeb (patch) | |
| tree | b3d1652fea8c1533777fef4ad7091285f312ac18 | |
| parent | 89a73d88c9026b6347bea113896d24e419c4370c (diff) | |
| download | libnitrokey-080b88a018e0cca01d3e89ef264173c332ab4eeb.tar.gz libnitrokey-080b88a018e0cca01d3e89ef264173c332ab4eeb.tar.bz2 | |
Add missing macro for the NO_LOG feature switch, and cut other strings expl.
| -rw-r--r-- | command_id.cc | 3 | ||||
| -rw-r--r-- | device.cc | 4 | ||||
| -rw-r--r-- | libnitrokey/log.h | 1 | 
3 files changed, 8 insertions, 0 deletions
| diff --git a/command_id.cc b/command_id.cc index 9a329bc..90f300f 100644 --- a/command_id.cc +++ b/command_id.cc @@ -26,6 +26,9 @@ namespace nitrokey {  namespace proto {  const char *commandid_to_string(CommandID id) { +#ifdef NO_LOG +  return ""; +#endif    switch (id) {      case CommandID::GET_STATUS:        return "GET_STATUS"; @@ -350,6 +350,10 @@ LibremKey::LibremKey():  #include <sstream>  #define p(x) ss << #x << " " << x << ", ";  std::string Device::ErrorCounters::get_as_string() { +#ifdef NO_LOG +  return ""; +#endif +    std::stringstream ss;    p(total_comm_runs);    p(communication_successful); diff --git a/libnitrokey/log.h b/libnitrokey/log.h index 278b49c..eade68f 100644 --- a/libnitrokey/log.h +++ b/libnitrokey/log.h @@ -100,6 +100,7 @@ namespace nitrokey {  #ifdef NO_LOG  #define LOG(string, level) while(false){}  #define LOGD(string) while(false){} +#define LOGD1(string) while(false){}  #else  #define LOG(string, level) nitrokey::log::Log::instance()((string), (level))  #define LOGD1(string) nitrokey::log::Log::instance()((string), (nitrokey::log::Loglevel::DEBUG_L1)) | 
