Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

cppcheck-induced cleanup: Disable copy/assignment for unsuitable class.

by Sven Panne

Module: check_mk Branch: master Commit: 1ee3eeef40cb4d669e16ca494115711f48824e9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ee3eeef40cb4d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 10 09:10:53 2015 +0100 cppcheck-induced cleanup: Disable copy/assignment for unsuitable class. --- livestatus/src/OutputBuffer.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/livestatus/src/OutputBuffer.h b/livestatus/src/OutputBuffer.h index df5e7bd..eb0fe56 100644 --- a/livestatus/src/OutputBuffer.h +++ b/livestatus/src/OutputBuffer.h @@ -52,6 +52,11 @@ class OutputBuffer std::string _error_message; bool _do_keepalive; + // We use dynamically allocated memory => disable copy/assignment + // TODO: Just use vector instead of all this manual fiddling... + OutputBuffer(const OutputBuffer&); + OutputBuffer& operator=(const OutputBuffer&); + public: OutputBuffer(); ~OutputBuffer();

8 years, 7 months

cppcheck-induced cleanup: Prefer prefix increment/decrement (doesn' t involve temporaries).

by Sven Panne

Module: check_mk Branch: master Commit: 1ffbc6d7c48bb1598068b510126100dc52c5c7d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ffbc6d7c48bb1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 10 09:05:06 2015 +0100 cppcheck-induced cleanup: Prefer prefix increment/decrement (doesn't involve temporaries). --- livestatus/src/TableStateHistory.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index ac45c4e..a91b714 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -200,7 +200,7 @@ LogEntry *TableStateHistory::getPreviousLogentry() if (_it_logs == g_store->logCache()->logfiles()->begin()) return 0; else { - _it_logs--; + --_it_logs; _entries = _it_logs->second->getEntriesFromQuery(_query, g_store->logCache(), _since, _until, CLASSMASK_STATEHIST); _it_entries = _entries->end(); } @@ -354,7 +354,7 @@ void TableStateHistory::answerQuery(Query *query) while (it_hst != state_info.end()) { it_hst->second->_from = _since; it_hst->second->_until = _since; - it_hst++; + ++it_hst; } only_update = false; } @@ -368,7 +368,7 @@ void TableStateHistory::answerQuery(Query *query) if (hst->_may_no_longer_exist) { hst->_has_vanished = true; } - it_hst++; + ++it_hst; } in_nagios_initial_states = false; } @@ -459,7 +459,7 @@ void TableStateHistory::answerQuery(Query *query) if (it_inh->second->_host == state->_host){ state->_services.push_back(it_inh->second); } - it_inh++; + ++it_inh; } } else { state_info_t::iterator it_inh = state_info.find(state->_host); @@ -554,7 +554,7 @@ void TableStateHistory::answerQuery(Query *query) HostServices::iterator it_svc = state->_services.begin(); while (it_svc != state->_services.end()) { updateHostServiceState(query, entry, *it_svc, only_update); - it_svc++; + ++it_svc; } } } @@ -580,7 +580,7 @@ void TableStateHistory::answerQuery(Query *query) state_info_t::iterator it_hst = state_info.begin(); while (it_hst != state_info.end()) { updateHostServiceState(query, entry, it_hst->second, only_update); - it_hst++; + ++it_hst; } free(buffer); break; @@ -597,7 +597,7 @@ void TableStateHistory::answerQuery(Query *query) it_hst->second->_last_known_time = entry->_time; it_hst->second->_may_no_longer_exist = true; } - it_hst++; + ++it_hst; } in_nagios_initial_states = true; break; @@ -632,7 +632,7 @@ void TableStateHistory::answerQuery(Query *query) hst->_until = hst->_time; process(query, hst); - it_hst++; + ++it_hst; } } @@ -640,7 +640,7 @@ void TableStateHistory::answerQuery(Query *query) it_hst = state_info.begin(); while (it_hst != state_info.end()) { delete it_hst->second; - it_hst++; + ++it_hst; } state_info.clear(); object_blacklist.clear();

8 years, 7 months

cppcheck-induced cleanup: Fixed format string.

by Sven Panne

Module: check_mk Branch: master Commit: f3d982089fcc4cca293ec55add89891fe81efd01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3d982089fcc4c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 10 09:01:55 2015 +0100 cppcheck-induced cleanup: Fixed format string. --- livestatus/src/OutputBuffer.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/OutputBuffer.cc b/livestatus/src/OutputBuffer.cc index c3b8c1e..bc1d1fe 100644 --- a/livestatus/src/OutputBuffer.cc +++ b/livestatus/src/OutputBuffer.cc @@ -116,7 +116,7 @@ void OutputBuffer::flush(int fd, int *termination_flag) } char header[17]; - snprintf(header, sizeof(header), "%03d %11d\n", _response_code, s); + snprintf(header, sizeof(header), "%03u %11d\n", _response_code, s); writeData(fd, termination_flag, header, 16); writeData(fd, termination_flag, buffer, s); }

