[checkmk-commits] Unbreak contact columns for the NEB, they broke recently.

Module: check_mk Branch: master Commit: c716402be1162e30d868d22a4b36f2b23ddca65e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c716402be1162e… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Tue Mar 21 11:30:32 2017 +0100 Unbreak contact columns for the NEB, they broke recently. Note that containsContact and makeContains should *really* be merged, the current state is a hack... Change-Id: I742ae4147596b9b218583c3574be618ba1d82677 --- livestatus/src/ContactsColumn.cc | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/livestatus/src/ContactsColumn.cc b/livestatus/src/ContactsColumn.cc index 3f4ac89..9e2e407 100644 --- a/livestatus/src/ContactsColumn.cc +++ b/livestatus/src/ContactsColumn.cc @@ -32,22 +32,17 @@ extern contact *contact_list; void ContactsColumn::output(void *row, RowRenderer &r, contact * /* auth_user */) { ListRenderer l(r); - // TODO(sp) Horrible typing... - if (auto data = rowData<void>(row)) { - for (contact *ctc = contact_list; ctc != nullptr; ctc = ctc->next) { - if ((*containsContact(ctc))(data)) { - l.output(string(ctc->name)); - } + for (contact *ctc = contact_list; ctc != nullptr; ctc = ctc->next) { + if ((*containsContact(ctc))(row)) { + l.output(string(ctc->name)); } } } bool ContactsColumn::isEmpty(void *row) { - if (auto data = rowData<void>(row)) { - for (contact *ctc = contact_list; ctc != nullptr; ctc = ctc->next) { - if ((*containsContact(ctc))(data)) { - return false; - } + for (contact *ctc = contact_list; ctc != nullptr; ctc = ctc->next) { + if ((*containsContact(ctc))(row)) { + return false; } } return true;