[checkmk-commits] Removed/ifdef'd unused private fields.

Module: check_mk Branch: master Commit: cb0d96a4ad2fbf904c8d0f440b826b2c90808446 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb0d96a4ad2fbf… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 2 14:06:13 2015 +0100 Removed/ifdef'd unused private fields. --- livestatus/src/Logfile.cc | 3 ++- livestatus/src/Logfile.h | 4 ++-- livestatus/src/OffsetStringMacroColumn.h | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 86fb5bb..055c0c8 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -46,9 +46,10 @@ Logfile::Logfile(const char *path, bool watch) : _path(strdup(path)) , _since(0) , _watch(watch) - , _inode(0) , _lineno(0) +#ifdef CMC , _world(0) +#endif , _logclasses_read(0) { int fd = open(path, O_RDONLY); diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h index 74803d9..3b77213 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -47,14 +47,14 @@ private: char *_path; time_t _since; // time of first entry bool _watch; // true only for current logfile - ino_t _inode; // needed to detect switching fpos_t _read_pos; // read until this position uint32_t _lineno; // read until this line logfile_entries_t _entries; char _linebuffer[MAX_LOGLINE]; +#ifdef CMC World *_world; // CMC: world our references point into - +#endif public: Logfile(const char *path, bool watch); diff --git a/livestatus/src/OffsetStringMacroColumn.h b/livestatus/src/OffsetStringMacroColumn.h index 341f3da..8c218ae 100644 --- a/livestatus/src/OffsetStringMacroColumn.h +++ b/livestatus/src/OffsetStringMacroColumn.h @@ -30,7 +30,6 @@ class OffsetStringMacroColumn : public OffsetStringColumn { - int _offset; public: OffsetStringMacroColumn(string name, string description, int offset, int indirect_offset = -1) : OffsetStringColumn(name, description, offset, indirect_offset) {}