Fix all cppcheck warnings

All warnings were style issues no bugs. All issues resolved (1.53).
cppcheck can be run without suppressions and doesn't produce any
warnigns.

To run (from src folder):
cppcheck -j4 --enable=style */*.cpp */*/*.cpp */*/*/*cpp \
   -DHAVE_CONFIG_H -D CPPCHECK -I gromacs/legacyheaders/

Change-Id: I2da1c824a1798e6773520de59470f7488fff738c

diff --git a/src/gromacs/analysisdata/tests/datatest.cpp b/src/gromacs/analysisdata/tests/datatest.cpp
index 7f4c44461c9dd80518a1d5b73812e72e96debcc4..3bda6eb8ea799284b3ed1227c9e569e35c41258d 100644 (file)
--- a/src/gromacs/analysisdata/tests/datatest.cpp
+++ b/src/gromacs/analysisdata/tests/datatest.cpp
@@ -68,7 +68,8 @@ AnalysisDataTestInputPointSet::AnalysisDataTestInputPointSet()
  * AnalysisDataTestInputFrame
  */
 
-AnalysisDataTestInputFrame::AnalysisDataTestInputFrame()
+AnalysisDataTestInputFrame::AnalysisDataTestInputFrame(int index, real x)
+    : index_(index), x_(x)
 {
 }
 
