From e3b51bcadc0bca4164c1fd1df12e52e4f69d2c26 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Fri, 31 Jul 2020 13:33:39 +0200 Subject: Remove redundant iostream inclusions --- NK_C_API.cc | 8 +++++++- NK_C_API_helpers.h | 1 - NK_C_API_otp.cpp | 1 - NK_C_API_pws.cpp | 1 - NitrokeyManager.cc | 1 - NitrokeyManagerPWS.cc | 1 - device.cc | 1 - 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NK_C_API.cc b/NK_C_API.cc index 5460a92..951532b 100644 --- a/NK_C_API.cc +++ b/NK_C_API.cc @@ -20,7 +20,9 @@ */ #include "NK_C_API.h" +#ifndef NO_LOG #include +#endif #include #include "libnitrokey/NitrokeyManager.h" #include @@ -63,11 +65,15 @@ extern "C" { } catch (const DeviceCommunicationException &deviceException){ NK_last_command_status = 256-deviceException.getType(); +#ifndef NO_LOG cerr << deviceException.what() << endl; +#endif return 0; } catch (std::runtime_error &e) { - cerr << e.what() << endl; +#ifndef NO_LOG + cerr << e.what() << endl; +#endif return 0; } return 0; diff --git a/NK_C_API_helpers.h b/NK_C_API_helpers.h index c5241be..3cb110b 100644 --- a/NK_C_API_helpers.h +++ b/NK_C_API_helpers.h @@ -3,7 +3,6 @@ #include "NK_C_API.h" -#include #include #include "libnitrokey/NitrokeyManager.h" #include diff --git a/NK_C_API_otp.cpp b/NK_C_API_otp.cpp index cc44ffc..c1f2e1b 100644 --- a/NK_C_API_otp.cpp +++ b/NK_C_API_otp.cpp @@ -10,7 +10,6 @@ #include "libnitrokey/stick20_commands.h" #include "libnitrokey/version.h" #include -#include #include #include "nk_strndup.h" diff --git a/NK_C_API_pws.cpp b/NK_C_API_pws.cpp index 27ca406..d3df05d 100644 --- a/NK_C_API_pws.cpp +++ b/NK_C_API_pws.cpp @@ -10,7 +10,6 @@ #include "libnitrokey/stick20_commands.h" #include "libnitrokey/version.h" #include -#include #include #include "nk_strndup.h" diff --git a/NitrokeyManager.cc b/NitrokeyManager.cc index 0d566d2..15fbdf1 100644 --- a/NitrokeyManager.cc +++ b/NitrokeyManager.cc @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include diff --git a/NitrokeyManagerPWS.cc b/NitrokeyManagerPWS.cc index 5e7c9b7..c4a47eb 100644 --- a/NitrokeyManagerPWS.cc +++ b/NitrokeyManagerPWS.cc @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include diff --git a/device.cc b/device.cc index 1204c1e..fc65feb 100644 --- a/device.cc +++ b/device.cc @@ -21,7 +21,6 @@ #include #include -#include #include #include #include -- cgit v1.2.1