From 69e60b26c0e5d10b2affd674bac24fd2edeada0c Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 16 Feb 2021 13:25:37 +0100 Subject: [PATCH] fix cppcheck errors --- include/villas/dumper.hpp | 4 ++-- lib/dumper.cpp | 17 +++++++---------- lib/hooks/dft.cpp | 13 ++++++++++--- lib/hooks/pps_ts.cpp | 4 ++++ 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/include/villas/dumper.hpp b/include/villas/dumper.hpp index dcf15ac00..6e0482454 100644 --- a/include/villas/dumper.hpp +++ b/include/villas/dumper.hpp @@ -35,9 +35,9 @@ protected: uint64_t warningCounter; public: - Dumper(const std::string socketNameIn); + Dumper(const std::string &socketNameIn); ~Dumper(); - int openSocket(std::string socketNameIn); + int openSocket(); void closeSocket(); void writeData(uint len, double *yData, double *xData = nullptr); }; diff --git a/lib/dumper.cpp b/lib/dumper.cpp index 3e1b9afed..b6e25c735 100644 --- a/lib/dumper.cpp +++ b/lib/dumper.cpp @@ -30,23 +30,21 @@ using namespace villas; using namespace villas::node; -Dumper::Dumper(const std::string socketNameIn) : - socketName(""), +Dumper::Dumper(const std::string &socketNameIn) : + socketName(socketNameIn), supressRepeatedWarning(true), warningCounter(0) { - openSocket(socketNameIn); + openSocket(); } Dumper::~Dumper() { closeSocket(); } -int Dumper::openSocket(std::string socketNameIn) +int Dumper::openSocket() { - socketName = socketNameIn; - - socketFd = socket(AF_LOCAL,SOCK_STREAM, 0); + socketFd = socket(AF_LOCAL, SOCK_STREAM, 0); if (socketFd < 0) { info("Error creating socket %s", socketName.c_str()); return -1; @@ -64,15 +62,14 @@ int Dumper::openSocket(std::string socketNameIn) void Dumper::closeSocket() { - info("Remove socket"); close(socketFd); } -void Dumper::writeData(uint len, double *yData, double *xData) +void Dumper::writeData(unsigned len, double *yData, double *xData) { ssize_t bytesWritten; - for (uint i = 0; i omega; double windowCorretionFactor; - timespec lastDftCal; + struct timespec lastDftCal; int *signalIndex; /**< A list of signalIndex to do dft on */ unsigned signalCnt; /**< Number of signalIndex given by config file */ @@ -99,6 +99,12 @@ public: Hook(p, n, fl, prio, en), windowType(WindowType::NONE), paddingType(PaddingType::ZERO), + smpMemory(nullptr), + dftMatrix(nullptr), + dftResults(nullptr), + filterWindowCoefficents(nullptr), + absDftResults(nullptr), + absDftFreqs(nullptr), dftCalcCnt(0), sampleRate(0), startFreqency(0), @@ -113,6 +119,7 @@ public: lastSequence(0), windowCorretionFactor(0), lastDftCal({0, 0}), + signalIndex(nullptr), signalCnt(0) { format = format_type_lookup("villas.human"); diff --git a/lib/hooks/pps_ts.cpp b/lib/hooks/pps_ts.cpp index 8db63e7ca..89ca7a61e 100644 --- a/lib/hooks/pps_ts.cpp +++ b/lib/hooks/pps_ts.cpp @@ -67,8 +67,12 @@ public: isSynced(false), isLocked(false), timeErr(0.0), + periodEst(0.0), + periodErrComp(0.0), period(0.0), cntEdges(0), + cntSmps(0), + cntSmpsTotal(0), horizonComp(10), horizonEst(10), filtLen(horizonEst + 1)