8 years, 7 months

cppcheck-induced cleanup: Prefer empty() over size().

by Sven Panne

Module: check_mk Branch: master Commit: 9b5fd51c47970e7663e71f6da8c62053fe09605a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b5fd51c47970e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 10 09:00:00 2015 +0100 cppcheck-induced cleanup: Prefer empty() over size(). --- livestatus/src/LogCache.cc | 2 +- livestatus/src/TableStateHistory.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 78fdb69..5248c3e 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -111,7 +111,7 @@ bool LogCache::logCachePreChecks() { // Do we have any logfiles (should always be the case, // but we don't want to crash... - if (_logfiles.size() == 0) { + if (_logfiles.empty()) { logger(LOG_INFO, "Warning: no logfile found, not even %s", log_file); return false; } diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 63c1227..ac45c4e 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -322,7 +322,7 @@ void TableStateHistory::answerQuery(Query *query) // Determine initial logentry LogEntry* entry; _entries = _it_logs->second->getEntriesFromQuery(query, g_store->logCache(), _since, _until, CLASSMASK_STATEHIST); - if (_entries->size() > 0 &&_it_logs != newest_log) { + if (!_entries->empty() &&_it_logs != newest_log) { _it_entries = _entries->end(); // Check last entry. If it's younger than _since -> use this logfile too if (--_it_entries != _entries->begin()) {

8 years, 7 months

cppcheck-induced cleanup: Initialize members.

by Sven Panne

Module: check_mk Branch: master Commit: e402a1f004dc14e6771810cdab5cf7a14c3ffd4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e402a1f004dc14… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 10 08:56:43 2015 +0100 cppcheck-induced cleanup: Initialize members. --- Makefile | 2 +- livestatus/src/Filter.h | 2 +- livestatus/src/InputBuffer.cc | 7 ++++++- livestatus/src/Logfile.cc | 5 +++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 254cdcd..fa7dc24 100644 --- a/Makefile +++ b/Makefile @@ -250,7 +250,7 @@ iwyu: $(MAKE) -C livestatus CC=$(IWYU) CXX=$(IWYU) -k cppcheck: - $(CPPCHECK) --enable=all --template=gcc livestatus + $(CPPCHECK) --enable=all --inline-suppr --template=gcc livestatus # Note: You need the doxygen and graphviz packages. documentation: diff --git a/livestatus/src/Filter.h b/livestatus/src/Filter.h index cfd9d2a..6b26647 100644 --- a/livestatus/src/Filter.h +++ b/livestatus/src/Filter.h @@ -43,7 +43,7 @@ protected: void setError(unsigned code, const char *format, ...); public: - Filter() : _column(0), _query(0) {} + Filter() : _error_code(0), _column(0), _query(0) {} virtual ~Filter() {} virtual bool isAndingFilter() { return false; } virtual bool isNegatingFilter() { return false; } diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc index 36b98eb..3a385d7 100644 --- a/livestatus/src/InputBuffer.cc +++ b/livestatus/src/InputBuffer.cc @@ -40,8 +40,13 @@ extern int g_idle_timeout_msec; bool timeout_reached(const struct timeval *, int); +// TODO: We need the suppression pragma below because _readahead_buffer is not +// initialized in the constructor. Just replace all this manual fiddling with +// pointers, offsets, etc. with vector. + +// cppcheck-suppress uninitMemberVar InputBuffer::InputBuffer(int *termination_flag) - : _termination_flag(termination_flag) + : _fd(-1), _termination_flag(termination_flag) { _read_pointer = &_readahead_buffer[0]; // points to data not yet processed _write_pointer = _read_pointer; // points to end of data in buffer diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 45547b8..dd3d934 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -46,6 +46,11 @@ using std::make_pair; extern unsigned long g_max_lines_per_logfile; +// TODO: We need the suppression pragma below because _readpos and _linebuffer +// is not initialized in the constructor. Just replace all this manual fiddling +// with pointers, offsets, etc. with vector. + +// cppcheck-suppress uninitMemberVar Logfile::Logfile(const char *path, bool watch) : _path(strdup(path)) , _since(0)

8 years, 7 months

cppcheck-induced cleanup: Reduce scopes.

by Sven Panne

Module: check_mk Branch: master Commit: 1aafc71d5b9d765c4137755f22d6d64c3dde2217 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1aafc71d5b9d76… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 10 08:30:48 2015 +0100 cppcheck-induced cleanup: Reduce scopes. --- livestatus/src/DownCommColumn.cc | 3 +-- livestatus/src/ServiceSpecialDoubleColumn.cc | 3 +-- livestatus/src/TableHosts.cc | 3 +-- livestatus/src/TableServices.cc | 3 +-- livestatus/src/TableStateHistory.cc | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/livestatus/src/DownCommColumn.cc b/livestatus/src/DownCommColumn.cc index 7a88e54..96b4e96 100644 --- a/livestatus/src/DownCommColumn.cc +++ b/livestatus/src/DownCommColumn.cc @@ -45,7 +45,6 @@ void DownCommColumn::output(void *data, Query *query) if (data) { bool first = true; - bool found_match = false; for (map<pair<unsigned long, bool>, DowntimeOrComment *>::iterator it = table->entriesIteratorBegin(); it != table->entriesIteratorEnd(); @@ -55,7 +54,7 @@ void DownCommColumn::output(void *data, Query *query) bool is_service = it->first.second; DowntimeOrComment *dt = it->second; - found_match = false; + bool found_match = false; if (!is_service){ if (dt->_host->name == ((host*)data)->name) diff --git a/livestatus/src/ServiceSpecialDoubleColumn.cc b/livestatus/src/ServiceSpecialDoubleColumn.cc index 7e88a06..6e9c1b1 100644 --- a/livestatus/src/ServiceSpecialDoubleColumn.cc +++ b/livestatus/src/ServiceSpecialDoubleColumn.cc @@ -47,10 +47,9 @@ double ServiceSpecialDoubleColumn::getValue(void *data) bool is_cmk_passive = !strncmp(svc->check_command_ptr->name, "check_mk-", 9); if (is_cmk_passive) { host *host = svc->host_ptr; - service *tmp_svc; servicesmember *svc_member = host->services; while (svc_member != 0) { - tmp_svc = svc_member->service_ptr; + service *tmp_svc = svc_member->service_ptr; if (!strncmp(tmp_svc->check_command_ptr->name, "check-mk", 9)) { return check_result_age / ((tmp_svc->check_interval == 0 ? 1 : tmp_svc->check_interval) * interval_length); } diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index 71cccfb..af4734f 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -375,14 +375,13 @@ void TableHosts::answerQuery(Query *query) if (_by_group) { hostgroup *hgroup = hostgroup_list; hostbygroup hg; - bool show_hgroup; // When g_group_authorization is set to AUTH_STRICT we need to pre-check // if every host of this group is visible to the _auth_user bool requires_precheck = query->authUser() && g_group_authorization == AUTH_STRICT; while (hgroup) { - show_hgroup = true; + bool show_hgroup = true; hg._hostgroup = hgroup; hostsmember *mem = hgroup->members; if (requires_precheck) { diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index 5049949..9b0f2dd 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -71,14 +71,13 @@ void TableServices::answerQuery(Query *query) if (_by_group) { servicegroup *sgroup = servicegroup_list; servicebygroup sg; - bool show_sgroup; // When g_group_authorization is set to AUTH_STRICT we need to pre-check // if every service of this group is visible to the _auth_user bool requires_precheck = query->authUser() && g_group_authorization == AUTH_STRICT; while (sgroup) { - show_sgroup = true; + bool show_sgroup = true; sg._servicegroup = sgroup; servicesmember *mem = sgroup->members; if (requires_precheck) { diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 68d139f..63c1227 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -335,7 +335,6 @@ void TableStateHistory::answerQuery(Query *query) _it_entries = _entries->begin(); // From now on use getPreviousLogentry() / getNextLogentry() - HostServiceKey key; bool only_update = true; bool in_nagios_initial_states = false; @@ -374,7 +373,7 @@ void TableStateHistory::answerQuery(Query *query) in_nagios_initial_states = false; } - key = 0; + HostServiceKey key = 0; bool is_service = false; switch (entry->_type) { case NONE:

8 years, 7 months

cppcheck-induced cleanup: Prefer C++ casts.

by Sven Panne

Module: check_mk Branch: master Commit: 20130a7c202038a1fc69234036b8bf3cde5775d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20130a7c202038… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 10 08:28:49 2015 +0100 cppcheck-induced cleanup: Prefer C++ casts. --- livestatus/src/ColumnsColumn.cc | 2 +- livestatus/src/DownCommColumn.cc | 2 +- livestatus/src/StatsColumn.cc | 12 ++++++------ livestatus/src/TableDownComm.cc | 2 +- livestatus/src/TableLog.cc | 2 +- livestatus/src/TableStateHistory.cc | 2 +- livestatus/src/store_c.cc | 10 +++++----- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/livestatus/src/ColumnsColumn.cc b/livestatus/src/ColumnsColumn.cc index 3216579..16c6eac 100644 --- a/livestatus/src/ColumnsColumn.cc +++ b/livestatus/src/ColumnsColumn.cc @@ -29,6 +29,6 @@ class Column; char *ColumnsColumn::getValue(void *data) { - Column *column = (Column *)data; + Column *column = static_cast<Column *>(data); return (char *)_table_columns->getValue(column, _colcol); } diff --git a/livestatus/src/DownCommColumn.cc b/livestatus/src/DownCommColumn.cc index 17ade80..7a88e54 100644 --- a/livestatus/src/DownCommColumn.cc +++ b/livestatus/src/DownCommColumn.cc @@ -81,7 +81,7 @@ void DownCommColumn::output(void *data, Query *query) query->outputString(dt->_comment); if(_with_extra_info && !_is_downtime) { query->outputSublistSeparator(); - query->outputInteger(((Comment*)dt)->_entry_type); + query->outputInteger(static_cast<Comment*>(dt)->_entry_type); query->outputSublistSeparator(); query->outputTime(dt->_entry_time); } diff --git a/livestatus/src/StatsColumn.cc b/livestatus/src/StatsColumn.cc index 9688813..b3729a5 100644 --- a/livestatus/src/StatsColumn.cc +++ b/livestatus/src/StatsColumn.cc @@ -26,13 +26,13 @@ #include "Column.h" #include "CountAggregator.h" #include "DoubleAggregator.h" +#include "DoubleColumn.h" #include "Filter.h" #include "IntAggregator.h" +#include "IntColumn.h" #include "PerfdataAggregator.h" +#include "StringColumn.h" #include "strutil.h" -class DoubleColumn; -class IntColumn; -class StringColumn; StatsColumn::~StatsColumn() @@ -47,11 +47,11 @@ Aggregator *StatsColumn::createAggregator() if (_operation == STATS_OP_COUNT) return new CountAggregator(_filter); else if (_column->type() == COLTYPE_INT || _column->type() == COLTYPE_TIME) - return new IntAggregator((IntColumn *)_column, _operation); + return new IntAggregator(static_cast<IntColumn *>(_column), _operation); else if (_column->type() == COLTYPE_DOUBLE) - return new DoubleAggregator((DoubleColumn *)_column, _operation); + return new DoubleAggregator(static_cast<DoubleColumn *>(_column), _operation); else if (_column->type() == COLTYPE_STRING and ends_with(_column->name(), "perf_data")) - return new PerfdataAggregator((StringColumn *)_column, _operation); + return new PerfdataAggregator(static_cast<StringColumn *>(_column), _operation); else // unaggregateble column return new CountAggregator(_filter); } diff --git a/livestatus/src/TableDownComm.cc b/livestatus/src/TableDownComm.cc index bfcca21..3b192fa 100644 --- a/livestatus/src/TableDownComm.cc +++ b/livestatus/src/TableDownComm.cc @@ -165,7 +165,7 @@ void TableDownComm::answerQuery(Query *query) bool TableDownComm::isAuthorized(contact *ctc, void *data) { - DowntimeOrComment *dtc = (DowntimeOrComment *)data; + DowntimeOrComment *dtc = static_cast<DowntimeOrComment *>(data); return is_authorized_for(ctc, dtc->_host, dtc->_service); } diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index da93b62..6d19b8a 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -164,7 +164,7 @@ void TableLog::answerQuery(Query *query) bool TableLog::isAuthorized(contact *ctc, void *data) { - LogEntry *entry = (LogEntry *)data; + LogEntry *entry = static_cast<LogEntry *>(data); service *svc = entry->_service; host *hst = entry->_host; diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 21a976e..68d139f 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -879,7 +879,7 @@ void TableStateHistory::process(Query *query, HostServiceState *hs_state) bool TableStateHistory::isAuthorized(contact *ctc, void *data) { - HostServiceState *entry = (HostServiceState *)data; + HostServiceState *entry = static_cast<HostServiceState *>(data); service *svc = entry->_service; host *hst = entry->_host; diff --git a/livestatus/src/store_c.cc b/livestatus/src/store_c.cc index 5f5e61a..c36af2f 100644 --- a/livestatus/src/store_c.cc +++ b/livestatus/src/store_c.cc @@ -85,7 +85,7 @@ void store_register_downtime(nebstruct_downtime_data *d) int store_answer_request(void *ib, void *ob) { - return g_store->answerRequest((InputBuffer *)ib, (OutputBuffer *)ob); + return g_store->answerRequest(static_cast<InputBuffer *>(ib), static_cast<OutputBuffer *>(ob)); } void *create_outputbuffer() @@ -95,12 +95,12 @@ void *create_outputbuffer() void flush_output_buffer(void *ob, int fd, int *termination_flag) { - ((OutputBuffer *)ob)->flush(fd, termination_flag); + static_cast<OutputBuffer *>(ob)->flush(fd, termination_flag); } void delete_outputbuffer(void *ob) { - delete (OutputBuffer *)ob; + delete static_cast<OutputBuffer *>(ob); } void *create_inputbuffer(int *termination_flag) @@ -110,12 +110,12 @@ void *create_inputbuffer(int *termination_flag) void set_inputbuffer_fd(void *ib, int fd) { - ((InputBuffer *)ib)->setFd(fd); + static_cast<InputBuffer *>(ib)->setFd(fd); } void delete_inputbuffer(void *ib) { - delete (InputBuffer *)ib; + delete static_cast<InputBuffer *>(ib); } void update_timeperiods_cache(time_t now)

8 years, 7 months

cppcheck-induced cleanup: Added missing 'explicit's.

by Sven Panne

Module: check_mk Branch: master Commit: aaf5c5c1c428bc9e85946cef726f9b0c732b5d76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aaf5c5c1c428bc… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 10 08:14:19 2015 +0100 cppcheck-induced cleanup: Added missing 'explicit's. --- livestatus/src/Aggregator.h | 2 +- livestatus/src/CountAggregator.h | 2 +- livestatus/src/DowntimeOrComment.h | 4 ++-- livestatus/src/InputBuffer.h | 2 +- livestatus/src/LogCache.h | 2 +- livestatus/src/NegatingFilter.h | 2 +- livestatus/src/TableDownComm.h | 2 +- livestatus/src/TableHosts.h | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/livestatus/src/Aggregator.h b/livestatus/src/Aggregator.h index d39e45e..89c62d2 100644 --- a/livestatus/src/Aggregator.h +++ b/livestatus/src/Aggregator.h @@ -35,7 +35,7 @@ protected: int _operation; uint32_t _count; public: - Aggregator(int o) : _operation(o), _count(0) {} + explicit Aggregator(int o) : _operation(o), _count(0) {} virtual ~Aggregator() {} virtual void consume(void *data, Query *) = 0; virtual void output(Query *) = 0; diff --git a/livestatus/src/CountAggregator.h b/livestatus/src/CountAggregator.h index ebf2542..5adfe14 100644 --- a/livestatus/src/CountAggregator.h +++ b/livestatus/src/CountAggregator.h @@ -36,7 +36,7 @@ class CountAggregator : public Aggregator { Filter *_filter; public: - CountAggregator(Filter *f) : Aggregator(STATS_OP_COUNT), _filter(f) {} + explicit CountAggregator(Filter *f) : Aggregator(STATS_OP_COUNT), _filter(f) {} void consume(void *data, Query *); void output(Query *); }; diff --git a/livestatus/src/DowntimeOrComment.h b/livestatus/src/DowntimeOrComment.h index 4f00382..0f6dd22 100644 --- a/livestatus/src/DowntimeOrComment.h +++ b/livestatus/src/DowntimeOrComment.h @@ -101,7 +101,7 @@ struct Downtime : public DowntimeOrComment int _fixed; int _duration; int _triggered_by; - Downtime(nebstruct_downtime_struct *data); + explicit Downtime(nebstruct_downtime_struct *data); }; struct Comment : public DowntimeOrComment @@ -111,7 +111,7 @@ struct Comment : public DowntimeOrComment int _source; int _entry_type; int _expires; - Comment(nebstruct_comment_struct *data); + explicit Comment(nebstruct_comment_struct *data); }; #endif // Downtime_h diff --git a/livestatus/src/InputBuffer.h b/livestatus/src/InputBuffer.h index 46c4209..58a7dee 100644 --- a/livestatus/src/InputBuffer.h +++ b/livestatus/src/InputBuffer.h @@ -56,7 +56,7 @@ class InputBuffer // some buffer public: - InputBuffer(int *termination_flag); + explicit InputBuffer(int *termination_flag); void setFd(int fd); int readRequest(); bool moreLines() { return !_requestlines.empty(); } diff --git a/livestatus/src/LogCache.h b/livestatus/src/LogCache.h index bcc335b..aeab869 100644 --- a/livestatus/src/LogCache.h +++ b/livestatus/src/LogCache.h @@ -44,7 +44,7 @@ class LogCache _logfiles_t _logfiles; public: - LogCache(unsigned long max_cached_messages); + explicit LogCache(unsigned long max_cached_messages); ~LogCache(); void setMaxCachedMessages(unsigned long m); time_t _last_index_update; diff --git a/livestatus/src/NegatingFilter.h b/livestatus/src/NegatingFilter.h index 9d3ab71..100b069 100644 --- a/livestatus/src/NegatingFilter.h +++ b/livestatus/src/NegatingFilter.h @@ -32,7 +32,7 @@ class NegatingFilter : public Filter { Filter *_filter; public: - NegatingFilter(Filter *filter) : _filter(filter) {} + explicit NegatingFilter(Filter *filter) : _filter(filter) {} ~NegatingFilter() { delete _filter; } bool isNegatingFilter() { return true; } Filter *subfilter() { return _filter; } diff --git a/livestatus/src/TableDownComm.h b/livestatus/src/TableDownComm.h index 06cfe0e..f3c8de2 100644 --- a/livestatus/src/TableDownComm.h +++ b/livestatus/src/TableDownComm.h @@ -43,7 +43,7 @@ class TableDownComm : public Table _entries_t _entries; public: - TableDownComm(bool is_downtime); + explicit TableDownComm(bool is_downtime); const char *name() { return _name; } ~TableDownComm(); DowntimeOrComment *findEntry(unsigned long id, bool is_service); diff --git a/livestatus/src/TableHosts.h b/livestatus/src/TableHosts.h index cabe433..357d758 100644 --- a/livestatus/src/TableHosts.h +++ b/livestatus/src/TableHosts.h @@ -36,7 +36,7 @@ class TableHosts : public Table { bool _by_group; public: - TableHosts(bool by_group); + explicit TableHosts(bool by_group); const char *name() { return _by_group ? "hostsbygroup" : "hosts"; } const char *prefixname() { return "hosts"; } bool isAuthorized(contact *ctc, void *data);

8 years, 7 months

Added doxygen support.

by Sven Panne

Module: check_mk Branch: master Commit: 764f1f9f63d521b4cddf5651487c69ca2f91993c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=764f1f9f63d521… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 10 07:56:22 2015 +0100 Added doxygen support. --- .gitignore | 1 + Makefile | 9 +- doc/Doxyfile | 2386 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ doc/logo_mk.png | Bin 0 -> 4027 bytes 4 files changed, 2394 insertions(+), 2 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=764f1f9f63…

8 years, 7 months

Added cppcheck target.

by Sven Panne

Module: check_mk Branch: master Commit: 7b150a65804539c33110059c6b16a12bbf2a2354 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b150a65804539… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 10 07:42:26 2015 +0100 Added cppcheck target. --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 888289f..d1d52f8 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,7 @@ DISTNAME = $(NAME)-$(VERSION) TAROPTS = --owner=root --group=root --exclude=.svn --exclude=*~ \ --exclude=.gitignore --exclude=*.swp --exclude=.f12 IWYU = include-what-you-use +CPPCHECK = cppcheck # File to pack into livestatus-$(VERSION).tar.gz LIVESTATUS_SOURCES = configure aclocal.m4 config.guess config.h.in config.sub \ @@ -55,7 +56,7 @@ HEAL_SPACES_IN = checkman/* modules/* checks/* notifications/* inventory/* \ $$(find agents/plugins -type f) .PHONY: all check-binaries check check-permissions check-spaces check-version \ - clean dist headers healspaces help iwyu minify-js mk-eventd \ + clean cppcheck dist headers healspaces help iwyu minify-js mk-eventd \ mk-livestatus mrproper optimize-images packages setup setversion version all: dist packages @@ -246,3 +247,6 @@ setup: iwyu: $(MAKE) -C livestatus clean $(MAKE) -C livestatus CC=$(IWYU) CXX=$(IWYU) -k + +cppcheck: + $(CPPCHECK) --enable=all --template=gcc livestatus

8 years, 7 months

← Newer
1
...
17
18
19
20
21
22
23
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2015