[checkmk-commits] Some assorted fixes/cleanups/leftovers/...

Module: check_mk Branch: master Commit: affac47ee3765524c1b153c731686ddab28ed534 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=affac47ee37655… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Wed Jun 8 16:00:24 2016 +0200 Some assorted fixes/cleanups/leftovers/... --- agents/windows/stringutil.cc | 2 -- livestatus/src/AttributelistFilter.cc | 1 + livestatus/src/DoubleColumnFilter.cc | 1 + livestatus/src/HostlistColumnFilter.cc | 9 +++++---- livestatus/src/IntColumnFilter.cc | 1 + livestatus/src/ListColumnFilter.cc | 1 + livestatus/src/ServicelistColumnFilter.cc | 17 ++++++++--------- livestatus/src/StringColumnFilter.cc | 3 ++- 8 files changed, 19 insertions(+), 16 deletions(-) diff --git a/agents/windows/stringutil.cc b/agents/windows/stringutil.cc index f87ee09..06cb203 100644 --- a/agents/windows/stringutil.cc +++ b/agents/windows/stringutil.cc @@ -252,7 +252,6 @@ bool globmatch(const wchar_t *pattern, const wchar_t *astring) { return *p == 0; } - std::string replaceAll(const std::string &str, const std::string &from, const std::string &to) { if (from.empty()) { @@ -269,7 +268,6 @@ std::string replaceAll(const std::string &str, const std::string &from, return result; } - #ifdef _WIN32 std::string get_win_error_as_string(DWORD error_id) { // Get the error message, if any. diff --git a/livestatus/src/AttributelistFilter.cc b/livestatus/src/AttributelistFilter.cc index 67dcd0b..bd5d93b 100644 --- a/livestatus/src/AttributelistFilter.cc +++ b/livestatus/src/AttributelistFilter.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "AttributelistFilter.h" +#include <ostream> #include <string> #include "AttributelistColumn.h" #include "Logger.h" diff --git a/livestatus/src/DoubleColumnFilter.cc b/livestatus/src/DoubleColumnFilter.cc index 1b9b275..48aef66 100644 --- a/livestatus/src/DoubleColumnFilter.cc +++ b/livestatus/src/DoubleColumnFilter.cc @@ -24,6 +24,7 @@ #include "DoubleColumnFilter.h" #include <stdlib.h> +#include <ostream> #include <string> #include "DoubleColumn.h" #include "Logger.h" diff --git a/livestatus/src/HostlistColumnFilter.cc b/livestatus/src/HostlistColumnFilter.cc index f72d89b..211ac64 100644 --- a/livestatus/src/HostlistColumnFilter.cc +++ b/livestatus/src/HostlistColumnFilter.cc @@ -24,8 +24,9 @@ #include "HostlistColumnFilter.h" #include <stdlib.h> +#include <ostream> #include "HostlistColumn.h" -#include "logger.h" +#include "Logger.h" #include "nagios.h" #include "opids.h" @@ -58,9 +59,9 @@ bool HostlistColumnFilter::accepts(void *data) { case OP_LESS: return !is_member; default: - logger(LG_INFO, - "Sorry, Operator %s for host lists lists not implemented.", - op_names_plus_8[_opid]); + Informational() << "Sorry, Operator " + << nameOfRelationalOperator(_opid) + << " for host lists not implemented."; return true; } } diff --git a/livestatus/src/IntColumnFilter.cc b/livestatus/src/IntColumnFilter.cc index eb2774e..0b10d29 100644 --- a/livestatus/src/IntColumnFilter.cc +++ b/livestatus/src/IntColumnFilter.cc @@ -25,6 +25,7 @@ #include "IntColumnFilter.h" #include <stdlib.h> #include <string.h> +#include <ostream> #include "IntColumn.h" #include "Logger.h" #include "opids.h" diff --git a/livestatus/src/ListColumnFilter.cc b/livestatus/src/ListColumnFilter.cc index 34bb40a..c7eaec1 100644 --- a/livestatus/src/ListColumnFilter.cc +++ b/livestatus/src/ListColumnFilter.cc @@ -24,6 +24,7 @@ #include "ListColumnFilter.h" #include <string.h> +#include <ostream> #include <string> #include "ListColumn.h" #include "Logger.h" diff --git a/livestatus/src/ServicelistColumnFilter.cc b/livestatus/src/ServicelistColumnFilter.cc index cb00a02..9371e79 100644 --- a/livestatus/src/ServicelistColumnFilter.cc +++ b/livestatus/src/ServicelistColumnFilter.cc @@ -25,8 +25,9 @@ #include "ServicelistColumnFilter.h" #include <stdlib.h> #include <string.h> +#include <ostream> +#include "Logger.h" #include "ServicelistColumn.h" -#include "logger.h" #include "nagios.h" #include "opids.h" @@ -45,10 +46,9 @@ ServicelistColumnFilter::ServicelistColumnFilter(ServicelistColumn *column, // service_description char *sep = index(refvalue, HOSTSERVICE_SEPARATOR); if (sep == nullptr) { - logger(LG_INFO, - "Invalid reference value for service list membership. Must be " - "'hostname%cservicename'", - HOSTSERVICE_SEPARATOR); + Informational() << "Invalid reference value for service list " + "membership. Must be 'hostname" + << string(1, HOSTSERVICE_SEPARATOR) << "servicename'"; _ref_host = ""; _ref_service = ""; } else { @@ -82,10 +82,9 @@ bool ServicelistColumnFilter::accepts(void *data) { case OP_LESS: return !is_member; default: - logger( - LG_INFO, - "Sorry, Operator %s for service lists lists not implemented.", - op_names_plus_8[_opid]); + Informational() << "Sorry, Operator " + << nameOfRelationalOperator(_opid) + << " for service lists lists not implemented."; return true; } } diff --git a/livestatus/src/StringColumnFilter.cc b/livestatus/src/StringColumnFilter.cc index ca327ce..f40a53e 100644 --- a/livestatus/src/StringColumnFilter.cc +++ b/livestatus/src/StringColumnFilter.cc @@ -90,7 +90,8 @@ bool StringColumnFilter::accepts(void *data) { break; default: // this should never be reached, all operators are handled - Informational() << "Sorry. Operator " << nameOfRelationalOperator(_opid) + Informational() << "Sorry. Operator " + << nameOfRelationalOperator(_opid) << " for strings not implemented."; break; }