[checkmk-commits] A few const-correctness fixes. More references instead of pointers.

Module: check_mk Branch: master Commit: 8e694cc8e7cb2a5c14f81d3a69007daf25b01437 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e694cc8e7cb2a… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Fri Nov 24 11:17:52 2017 +0100 A few const-correctness fixes. More references instead of pointers. Change-Id: Iff9c6dbecdd376197b2834cfab01b6e9006c3c74 --- livestatus/src/ColumnsColumn.cc | 2 +- livestatus/src/ColumnsColumn.h | 4 ++-- livestatus/src/Store.cc | 48 ++++++++++++++++++++--------------------- livestatus/src/Store.h | 2 +- livestatus/src/TableColumns.cc | 10 ++++----- livestatus/src/TableColumns.h | 7 +++--- 6 files changed, 37 insertions(+), 36 deletions(-) diff --git a/livestatus/src/ColumnsColumn.cc b/livestatus/src/ColumnsColumn.cc index 087488f..7550838 100644 --- a/livestatus/src/ColumnsColumn.cc +++ b/livestatus/src/ColumnsColumn.cc @@ -29,7 +29,7 @@ class Column; std::string ColumnsColumn::getValue(Row row) const { if (auto p = columnData<Column>(row)) { - return _table_columns->getValue(p, _colcol); + return _table_columns.getValue(p, _colcol); } return ""; } diff --git a/livestatus/src/ColumnsColumn.h b/livestatus/src/ColumnsColumn.h index b4cabc8..b4c6146 100644 --- a/livestatus/src/ColumnsColumn.h +++ b/livestatus/src/ColumnsColumn.h @@ -37,7 +37,7 @@ public: ColumnsColumn(const std::string &name, const std::string &description, int indirect_offset, int extra_offset, int extra_extra_offset, - int offset, Type colcol, TableColumns *tablecols) + int offset, Type colcol, const TableColumns &tablecols) : StringColumn(name, description, indirect_offset, extra_offset, extra_extra_offset, offset) , _colcol(colcol) @@ -46,7 +46,7 @@ public: private: const Type _colcol; - TableColumns *_table_columns; + const TableColumns &_table_columns; }; #endif // ColumnsColumn_h diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index d0ed454..556d542 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -67,32 +67,32 @@ Store::Store(MonitoringCore *mc) , _table_statehistory(mc, &_log_cache) , _table_status(mc) , _table_timeperiods(mc) { - addTable(&_table_columns); - addTable(&_table_commands); - addTable(&_table_comments); - addTable(&_table_contactgroups); - addTable(&_table_contacts); - addTable(&_table_downtimes); - addTable(&_table_hostgroups); - addTable(&_table_hostsbygroup); - addTable(&_table_hosts); - addTable(&_table_log); - addTable(&_table_servicegroups); - addTable(&_table_servicesbygroup); - addTable(&_table_servicesbyhostgroup); - addTable(&_table_services); - addTable(&_table_statehistory); - addTable(&_table_status); - addTable(&_table_timeperiods); - addTable(&_table_eventconsoleevents); - addTable(&_table_eventconsolehistory); - addTable(&_table_eventconsolestatus); - addTable(&_table_eventconsolereplication); - addTable(&_table_eventconsolerules); + addTable(_table_columns); + addTable(_table_commands); + addTable(_table_comments); + addTable(_table_contactgroups); + addTable(_table_contacts); + addTable(_table_downtimes); + addTable(_table_hostgroups); + addTable(_table_hostsbygroup); + addTable(_table_hosts); + addTable(_table_log); + addTable(_table_servicegroups); + addTable(_table_servicesbygroup); + addTable(_table_servicesbyhostgroup); + addTable(_table_services); + addTable(_table_statehistory); + addTable(_table_status); + addTable(_table_timeperiods); + addTable(_table_eventconsoleevents); + addTable(_table_eventconsolehistory); + addTable(_table_eventconsolestatus); + addTable(_table_eventconsolereplication); + addTable(_table_eventconsolerules); } -void Store::addTable(Table *table) { - _tables.emplace(table->name(), table); +void Store::addTable(Table &table) { + _tables.emplace(table.name(), &table); _table_columns.addTable(table); } diff --git a/livestatus/src/Store.h b/livestatus/src/Store.h index 4bf2881..3528df3 100644 --- a/livestatus/src/Store.h +++ b/livestatus/src/Store.h @@ -144,7 +144,7 @@ private: std::mutex _command_mutex; #endif - void addTable(Table *table); + void addTable(Table &table); Table *findTable(const std::string &name); #ifdef CMC const GlobalConfig *config() const; diff --git a/livestatus/src/TableColumns.cc b/livestatus/src/TableColumns.cc index 2a7ebbd..502cb84 100644 --- a/livestatus/src/TableColumns.cc +++ b/livestatus/src/TableColumns.cc @@ -32,23 +32,23 @@ TableColumns::TableColumns(MonitoringCore *mc) : Table(mc) { addColumn(std::make_unique<ColumnsColumn>( "table", "The name of the table", -1, -1, -1, 0, - ColumnsColumn::Type::table, this)); + ColumnsColumn::Type::table, *this)); addColumn(std::make_unique<ColumnsColumn>( "name", "The name of the column within the table", -1, -1, -1, 0, - ColumnsColumn::Type::name, this)); + ColumnsColumn::Type::name, *this)); addColumn(std::make_unique<ColumnsColumn>( "description", "A description of the column", -1, -1, -1, 0, - ColumnsColumn::Type::description, this)); + ColumnsColumn::Type::description, *this)); addColumn(std::make_unique<ColumnsColumn>( "type", "The data type of the column (int, float, string, list)", -1, - -1, -1, 0, ColumnsColumn::Type::type, this)); + -1, -1, 0, ColumnsColumn::Type::type, *this)); } std::string TableColumns::name() const { return "columns"; } std::string TableColumns::namePrefix() const { return "column_"; } -void TableColumns::addTable(Table *table) { _tables.push_back(table); } +void TableColumns::addTable(const Table &table) { _tables.push_back(&table); } void TableColumns::answerQuery(Query *query) { for (auto table : _tables) { diff --git a/livestatus/src/TableColumns.h b/livestatus/src/TableColumns.h index 2ac5ce8..61cc827 100644 --- a/livestatus/src/TableColumns.h +++ b/livestatus/src/TableColumns.h @@ -35,8 +35,6 @@ class MonitoringCore; class Query; class TableColumns : public Table { - std::vector<Table *> _tables; - public: explicit TableColumns(MonitoringCore *mc); @@ -44,10 +42,13 @@ public: std::string namePrefix() const override; void answerQuery(Query *query) override; - void addTable(Table *); + void addTable(const Table &table); std::string getValue(const Column *column, ColumnsColumn::Type colcol) const; std::string tableNameOf(const Column *column) const; + +private: + std::vector<const Table *> _tables; }; #endif // TableColumns_h