Replace calloc() by std::vector

src/Ensval.cc

@@ -190,17 +190,15 @@ Ensval(void *process)
           break;
         }
 
-      char *ofilename = (char *) calloc(namelen, sizeof(char));
+      std::vector<char> ofilename(namelen);
 
-      sprintf(ofilename, "%s.%s%s", ofilebase.c_str(), type_suffix, filesuffix);
+      snprintf(ofilename.data(), namelen, "%s.%s%s", ofilebase.c_str(), type_suffix, filesuffix);
       // fprintf(stderr, "StreamID %i: %s\n", stream, ofilename);
 
-      if (!Options::cdoOverwriteMode && FileUtils::file_exists(ofilename) && !FileUtils::user_file_overwrite(ofilename))
-        cdo_abort("Outputfile %s already exists!", ofilename);
+      if (!Options::cdoOverwriteMode && FileUtils::file_exists(ofilename.data()) && !FileUtils::user_file_overwrite(ofilename.data()))
+        cdo_abort("Outputfile %s already exists!", ofilename.data());
 
-      streamID2[stream] = cdo_open_write(ofilename);
-
-      free(ofilename);
+      streamID2[stream] = cdo_open_write(ofilename.data());
 
       zaxisID2[stream] = zaxisDuplicate(zaxisID1);
       taxisID2[stream] = taxisDuplicate(taxisID1);
@@ -287,7 +285,7 @@ Ensval(void *process)
                   else
                     val[fileID - 1] = value;  // Ensembles start at 2nd file
 
-                  if (DBL_IS_EQUAL(value, missval))
+                  if (dbl_is_equal(value, missval))
                     {
                       have_miss = 1;
                       break;
@@ -380,7 +378,7 @@ Ensval(void *process)
                 {
                   p = (double) k / (double) nens;
 
-                  if (!DBL_IS_EQUAL(sum_weights, 1.0))
+                  if (!dbl_is_equal(sum_weights, 1.0))
                     {
                       alpha[k] /= sum_weights;
                       beta[k] /= sum_weights;
@@ -398,7 +396,7 @@ Ensval(void *process)
               p = 1.0;
               g = 0.0;
               o = 1.0 - heavysideN / gridsize;
-              if (IS_NOT_EQUAL(o, 1.))
+              if (is_not_equal(o, 1.))
                 {
                   g = alpha[nens] / (1 - o);