Module: check_mk
Branch: master
Commit: ccfd1a06fdae10d6d4e335ed48f50daeceecc304
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ccfd1a06fdae10…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Wed Aug 16 11:41:30 2017 +0200
Const-corrected OffsetStringMacroColumn.
Change-Id: Ifd13ac57f7df48622428071c7250ff8a5f827dba
---
livestatus/src/OffsetStringMacroColumn.cc | 10 +++++-----
livestatus/src/OffsetStringMacroColumn.h | 12 ++++++------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/livestatus/src/OffsetStringMacroColumn.cc
b/livestatus/src/OffsetStringMacroColumn.cc
index 3ee09e2..e77cc82 100644
--- a/livestatus/src/OffsetStringMacroColumn.cc
+++ b/livestatus/src/OffsetStringMacroColumn.cc
@@ -40,8 +40,8 @@ extern char *macro_user[MAX_USER_MACROS];
void OffsetStringMacroColumn::output(Row row, RowRenderer &r,
const contact * /*unused*/) const {
string raw = getValue(row);
- host *hst = getHost(row);
- service *svc = getService(row);
+ const host *hst = getHost(row);
+ const service *svc = getService(row);
// search for macro names, beginning with $
string result;
@@ -80,8 +80,8 @@ unique_ptr<Filter> OffsetStringMacroColumn::createFilter(
}
const char *OffsetStringMacroColumn::expandMacro(const char *macroname,
- host *hst,
- service *svc) const {
+ const host *hst,
+ const service *svc) const {
// host macros
if (strcmp(macroname, "HOSTNAME") == 0) {
return hst->name;
@@ -156,7 +156,7 @@ const char *OffsetStringMacroColumn::expandMacro(const char
*macroname,
}
const char *OffsetStringMacroColumn::expandCustomVariables(
- const char *varname, customvariablesmember *custvars) const {
+ const char *varname, const customvariablesmember *custvars) const {
for (; custvars != nullptr; custvars = custvars->next) {
if (strcasecmp(varname, custvars->variable_name) == 0) {
return custvars->variable_value;
diff --git a/livestatus/src/OffsetStringMacroColumn.h
b/livestatus/src/OffsetStringMacroColumn.h
index bd0ef1c..773e517 100644
--- a/livestatus/src/OffsetStringMacroColumn.h
+++ b/livestatus/src/OffsetStringMacroColumn.h
@@ -52,14 +52,14 @@ public:
RelationalOperator relOp, const std::string &value) const override;
// overriden by host and service macro columns
- virtual host *getHost(Row) const = 0;
- virtual service *getService(Row) const = 0;
+ virtual const host *getHost(Row) const = 0;
+ virtual const service *getService(Row) const = 0;
private:
- const char *expandMacro(const char *macroname, host *hst,
- service *svc) const;
- const char *expandCustomVariables(const char *varname,
- customvariablesmember *custvars) const;
+ const char *expandMacro(const char *macroname, const host *hst,
+ const service *svc) const;
+ const char *expandCustomVariables(
+ const char *varname, const customvariablesmember *custvars) const;
};
#endif // OffsetStringMacroColumn_h