Module: check_mk
Branch: master
Commit: 561610ece707258c467675ad08a0f29840f7b696
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=561610ece70725…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Tue Feb 2 16:15:13 2016 +0100
clang-format tweaks
---
agents/windows/check_mk_agent.cc | 2 +-
livestatus/src/InputBuffer.cc | 2 +-
livestatus/src/TableStateHistory.cc | 9 +++++----
livestatus/src/waittriggers.cc | 2 +-
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc
index 01cc45c..99998b8 100644
--- a/agents/windows/check_mk_agent.cc
+++ b/agents/windows/check_mk_agent.cc
@@ -1298,7 +1298,7 @@ void section_ps(OutputProxy &out) {
}
//// Note: CPU utilization is determined out of usermodetime and
- ///kernelmodetime
+ /// kernelmodetime
out.output("(%s,%" PRIu64 ",%" PRIu64
",%d,%lu,%" PRIu64
",%" PRIu64 ",%" PRIu64
",%lu,%lu)\t%s\n",
user.c_str(), virtual_size / 1024,
diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc
index 45521d3..dad51ab 100644
--- a/livestatus/src/InputBuffer.cc
+++ b/livestatus/src/InputBuffer.cc
@@ -59,7 +59,7 @@ bool timeout_reached(const struct timeval *start, int timeout_ms) {
pair<list<string>, InputBuffer::Result> failure(InputBuffer::Result r) {
return make_pair(list<string>(), r);
}
-} // namespace
+} // namespace
InputBuffer::InputBuffer(int fd, const int *termination_flag)
: _fd(fd)
diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc
index ed5d7cf..7a2ff98 100644
--- a/livestatus/src/TableStateHistory.cc
+++ b/livestatus/src/TableStateHistory.cc
@@ -690,16 +690,17 @@ int TableStateHistory::updateHostServiceState(Query *query,
_notification_periods.find(hs_state->_notification_period);
if (it_status != _notification_periods.end()) {
hs_state->_in_notification_period = it_status->second;
- } else // No notification period information available -> within
- // notification period
+ } else
+ // No notification period information available -> within
+ // notification period
hs_state->_in_notification_period = 1;
// Same for service period
it_status = _notification_periods.find(hs_state->_service_period);
if (it_status != _notification_periods.end()) {
hs_state->_in_service_period = it_status->second;
- } else // No service period information available -> within service
- // period
+ } else
+ // No service period information available -> within service period
hs_state->_in_service_period = 1;
}
diff --git a/livestatus/src/waittriggers.cc b/livestatus/src/waittriggers.cc
index af3e3e6..d8701ec 100644
--- a/livestatus/src/waittriggers.cc
+++ b/livestatus/src/waittriggers.cc
@@ -51,7 +51,7 @@ condition_variable cond_downtime;
condition_variable cond_comment;
condition_variable cond_command;
condition_variable cond_program;
-} // namespace
+} // namespace
struct trigger *trigger_all() {
return to_trigger(&cond_all);