@@ -85,12 +86,10 @@ AnalysisDataTestInput::AnalysisDataTestInput(const real *data)
 
     while (*dataptr != END_OF_DATA)
     {
-        frames_.push_back(AnalysisDataTestInputFrame());
+        frames_.push_back(AnalysisDataTestInputFrame(frames_.size(), *dataptr));
         AnalysisDataTestInputFrame &frame = frames_.back();
         GMX_RELEASE_ASSERT(*dataptr != END_OF_FRAME && *dataptr != MPSTOP,
                            "Empty data frame");
-        frame.index_ = frames_.size() - 1;
-        frame.x_ = *dataptr;
         while (*dataptr != END_OF_FRAME)
         {
             ++dataptr;

diff --git a/src/gromacs/analysisdata/tests/datatest.h b/src/gromacs/analysisdata/tests/datatest.h
index 47b7f6f67a94bc25c17eff6ec40e6f2cc80ed2a0..17828d8fd1880a5203907fa54fa35a03ee045ba4 100644 (file)
--- a/src/gromacs/analysisdata/tests/datatest.h
+++ b/src/gromacs/analysisdata/tests/datatest.h
@@ -103,7 +103,7 @@ class AnalysisDataTestInputPointSet
 class AnalysisDataTestInputFrame
 {
     public:
-        AnalysisDataTestInputFrame();
+        AnalysisDataTestInputFrame(int index, real x);
 
         bool isMultipoint() const { return points_.size() > 1; }
 

diff --git a/src/gromacs/options/basicoptions.cpp b/src/gromacs/options/basicoptions.cpp
index 5bcb5416e11d1c8a2db8d52b6a092b25dfc69a9e..f165232e9472e3529ffbd0c7ed0ab89ece2c2297 100644 (file)
--- a/src/gromacs/options/basicoptions.cpp
+++ b/src/gromacs/options/basicoptions.cpp
@@ -126,7 +126,7 @@ std::string IntegerOptionStorage::formatValue(int i) const
 void IntegerOptionStorage::convertValue(const std::string &value)
 {
     const char *ptr = value.c_str();
-    char *endptr = NULL;
+    char *endptr;
     long int ival = std::strtol(ptr, &endptr, 10);
     if (*endptr != '\0')
     {
@@ -184,7 +184,7 @@ std::string DoubleOptionStorage::formatValue(int i) const
 void DoubleOptionStorage::convertValue(const std::string &value)
 {
     const char *ptr = value.c_str();
-    char *endptr = NULL;
+    char *endptr;
     double dval = std::strtod(ptr, &endptr);
     if (*endptr != '\0')
     {

diff --git a/src/gromacs/selection/sm_keywords.cpp b/src/gromacs/selection/sm_keywords.cpp
index 7abbfbec479f225e3122546e57a6b7011166d771..08f3b36ad7ec1df967fc377bb7693088004c9c8b 100644 (file)
--- a/src/gromacs/selection/sm_keywords.cpp
+++ b/src/gromacs/selection/sm_keywords.cpp
@@ -467,7 +467,6 @@ static void
 init_kwstr(t_topology *top, int npar, gmx_ana_selparam_t *param, void *data)
 {
     t_methoddata_kwstr *d = (t_methoddata_kwstr *)data;
-    char               *buf;
     char               *s;
     int                 i;
     size_t              j;
@@ -497,6 +496,7 @@ init_kwstr(t_topology *top, int npar, gmx_ana_selparam_t *param, void *data)
         {
             // TODO: Get rid of these prints to stderr
 #ifdef USE_REGEX
+            char               *buf;
             snew(buf, strlen(s) + 3);
             sprintf(buf, "^%s$", s);
             if (regcomp(&d->m[i].u.r, buf, REG_EXTENDED | REG_NOSUB))

diff --git a/src/gromacs/trajectoryanalysis/modules/angle.cpp b/src/gromacs/trajectoryanalysis/modules/angle.cpp
index 690b65bbb8f5cb780be9979d178eb6a202bb1ea6..1c1fbd81e0e87f6007f139eafc977a993bce979f 100644 (file)
--- a/src/gromacs/trajectoryanalysis/modules/angle.cpp
+++ b/src/gromacs/trajectoryanalysis/modules/angle.cpp
@@ -65,7 +65,7 @@ Angle::Angle()
     : _options("angle", "Angle calculation"),
       _sel1info(NULL), _sel2info(NULL),
       _bSplit1(false), _bSplit2(false), _bMulti(false), _bAll(false),
-      _bDumpDist(false), _vt0(NULL)
+      _bDumpDist(false), _natoms1(0), _natoms2(0), _vt0(NULL)
 {
 }
 

diff --git a/src/gromacs/trajectoryanalysis/modules/select.cpp b/src/gromacs/trajectoryanalysis/modules/select.cpp
index f76582c5fbcbe8a15a35044e264269f81768a3c8..2a0ce2b28600907d308a42e2f0bc135797cb5c44 100644 (file)
--- a/src/gromacs/trajectoryanalysis/modules/select.cpp
+++ b/src/gromacs/trajectoryanalysis/modules/select.cpp
@@ -114,7 +114,8 @@ class IndexFileWriterModule : public AnalysisDataModuleInterface
  * IndexFileWriterModule
  */
 
-IndexFileWriterModule::IndexFileWriterModule() : _fp(NULL)
+IndexFileWriterModule::IndexFileWriterModule()
+    : _fp(NULL), _currentGroup(-1), _currentSize(0), _bAnyWritten(false)
 {
 }
 
@@ -267,7 +268,8 @@ class Select::ModuleData : public TrajectoryAnalysisModuleData
 
 Select::Select()
     : _options("select", "Selection information"),
-      _bDump(false), _bTotNorm(false), _bFracNorm(false), _bResInd(false)
+      _bDump(false), _bTotNorm(false), _bFracNorm(false), _bResInd(false),
+      _top(NULL), _totsize(NULL)
 {
 }
 

diff --git a/src/programs/mdrun/openmm_wrapper.cpp b/src/programs/mdrun/openmm_wrapper.cpp
index a03760817cdbeedd8fc0f705a86e5b306487095c..d7a01c4d3a1f66375e82f968465e7bab7e4a7a8d 100644 (file)
--- a/src/programs/mdrun/openmm_wrapper.cpp
+++ b/src/programs/mdrun/openmm_wrapper.cpp
@@ -518,7 +518,6 @@ static void checkGmxOptions(FILE* fplog, GmxOpenMMPlatformOptions *opt,
                             t_inputrec *ir, gmx_localtop_t *top,
                             t_forcerec *fr, t_state *state)
 {
-    char    warn_buf[STRLEN];
     int     i, j, natoms;
     double  c6, c12;
     double  sigma_ij=0, sigma_ji=0, sigma_ii=0, sigma_jj=0, sigma_comb;

diff --git a/src/testutils/refdata.cpp b/src/testutils/refdata.cpp
index e3c03981892c925c7d2f778bae0a6c490409d49a..3aae88ea85a7cdcdfcf9ac6fef350fa6d95fea83 100644 (file)
--- a/src/testutils/refdata.cpp
+++ b/src/testutils/refdata.cpp
@@ -510,7 +510,7 @@ void TestReferenceChecker::checkDouble(double value, const char *id)
         _impl->processItem(Impl::cRealNodeName, id, strValue, &bFound);
     if (bFound)
     {
-        char *endptr = NULL;
+        char *endptr;
         double refValue = std::strtod(refStrValue.c_str(), &endptr);
         EXPECT_EQ('\0', *endptr);
         EXPECT_NEAR(refValue, value, 0.0001);