Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

#3069 FIX unitrend_backup: fixed broken plugin output

by Sebastian Herbord

Module: check_mk Branch: master Commit: 63e7bec3801df108206701f3b749d52e258f50e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63e7bec3801df1… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Feb 4 13:48:51 2016 +0100 #3069 FIX unitrend_backup: fixed broken plugin output --- .werks/3069 | 10 ++++++++ ChangeLog | 1 + agents/plugins/unitrends_backup | 51 ++++++++++++++++++++------------------- 3 files changed, 37 insertions(+), 25 deletions(-) diff --git a/.werks/3069 b/.werks/3069 new file mode 100644 index 0000000..df2f39a --- /dev/null +++ b/.werks/3069 @@ -0,0 +1,10 @@ +Title: unitrend_backup: fixed broken plugin output +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1454590092 + + diff --git a/ChangeLog b/ChangeLog index c1a1ec0..7b4abbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -247,6 +247,7 @@ * 3045 FIX: veeam_backup_status: Fixed wrong date format reported by agent... * 3066 FIX: windows agent: 32-bit performance counters were not returned correctly * 3068 FIX: ps: added performance graphs for process handle count (windows only) + * 3069 FIX: unitrend_backup: fixed broken plugin output Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/agents/plugins/unitrends_backup b/agents/plugins/unitrends_backup index b4398a3..1060380 100755 --- a/agents/plugins/unitrends_backup +++ b/agents/plugins/unitrends_backup @@ -1,29 +1,30 @@ -#!/usr/bin/pnp -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | -# +------------------------------------------------------------------+ -# -# This file is part of Check_MK. -# The official homepage is at http://mathias-kettner.de/check_mk. -# -# check_mk is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation in version 2. check_mk is distributed -# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- -# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU General Public License for more de- -# ails. You should have received a copy of the GNU General Public -# License along with GNU Make; see the file COPYING. If not, write -# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, -# Boston, MA 02110-1301 USA. - +#!/usr/bin/php <?php +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +// +------------------------------------------------------------------+ +// +// This file is part of Check_MK. +// The official homepage is at http://mathias-kettner.de/check_mk. +// +// check_mk is free software; you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by +// the Free Software Foundation in version 2. check_mk is distributed +// in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +// out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +// PARTICULAR PURPOSE. See the GNU General Public License for more de- +// ails. You should have received a copy of the GNU General Public +// License along with GNU Make; see the file COPYING. If not, write +// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +// Boston, MA 02110-1301 USA. +// +// print "<<<unitrends_backup:sep(124)>>>\n"; $conn = "port=5432 dbname=bpdb user=postgres"; $db = pg_connect($conn);

8 years, 7 months

IWYU fixes.

by Sven Panne

Module: check_mk Branch: master Commit: 5b4848891274659df7ead075f6914767adc048c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b484889127465… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 4 11:52:34 2016 +0100 IWYU fixes. --- livestatus/src/ContactgroupsMemberColumn.cc | 1 - livestatus/src/OringFilter.cc | 1 - livestatus/src/TableColumns.cc | 1 - 3 files changed, 3 deletions(-) diff --git a/livestatus/src/ContactgroupsMemberColumn.cc b/livestatus/src/ContactgroupsMemberColumn.cc index faefb65..1ac24cf 100644 --- a/livestatus/src/ContactgroupsMemberColumn.cc +++ b/livestatus/src/ContactgroupsMemberColumn.cc @@ -23,7 +23,6 @@ // Boston, MA 02110-1301 USA. #include "ContactgroupsMemberColumn.h" -#include <stddef.h> #include "nagios.h" bool ContactgroupsMemberColumn::isNagiosMember(void *cg, void *ctc) { diff --git a/livestatus/src/OringFilter.cc b/livestatus/src/OringFilter.cc index d7b1f79..03b3dee 100644 --- a/livestatus/src/OringFilter.cc +++ b/livestatus/src/OringFilter.cc @@ -23,7 +23,6 @@ // Boston, MA 02110-1301 USA. #include "OringFilter.h" -#include <deque> #include "Filter.h" bool OringFilter::accepts(void *data) { diff --git a/livestatus/src/TableColumns.cc b/livestatus/src/TableColumns.cc index 99ac8a3..8aef372 100644 --- a/livestatus/src/TableColumns.cc +++ b/livestatus/src/TableColumns.cc @@ -23,7 +23,6 @@ // Boston, MA 02110-1301 USA. #include "TableColumns.h" -#include <map> #include <utility> #include "Column.h" #include "ColumnsColumn.h"

