[checkmk-commits] clang-formatted. Removed a spurious marker.

Module: check_mk Branch: master Commit: 051b1aba4e467d3a8b0e612ffd2e1cd0fd45156d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=051b1aba4e467d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jun 27 09:20:20 2016 +0200 clang-formatted. Removed a spurious marker. --- livestatus/src/IntColumnFilter.cc | 3 ++- livestatus/src/LogEntry.cc | 1 - livestatus/src/StringColumnFilter.cc | 1 - livestatus/src/TableColumns.cc | 2 +- livestatus/src/strutil.cc | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/livestatus/src/IntColumnFilter.cc b/livestatus/src/IntColumnFilter.cc index d51db2b..335e9ad 100644 --- a/livestatus/src/IntColumnFilter.cc +++ b/livestatus/src/IntColumnFilter.cc @@ -133,7 +133,8 @@ void IntColumnFilter::findIntLimits(const string &column_name, int *lower, } } -bool IntColumnFilter::optimizeBitmask(const string &column_name, uint32_t *mask) { +bool IntColumnFilter::optimizeBitmask(const string &column_name, + uint32_t *mask) { int32_t ref_value = convertRefValue(); if (column_name != _column->name()) { diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 08c620d..6b6852b 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -288,7 +288,6 @@ void LogEntry::applyWorkarounds() { } } - bool LogEntry::handleTextEntry() { if (strncmp(_text, "LOG VERSION: 2.0", 16) == 0) { _logclass = LOGCLASS_PROGRAM; diff --git a/livestatus/src/StringColumnFilter.cc b/livestatus/src/StringColumnFilter.cc index 441a66e..7f364b0 100644 --- a/livestatus/src/StringColumnFilter.cc +++ b/livestatus/src/StringColumnFilter.cc @@ -79,7 +79,6 @@ StringColumnFilter::~StringColumnFilter() { } } - bool StringColumnFilter::accepts(void *data) { string act_string = _column->getValue(data); switch (_relOp) { diff --git a/livestatus/src/TableColumns.cc b/livestatus/src/TableColumns.cc index cf72a99..e7a061c 100644 --- a/livestatus/src/TableColumns.cc +++ b/livestatus/src/TableColumns.cc @@ -51,7 +51,7 @@ void TableColumns::answerQuery(Query *query) { } } -const char *TableColumns::getValue(Column *column, int colcol) { // xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +const char *TableColumns::getValue(Column *column, int colcol) { static const char *typenames[8] = {"int", "float", "string", "list", "time", "dict", "blob", "null"}; diff --git a/livestatus/src/strutil.cc b/livestatus/src/strutil.cc index f5c1de5..3fd8b55 100644 --- a/livestatus/src/strutil.cc +++ b/livestatus/src/strutil.cc @@ -116,4 +116,3 @@ bool starts_with(const char *lhs, const char *rhs) { // difference found before end of prefix return false; } -