[checkmk-commits] Fixed nonsense types.

Module: check_mk Branch: master Commit: 52419c2ac66e96b31d621b0ee9ce17e7f4e7c83c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52419c2ac66e96… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Tue Feb 26 18:45:43 2019 +0100 Fixed nonsense types. Change-Id: I740fe38954a36f0e8946fb03d5757f6b04424f34 --- livestatus/src/LogCache.cc | 15 +++++---------- livestatus/src/LogCache.h | 4 ++-- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 9ca69ab..8822c92 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -114,8 +114,7 @@ void LogCache::addToIndex(std::unique_ptr<Logfile> logfile) { not the messages that just has been loaded. */ void LogCache::logLineHasBeenAdded(Logfile *logfile, unsigned logclasses) { - if (static_cast<unsigned long>(++_num_cached_log_messages) <= - _max_cached_messages) { + if (++_num_cached_log_messages <= _max_cached_messages) { return; // current message count still allowed, everything ok } @@ -125,8 +124,7 @@ void LogCache::logLineHasBeenAdded(Logfile *logfile, unsigned logclasses) { memory can be freed. We do this by suppressing the check when the number of messages loaded into memory has not grown by at least check_mem_cycle messages */ - if (static_cast<unsigned long>(_num_cached_log_messages) < - _num_at_last_check + check_mem_cycle) { + if (_num_cached_log_messages < _num_at_last_check + check_mem_cycle) { return; // Do not check this time } @@ -141,8 +139,7 @@ void LogCache::logLineHasBeenAdded(Logfile *logfile, unsigned logclasses) { if (it->second->size() > 0) { _num_cached_log_messages -= it->second->size(); it->second->flush(); // drop all messages of that file - if (static_cast<unsigned long>(_num_cached_log_messages) <= - _max_cached_messages) { + if (_num_cached_log_messages <= _max_cached_messages) { // remember the number of log messages in cache when // the last memory-release was done. No further // release-check shall be done until that number changes. @@ -167,8 +164,7 @@ void LogCache::logLineHasBeenAdded(Logfile *logfile, unsigned logclasses) { // flush only messages not needed for current query long freed = it->second->freeMessages(~logclasses); _num_cached_log_messages -= freed; - if (static_cast<unsigned long>(_num_cached_log_messages) <= - _max_cached_messages) { + if (_num_cached_log_messages <= _max_cached_messages) { _num_at_last_check = _num_cached_log_messages; return; } @@ -185,8 +181,7 @@ void LogCache::logLineHasBeenAdded(Logfile *logfile, unsigned logclasses) { << " number of entries"; _num_cached_log_messages -= it->second->size(); it->second->flush(); - if (static_cast<unsigned long>(_num_cached_log_messages) <= - _max_cached_messages) { + if (_num_cached_log_messages <= _max_cached_messages) { _num_at_last_check = _num_cached_log_messages; return; } diff --git a/livestatus/src/LogCache.h b/livestatus/src/LogCache.h index 138f4d1..5b8954e 100644 --- a/livestatus/src/LogCache.h +++ b/livestatus/src/LogCache.h @@ -54,8 +54,8 @@ public: private: MonitoringCore *const _mc; size_t _num_cached_log_messages; - unsigned long _max_cached_messages; - unsigned long _num_at_last_check; + size_t _max_cached_messages; + size_t _num_at_last_check; logfiles_t _logfiles; std::chrono::system_clock::time_point _last_index_update;