Module: check_mk
Branch: master
Commit: cfcd506b2e2e0a87e5f12a5bd0ffd9ff0e826638
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfcd506b2e2e0a…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Jun 21 17:21:56 2012 +0200
Livestatus: minor code cleanup
---
livestatus/src/Column.cc | 8 ++++----
livestatus/src/LogEntry.cc | 6 +++---
livestatus/src/Logfile.cc | 8 ++++----
livestatus/src/Logfile.h | 3 ++-
livestatus/src/TableServices.cc | 7 ++++---
5 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/livestatus/src/Column.cc b/livestatus/src/Column.cc
index c4bdb87..b4057df 100644
--- a/livestatus/src/Column.cc
+++ b/livestatus/src/Column.cc
@@ -26,10 +26,10 @@
#include "logger.h"
- Column::Column(string name, string description, int indirect_offset)
- : _name(name)
- , _description(description)
- , _indirect_offset(indirect_offset)
+Column::Column(string name, string description, int indirect_offset)
+ : _name(name)
+ , _description(description)
+ , _indirect_offset(indirect_offset)
{
}
diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc
index 4fbc92c..f2c6a60 100644
--- a/livestatus/src/LogEntry.cc
+++ b/livestatus/src/LogEntry.cc
@@ -66,9 +66,9 @@ LogEntry::LogEntry(unsigned lineno, char *line)
// now classify the log message. Some messages
// refer to other table, some do not.
if (handleStatusEntry() ||
- handleNotificationEntry() ||
- handlePassiveCheckEntry() ||
- handleExternalCommandEntry())
+ handleNotificationEntry() ||
+ handlePassiveCheckEntry() ||
+ handleExternalCommandEntry())
{
if (_host_name)
_host = find_host(_host_name);
diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc
index 9d25212..2a2cf6a 100644
--- a/livestatus/src/Logfile.cc
+++ b/livestatus/src/Logfile.cc
@@ -110,13 +110,13 @@ void Logfile::load(TableLog *tablelog, time_t since, time_t until,
unsigned logc
// have read to the end of the file
if (_logclasses_read) {
fsetpos(file, &_read_pos); // continue at previous end
- load(file, _logclasses_read, tablelog, since, until, logclasses);
+ loadRange(file, _logclasses_read, tablelog, since, until, logclasses);
fgetpos(file, &_read_pos);
}
if (missing_types) {
fseek(file, 0, SEEK_SET);
_lineno = 0;
- load(file, missing_types, tablelog, since, until, logclasses);
+ loadRange(file, missing_types, tablelog, since, until, logclasses);
_logclasses_read |= missing_types;
fgetpos(file, &_read_pos); // remember current end of file
}
@@ -133,13 +133,13 @@ void Logfile::load(TableLog *tablelog, time_t since, time_t until,
unsigned logc
return;
}
- load(file, missing_types, tablelog, since, until, logclasses);
+ loadRange(file, missing_types, tablelog, since, until, logclasses);
fclose(file);
_logclasses_read |= missing_types;
}
}
-void Logfile::load(FILE *file, unsigned missing_types,
+void Logfile::loadRange(FILE *file, unsigned missing_types,
TableLog *tablelog, time_t since, time_t until, unsigned logclasses)
{
while (fgets(_linebuffer, MAX_LOGLINE, file))
diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h
index 7550e3a..b32de2c 100644
--- a/livestatus/src/Logfile.h
+++ b/livestatus/src/Logfile.h
@@ -66,7 +66,8 @@ public:
long freeMessages(unsigned logclasses);
private:
- void load(FILE *file, unsigned missing_types, TableLog *, time_t since, time_t until,
unsigned logclasses);
+ void loadRange(FILE *file, unsigned missing_types, TableLog *,
+ time_t since, time_t until, unsigned logclasses);
bool processLogLine(uint32_t, unsigned);
uint64_t makeKey(time_t, unsigned);
};
diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc
index bd0d4c4..fc41a59 100644
--- a/livestatus/src/TableServices.cc
+++ b/livestatus/src/TableServices.cc
@@ -164,9 +164,10 @@ bool TableServices::isAuthorized(contact *ctc, void *data)
return is_authorized_for(ctc, svc->host_ptr, svc);
}
- TableServices::TableServices(bool by_group, bool by_hostgroup)
- : _by_group(by_group)
- , _by_hostgroup(by_hostgroup)
+
+TableServices::TableServices(bool by_group, bool by_hostgroup)
+ : _by_group(by_group)
+ , _by_hostgroup(by_hostgroup)
{
struct servicebygroup sgref;
struct servicebyhostgroup hgref;