Module: check_mk
Branch: master
Commit: e402a1f004dc14e6771810cdab5cf7a14c3ffd4e
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e402a1f004dc14…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Tue Nov 10 08:56:43 2015 +0100
cppcheck-induced cleanup: Initialize members.
---
Makefile | 2 +-
livestatus/src/Filter.h | 2 +-
livestatus/src/InputBuffer.cc | 7 ++++++-
livestatus/src/Logfile.cc | 5 +++++
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 254cdcd..fa7dc24 100644
--- a/Makefile
+++ b/Makefile
@@ -250,7 +250,7 @@ iwyu:
$(MAKE) -C livestatus CC=$(IWYU) CXX=$(IWYU) -k
cppcheck:
- $(CPPCHECK) --enable=all --template=gcc livestatus
+ $(CPPCHECK) --enable=all --inline-suppr --template=gcc livestatus
# Note: You need the doxygen and graphviz packages.
documentation:
diff --git a/livestatus/src/Filter.h b/livestatus/src/Filter.h
index cfd9d2a..6b26647 100644
--- a/livestatus/src/Filter.h
+++ b/livestatus/src/Filter.h
@@ -43,7 +43,7 @@ protected:
void setError(unsigned code, const char *format, ...);
public:
- Filter() : _column(0), _query(0) {}
+ Filter() : _error_code(0), _column(0), _query(0) {}
virtual ~Filter() {}
virtual bool isAndingFilter() { return false; }
virtual bool isNegatingFilter() { return false; }
diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc
index 36b98eb..3a385d7 100644
--- a/livestatus/src/InputBuffer.cc
+++ b/livestatus/src/InputBuffer.cc
@@ -40,8 +40,13 @@ extern int g_idle_timeout_msec;
bool timeout_reached(const struct timeval *, int);
+// TODO: We need the suppression pragma below because _readahead_buffer is not
+// initialized in the constructor. Just replace all this manual fiddling with
+// pointers, offsets, etc. with vector.
+
+// cppcheck-suppress uninitMemberVar
InputBuffer::InputBuffer(int *termination_flag)
- : _termination_flag(termination_flag)
+ : _fd(-1), _termination_flag(termination_flag)
{
_read_pointer = &_readahead_buffer[0]; // points to data not yet
processed
_write_pointer = _read_pointer; // points to end of data in buffer
diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc
index 45547b8..dd3d934 100644
--- a/livestatus/src/Logfile.cc
+++ b/livestatus/src/Logfile.cc
@@ -46,6 +46,11 @@ using std::make_pair;
extern unsigned long g_max_lines_per_logfile;
+// TODO: We need the suppression pragma below because _readpos and _linebuffer
+// is not initialized in the constructor. Just replace all this manual fiddling
+// with pointers, offsets, etc. with vector.
+
+// cppcheck-suppress uninitMemberVar
Logfile::Logfile(const char *path, bool watch)
: _path(strdup(path))
, _since(0)