Fix warnings from Wall Wextra Wpedantic

CMakeLists.txt

@@ -18,6 +18,15 @@ if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE "RelWithDebInfo")
 endif()
 
+set(_warning_flags "-Werror -Wall -Wextra -Wpedantic")
+if(NOT CMAKE_C_FLAGS)
+  set(CMAKE_C_FLAGS ${_warning_flags})
+endif()
+
+if(NOT CMAKE_CXX_FLAGS)
+  set(CMAKE_CXX_FLAGS ${_warning_flags})
+endif()
+
 include(LanguageStandards)
 include(optimization)
 

src/CmdLine.C

@@ -811,7 +811,7 @@ static void disableUnwantedTests(std::vector<RunGroup *> &groups)
 
    if (unique_id && max_unique_id && testLimit) {
       unsigned cur_test = 0;
-      unsigned cur_test_limitgroup = 0;
+      int cur_test_limitgroup = 0;
       for (unsigned i=0; i < groups.size(); i++) 
       {
          if (groups[i]->disabled) continue;
@@ -833,7 +833,7 @@ static void disableUnwantedTests(std::vector<RunGroup *> &groups)
    }
    else if (unique_id && max_unique_id && groupLimit) {
       unsigned cur_group = 0;
-      unsigned cur_limitgroup = 0;
+      int cur_limitgroup = 0;
       for (unsigned i=0; i < groups.size(); i++) 
       {
          if (groups[i]->disabled) continue;
@@ -916,7 +916,7 @@ static void disableUnwantedTests(std::vector<RunGroup *> &groups)
    }
    if (given_mutator != -1) {
       for (unsigned  i = 0; i < groups.size(); i++) {
-         if (i != given_mutator && !groups[i]->disabled) {
+         if (static_cast<int>(i) != given_mutator && !groups[i]->disabled) {
             for (unsigned j=0; j<groups[i]->tests.size(); j++) 
             {
                if (!groups[i]->tests[j]->disabled) {
@@ -988,8 +988,6 @@ static bool mutateeListContains(std::vector<char *> mutatee_list, const char *mu
 // don't match.  All tests start out enabled, and we previously disabled any
 // that are crashing while we were parsing the resume log.
 static bool testListContains(TestInfo * test, std::vector<char *> &testsn) {
-   bool match_found = false;
-
    for (size_t i = 0; i < testsn.size(); i++) {
       if (nameMatches(testsn[i], test->name))
          return true;

src/DatabaseOutputDriver.C

@@ -65,8 +65,8 @@ extern "C" {
 
 DatabaseOutputDriver::DatabaseOutputDriver(void * data)
   : attributes(NULL),
-    submittedResults(false),
     wroteLogHeader(false),
+    submittedResults(false),
     currTest(NULL),
     result(UNKNOWN)
 {
@@ -89,7 +89,7 @@ DatabaseOutputDriver::~DatabaseOutputDriver() {
 
 void
 DatabaseOutputDriver::startNewTest(std::map<std::string, std::string> &attrs,
-                                   TestInfo *test, RunGroup *group)
+                                   TestInfo *test, RunGroup *)
 {
   currTest = test;
 
@@ -116,19 +116,19 @@ DatabaseOutputDriver::startNewTest(std::map<std::string, std::string> &attrs,
   result = UNKNOWN;
 }
 
-void DatabaseOutputDriver::redirectStream(TestOutputStream stream, const char * filename) {
+void DatabaseOutputDriver::redirectStream(TestOutputStream, const char *) {
   // This is a no-op for database output
 }
 
-void DatabaseOutputDriver::logResult(test_results_t res, int stage) {
+void DatabaseOutputDriver::logResult(test_results_t res, int) {
   // What does this do, exactly?  Store the result code for database check-in
   // I guess..
   // Do I want to submit the results to the database in this method, or use
   // finalizeOutput for that?
   result = res;
 }
 
-void DatabaseOutputDriver::logCrash(std::string crashedTest) {
+void DatabaseOutputDriver::logCrash(std::string) {
   // New idea: we've already called startNewTest for this test, so
   // dblogFilename is set to recover the old log data for the test.
   // All we need to do is register a crashed result for the test.
@@ -142,7 +142,7 @@ void DatabaseOutputDriver::log(TestOutputStream stream, const char *fmt, ...) {
   va_end(args);
 }
 
-void DatabaseOutputDriver::vlog(TestOutputStream stream, const char *fmt,
+void DatabaseOutputDriver::vlog(TestOutputStream, const char *fmt,
 				va_list args)
 {
   FILE *dbout = NULL;
@@ -245,7 +245,7 @@ void DatabaseOutputDriver::finalizeOutput() {
 					__FILE__, __LINE__, sqlLogFilename.c_str());
 			//TODO handle error
 		}
-		int size = strlen(logHeader.c_str());
+		auto size = strlen(logHeader.c_str());
 		if (fwrite(logHeader.c_str(), sizeof(char), size, sqlLog) != size) {
 			fprintf(stderr, "[%s:%u] - Error writing to log file.\n", __FILE__, __LINE__);
 			//TODO handle error

src/MutateeStart.C

@@ -222,7 +222,6 @@ static std::string launchMutatee_plat(const std::string &exec_name, const std::v
       setenv("LD_LIBRARY_PATH", new_ld_path, 1);
 
       char **argv = getCParams(exec_name, args);
-      const char *c_exec_name = exec_name.c_str();
 
       execvp(exec_name.c_str(), (char * const *) argv);
 
@@ -385,7 +384,7 @@ static std::string launchMutatee_plat(const std::string &exec_name, const std::v
 }
 #endif
 
-bool shouldLaunch(RunGroup *group, ParameterDict &params)
+bool shouldLaunch(RunGroup *, ParameterDict &)
 {
 	return true;
 }
@@ -395,7 +394,6 @@ std::string launchMutatee(std::string executable, std::vector<std::string> &args
    char group_num[32];
    snprintf(group_num, 32, "%d", group->index);
 
-   bool in_runtests = params["in_runtests"]->getInt();
    if (!shouldLaunch(group, params))
       return std::string(group_num) + ":-1";
 
@@ -542,7 +540,7 @@ Dyninst::PID getMutateePid(RunGroup *group)
    int pid;
 
    sscanf(mutatee_string.c_str(), "%d:%d", &group_id, &pid);
-   assert(group->index == group_id || group_id == -1);
+   assert(group->index == static_cast<unsigned>(group_id) || group_id == -1);
 
    spawned_mutatees.erase(i);
 

src/ParameterDict.C

@@ -44,7 +44,7 @@ Parameter::~Parameter()
 }
 
 // Error functions, in proper operation these will be overidden in a subclass
-void Parameter::setString(const char *str)
+void Parameter::setString(const char *)
 {
    fprintf(stderr, "Warning: Setting a string for a non-string Parameter, ignored\n");
 }
@@ -61,7 +61,7 @@ int Parameter::getInt()
    return -1;
 }
 
-void Parameter::setInt(int num)
+void Parameter::setInt(int)
 {
    fprintf(stderr, "Warning: Setting an int for a non-int Parameter, ignored\n");
 }
@@ -72,7 +72,7 @@ void *Parameter::getPtr()
    return NULL;
 }
 
-void Parameter::setPtr(void *ptr)
+void Parameter::setPtr(void *)
 {
    fprintf(stderr, "Warning: Setting an ptr for a non-ptr Parameter, ignored\n");
 }

src/ResumeLog.C

@@ -170,13 +170,13 @@ void parse_resumelog(std::vector<RunGroup *> &groups)
 
    for (;;)
    {
-      int res = fscanf(f, "%d,%d,%d\n", &groupnum, &testnum, &runstate_int);
+      int res = fscanf(f, "%u,%u,%d\n", &groupnum, &testnum, &runstate_int);
       if (res != 3)
          break;
 
-      assert(groupnum >= 0 && groupnum < groups.size());
+      assert(static_cast<size_t>(groupnum) < groups.size());
       assert(groups[groupnum]);
-      assert(testnum >= 0);
+      assert(testnum >= 0UL);
       assert(testnum < groups[groupnum]->tests.size());
       if (runstate_int == RESULT_REPORTED)
       {

src/StdOutputDriver.C

@@ -44,15 +44,12 @@
 #include <assert.h>
 #include <stdlib.h>
 
-StdOutputDriver::StdOutputDriver(void * data) : attributes(NULL), streams() {
+StdOutputDriver::StdOutputDriver(void *) {
   streams[STDOUT] = std::string("-");
   streams[STDERR] = std::string("-");
   streams[LOGINFO] = std::string("-");
   streams[LOGERR] = std::string("-");
   streams[HUMAN] = std::string("-");
-  last_test = NULL;
-  last_group = NULL;
-  printed_header = false;
 }
 
 StdOutputDriver::~StdOutputDriver() {
@@ -257,7 +254,7 @@ FILE *StdOutputDriver::getHumanFile()  {
     return out;
 }
 
-void StdOutputDriver::logCrash(std::string testname) {
+void StdOutputDriver::logCrash(std::string) {
   // TODO Do something here
 }
 
@@ -281,7 +278,7 @@ void StdOutputDriver::vlog(TestOutputStream stream, const char *fmt, va_list arg
   }
 
   const char *fn = streams[stream].c_str();
-  FILE *out;
+  FILE *out{};
   if (strcmp(fn, "-") == 0) {
     // We're printing to the default file
     switch(stream) {
@@ -295,6 +292,8 @@ void StdOutputDriver::vlog(TestOutputStream stream, const char *fmt, va_list arg
     case LOGERR:
       out = stderr;
       break;
+    case OUTPUT_STREAMS_SIZE:
+      break;
     }
   } else {
     // Open the file

src/StdOutputDriver.h

@@ -39,10 +39,10 @@
 
 class StdOutputDriver : public TestOutputDriver {
 protected:
-  std::map<TestOutputStream, std::string> streams;
-  std::map<std::string, std::string> *attributes;
-  TestInfo *last_test;
-  RunGroup *last_group;
+  std::map<TestOutputStream, std::string> streams{};
+  std::map<std::string, std::string> *attributes{};
+  TestInfo *last_test{};
+  RunGroup *last_group{};
 
   //Column widths
   static const int name_len = 26;
@@ -55,7 +55,7 @@ class StdOutputDriver : public TestOutputDriver {
   static const int pic_len = 7;
   static const int pmode_len = 5;
 
-  bool printed_header;
+  bool printed_header{false};
   void printHeader(FILE *out);
   public:
   TESTLIB_DLL_EXPORT StdOutputDriver(void * data);

src/TestMutator.C

@@ -44,7 +44,7 @@ bool TestMutator::hasCustomExecutionPath() {
   return false;
 }
 
-test_results_t TestMutator::setup(ParameterDict &param) {
+test_results_t TestMutator::setup(ParameterDict &) {
    return PASSED;
 }
 

src/TestOutputDriver.C

@@ -94,7 +94,7 @@ static void parseLabel3(std::map<std::string, std::string> *attrs,
 }
 
 TESTLIB_DLL_EXPORT bool TestOutputDriver::getAttributesMap(TestInfo *test, 
-                RunGroup *group, std::map<std::string, std::string> &attrs) {
+                RunGroup *, std::map<std::string, std::string> &attrs) {
   if ((NULL == test) || (NULL == test->label)) {
     return false;
   }

src/UsageMonitor.h

@@ -29,6 +29,7 @@ class UsageMonitor
 
 public:
     TESTLIB_DLL_EXPORT UsageMonitor();
+    TESTLIB_DLL_EXPORT UsageMonitor(UsageMonitor const&) = default;
     TESTLIB_DLL_EXPORT void start();
     TESTLIB_DLL_EXPORT void end();
     TESTLIB_DLL_EXPORT void clear();