8 years, 7 months

clang-tidy fixes for readability-else-after-return check.

by Sven Panne

Module: check_mk Branch: master Commit: 18d67cd071d64cd01de0e33c799cb89ef962930c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18d67cd071d64c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 4 10:56:28 2016 +0100 clang-tidy fixes for readability-else-after-return check. --- .clang-tidy | 5 +- livestatus/src/AndingFilter.cc | 7 ++- livestatus/src/CustomVarsFilter.cc | 24 ++++----- livestatus/src/HostlistStateColumn.cc | 12 +++-- livestatus/src/InputBuffer.cc | 61 ++++++++++------------ livestatus/src/ListColumnFilter.cc | 3 +- livestatus/src/LogEntry.cc | 38 ++++++++------ livestatus/src/Logfile.cc | 8 +-- livestatus/src/OffsetIntColumn.cc | 3 +- livestatus/src/OffsetStringMacroColumn.cc | 48 +++++++++++------ livestatus/src/OffsetStringServiceMacroColumn.cc | 3 +- livestatus/src/OffsetTimeperiodColumn.cc | 6 +-- livestatus/src/Query.cc | 8 ++- livestatus/src/ServiceSpecialDoubleColumn.cc | 7 ++- livestatus/src/ServicelistStateColumn.cc | 12 +++-- livestatus/src/StatsColumn.cc | 17 +++--- livestatus/src/Store.cc | 3 +- livestatus/src/StringColumnFilter.cc | 3 +- livestatus/src/Table.cc | 7 +-- livestatus/src/TableDownComm.cc | 3 +- livestatus/src/TableHostgroups.cc | 3 +- livestatus/src/TableLog.cc | 11 ++-- livestatus/src/TableServicegroups.cc | 3 +- livestatus/src/TableServices.cc | 2 +- livestatus/src/TableStateHistory.cc | 23 ++++---- livestatus/src/TimeColumnFilter.cc | 3 +- livestatus/src/auth.cc | 20 ++++--- livestatus/src/mk_inventory.cc | 3 +- livestatus/src/module.c | 3 +- livestatus/src/unixcat.c | 3 +- 30 files changed, 173 insertions(+), 179 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=18d67cd071…

8 years, 7 months

Fixed Kung-Fu-style cast.

by Sven Panne

Module: check_mk Branch: master Commit: 50b8b6b5f477e84680feda3b0df91d50d9fe86d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50b8b6b5f477e8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 4 10:51:28 2016 +0100 Fixed Kung-Fu-style cast. --- livestatus/src/DownCommColumn.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/livestatus/src/DownCommColumn.cc b/livestatus/src/DownCommColumn.cc index db0e19c..c13e637 100644 --- a/livestatus/src/DownCommColumn.cc +++ b/livestatus/src/DownCommColumn.cc @@ -102,7 +102,8 @@ bool DownCommColumn::isNagiosMember(void *data, void *member) { TableDownComm *table = _is_downtime ? g_table_downtimes : g_table_comments; // data points to a host or service // member is not a pointer, but an unsigned int (hack) - int64_t id = (int64_t)member; // Hack. Convert it back. + unsigned long id = static_cast<unsigned long>( + reinterpret_cast<uintptr_t>(member)); // Hack. Convert it back. DowntimeOrComment *dt = table->findEntry(id, _is_service); return dt != nullptr && (dt->_service == static_cast<service *>(data) || (dt->_service == nullptr &&

8 years, 7 months

Re-classify cppcoreguidelines-pro-type-reinterpret-cast check.

by Sven Panne

Module: check_mk Branch: master Commit: c60cb48d7ad60fa4363beb168e4a6169cb0e635a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c60cb48d7ad60f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 4 10:51:57 2016 +0100 Re-classify cppcoreguidelines-pro-type-reinterpret-cast check. --- .clang-tidy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.clang-tidy b/.clang-tidy index 29f3168..fbea749 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -14,13 +14,13 @@ # # * desirable checks, but hard to fix currently: # * cert-dcl50-cpp ("do not define a C-style variadic function; consider using a function parameter pack or currying instead") +# * cppcoreguidelines-pro-type-reinterpret-cast ("do not use reinterpret_cast") # * cppcoreguidelines-pro-type-vararg ("do not call c-style vararg functions") # # * desirable checks, but some places need to be suppressed: # * cppcoreguidelines-pro-type-const-cast ("do not use const_cast") # # * desirable checks, but not yet fixed: -# * cppcoreguidelines-pro-type-reinterpret-cast ("do not use reinterpret_cast") # * readability-else-after-return ("don't use else after return") # Checks: '*,-cert-dcl50-cpp,-cert-err58-cpp,-clang-analyzer-alpha*,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-const-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-vararg,-google-runtime-int,-llvm-include-order,-readability-else-after-return'

8 years, 7 months

#3068 FIX ps: added performance graphs for process handle count ( windows only)

by Sebastian Herbord

Module: check_mk Branch: master Commit: dc364dba8497490222c080173088944cc7834f5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc364dba849749… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Feb 4 10:36:27 2016 +0100 #3068 FIX ps: added performance graphs for process handle count (windows only) --- .werks/3068 | 9 +++++++++ ChangeLog | 1 + checks/ps.include | 9 +++++++-- web/plugins/metrics/check_mk.py | 6 ++++++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/.werks/3068 b/.werks/3068 new file mode 100644 index 0000000..3de3c9c --- /dev/null +++ b/.werks/3068 @@ -0,0 +1,9 @@ +Title: ps: added performance graphs for process handle count (windows only) +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1454578461 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index db44d7d..c1a1ec0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -246,6 +246,7 @@ * 3043 FIX: agent_emcvnx: Fixed error handling in case of missing naviseccli command * 3045 FIX: veeam_backup_status: Fixed wrong date format reported by agent... * 3066 FIX: windows agent: 32-bit performance counters were not returned correctly + * 3068 FIX: ps: added performance graphs for process handle count (windows only) Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/ps.include b/checks/ps.include index f21bbf0..ffe0f5f 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -458,8 +458,10 @@ def check_ps_common(item, params, parsed, cpu_cores = 1, info_name = "processes" extended_perfdata = ps_has_extended_perfdata(parsed[0][1]) if extended_perfdata: - perfdata += [ ("vsz", virtual_size), - ("rss", resident_size)] + warn_vsz, crit_vsz = params.get("virtual_levels", (None, None)) + warn_rss, crit_rss = params.get("resident_levels", (None, None)) + perfdata += [ ("vsz", virtual_size, warn_rss, crit_rss), + ("rss", resident_size, warn_rss, crit_rss)] perfdata.append(("pcpu", percent_cpu, warn_cpu, crit_cpu)) infotext = "%d %s" % (count, info_name) @@ -538,6 +540,9 @@ def check_ps_common(item, params, parsed, cpu_cores = 1, info_name = "processes" elif handle_count >= warn_handle: state = max(state, 1) infotext += "(!)" + else: + warn_handle, crit_handle = None, None + perfdata.append(("process_handles", handle_count, warn_handle, crit_handle)) # Check how long the process is running if min_elapsed != None: diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index e7a4694..ba17875 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -764,6 +764,12 @@ metric_info["process_mapped_size"] = { "color" : "12/a", } +metric_info["process_handles"] = { + "title" : _("Process handles"), + "unit" : "count", + "color" : "32/a", +} + metric_info["mem_heap"] = { "title" : _("Heap memory usage"), "unit" : "bytes",

8 years, 7 months

clang-tidy fixes for google-readability-casting check.

by Sven Panne

Module: check_mk Branch: master Commit: 517c141c7cc0b432ea4985256d2d94f30be5974d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=517c141c7cc0b4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 4 09:15:06 2016 +0100 clang-tidy fixes for google-readability-casting check. --- .clang-tidy | 3 +- livestatus/src/AndingFilter.cc | 2 +- livestatus/src/AttributelistColumn.cc | 3 +- livestatus/src/Column.cc | 9 +- livestatus/src/ContactgroupsColumn.cc | 13 +- livestatus/src/ContactgroupsMemberColumn.cc | 3 +- livestatus/src/CustomTimeperiodColumn.cc | 3 +- livestatus/src/CustomVarsColumn.cc | 3 +- livestatus/src/CustomVarsExplicitColumn.cc | 3 +- livestatus/src/HostgroupsColumn.cc | 11 +- livestatus/src/HostlistColumn.cc | 3 +- livestatus/src/HostlistStateColumn.cc | 3 +- livestatus/src/IntAggregator.cc | 12 +- livestatus/src/Logfile.cc | 2 +- livestatus/src/OffsetIntColumn.cc | 4 +- livestatus/src/OffsetStringColumn.cc | 4 +- livestatus/src/OffsetTimeperiodColumn.cc | 5 +- livestatus/src/Query.cc | 13 +- livestatus/src/ServicegroupsColumn.cc | 12 +- livestatus/src/ServicelistColumn.cc | 3 +- livestatus/src/ServicelistStateColumn.cc | 3 +- livestatus/src/Store.cc | 11 +- livestatus/src/TableCommands.cc | 10 +- livestatus/src/TableContactgroups.cc | 6 +- livestatus/src/TableContacts.cc | 52 +-- livestatus/src/TableDownComm.cc | 64 ++-- livestatus/src/TableHostgroups.cc | 82 +++-- livestatus/src/TableHosts.cc | 491 +++++++++++++++------------ livestatus/src/TableLog.cc | 70 ++-- livestatus/src/TableServicegroups.cc | 47 +-- livestatus/src/TableServices.cc | 220 +++++++----- livestatus/src/TableStateHistory.cc | 127 +++++-- livestatus/src/TableStatus.cc | 19 +- livestatus/src/TableTimeperiods.cc | 14 +- 34 files changed, 795 insertions(+), 535 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=517c141c7c…

8 years, 7 months

More casting fixes.

by Sven Panne

Module: check_mk Branch: master Commit: b74bedab298aea2c61ebde48cdeb20f161807556 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b74bedab298aea… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 4 10:01:11 2016 +0100 More casting fixes. --- .clang-tidy | 3 +-- livestatus/src/ContactsColumn.cc | 4 +--- livestatus/src/DownCommColumn.cc | 2 +- livestatus/src/TableStatus.cc | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index da51e8a..29f3168 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -20,11 +20,10 @@ # * cppcoreguidelines-pro-type-const-cast ("do not use const_cast") # # * desirable checks, but not yet fixed: -# * cppcoreguidelines-pro-type-cstyle-cast ("do not use C-style cast to convert between unrelated types") # * cppcoreguidelines-pro-type-reinterpret-cast ("do not use reinterpret_cast") # * readability-else-after-return ("don't use else after return") # -Checks: '*,-cert-dcl50-cpp,-cert-err58-cpp,-clang-analyzer-alpha*,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-const-cast,-cppcoreguidelines-pro-type-cstyle-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-vararg,-google-runtime-int,-llvm-include-order,-readability-else-after-return' +Checks: '*,-cert-dcl50-cpp,-cert-err58-cpp,-clang-analyzer-alpha*,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-const-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-vararg,-google-runtime-int,-llvm-include-order,-readability-else-after-return' CheckOptions: - key: google-readability-namespace-comments.SpacesBeforeComments value: '1' diff --git a/livestatus/src/ContactsColumn.cc b/livestatus/src/ContactsColumn.cc index e0e2089..930aa69 100644 --- a/livestatus/src/ContactsColumn.cc +++ b/livestatus/src/ContactsColumn.cc @@ -28,9 +28,7 @@ extern contact *contact_list; -void *ContactsColumn::getNagiosObject(char *name) { - return (void *)find_contact(name); -} +void *ContactsColumn::getNagiosObject(char *name) { return find_contact(name); } void ContactsColumn::output(void *data, Query *query) { query->outputBeginList(); diff --git a/livestatus/src/DownCommColumn.cc b/livestatus/src/DownCommColumn.cc index 71b52fe..db0e19c 100644 --- a/livestatus/src/DownCommColumn.cc +++ b/livestatus/src/DownCommColumn.cc @@ -118,7 +118,7 @@ bool DownCommColumn::isEmpty(void *data) { for (auto it = table->entriesIteratorBegin(); it != table->entriesIteratorEnd(); ++it) { DowntimeOrComment *dt = it->second; - if ((void *)dt->_service == data || + if (dt->_service == data || (dt->_service == nullptr && dt->_host == data)) { return false; } diff --git a/livestatus/src/TableStatus.cc b/livestatus/src/TableStatus.cc index cd9ca9d..097e124 100644 --- a/livestatus/src/TableStatus.cc +++ b/livestatus/src/TableStatus.cc @@ -281,7 +281,7 @@ TableStatus::TableStatus() { &num_cached_log_messages)); addColumn(new StringPointerColumn("livestatus_version", "The version of the MK Livestatus module", - (char *)VERSION)); + VERSION)); addColumn(new IntPointerColumn( "livestatus_active_connections", "The current number of active connections to MK Livestatus",

8 years, 7 months

Fixed error message.

by Sven Panne

Module: check_mk Branch: master Commit: 30e100e2720b333f0788ea4534d6c4b17366c3ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30e100e2720b33… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 4 10:18:02 2016 +0100 Fixed error message. --- livestatus/src/unixcat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/unixcat.c b/livestatus/src/unixcat.c index 911ae1a..42b194d 100644 --- a/livestatus/src/unixcat.c +++ b/livestatus/src/unixcat.c @@ -113,8 +113,8 @@ void *copy_thread(void *info) { ssize_t bytes_written = write(to, buffer, bytes_to_write); if (bytes_written == -1) { fprintf(stderr, - "Error: Cannot write %" PRIdMAX " bytes to %d: %s\n", - (intmax_t)bytes_written, to, strerror(errno)); + "Error: Cannot write %" PRIuMAX " bytes to %d: %s\n", + (uintmax_t)bytes_to_write, to, strerror(errno)); break; } buffer += bytes_written;

8 years, 7 months

Made a const_cast explicit. Very dubious...

by Sven Panne

Module: check_mk Branch: master Commit: 9d01b889613d911c18d766bb5736a321d8052750 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d01b889613d91… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 4 10:14:57 2016 +0100 Made a const_cast explicit. Very dubious... --- livestatus/src/StringColumnFilter.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/livestatus/src/StringColumnFilter.cc b/livestatus/src/StringColumnFilter.cc index aac6ae9..0a812c6 100644 --- a/livestatus/src/StringColumnFilter.cc +++ b/livestatus/src/StringColumnFilter.cc @@ -101,7 +101,9 @@ bool StringColumnFilter::accepts(void *data) { void *StringColumnFilter::indexFilter(const char *column) { if (_opid == OP_EQUAL && (strcmp(column, _column->name()) == 0)) { - return (void *)_ref_string.c_str(); + // TODO(sp) The cast looks very dubious, but the whole void* story is + // quite dangerous... + return const_cast<char *>(_ref_string.c_str()); } else { return nullptr; }

8 years, 7 months

← Newer
1
...
28
29
30
31
32
33
34
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016