Tidy: modernize-use-nullptr

[alexxy/gromacs.git] / src / gromacs / fileio / matio.cpp

diff --git a/src/gromacs/fileio/matio.cpp b/src/gromacs/fileio/matio.cpp
index 4fb86f27f1f8d26d84e664e6bd19bb3c529b2b5d..0fb307ca73b7dd7883c5abd92df01d82548847c4 100644 (file)
--- a/src/gromacs/fileio/matio.cpp
+++ b/src/gromacs/fileio/matio.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2013,2014,2015, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014,2015,2017, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -95,7 +95,7 @@ void done_matrix(int nx, real ***m)
         sfree((*m)[i]);
     }
     sfree(*m);
-    *m = NULL;
+    *m = nullptr;
 }
 
 gmx_bool matelmt_cmp(t_xpmelmt e1, t_xpmelmt e2)
@@ -126,7 +126,7 @@ int getcmap(FILE *in, const char *fn, t_mapping **map)
     double     r, g, b;
     t_mapping *m;
 
-    if (fgets2(line, STRLEN-1, in) == NULL)
+    if (fgets2(line, STRLEN-1, in) == nullptr)
     {
         gmx_fatal(FARGS, "Not enough lines in colormap file %s"
                   "(just wanted to read number of entries)", fn);
@@ -135,7 +135,7 @@ int getcmap(FILE *in, const char *fn, t_mapping **map)
     snew(m, n);
     for (i = 0; (i < n); i++)
     {
-        if (fgets2(line, STRLEN-1, in) == NULL)
+        if (fgets2(line, STRLEN-1, in) == nullptr)
         {
             gmx_fatal(FARGS, "Not enough lines in colormap file %s"
                       "(should be %d, found only %d)", fn, n+1, i);
@@ -226,7 +226,7 @@ static char *line2string(char **line)
 {
     int i;
 
-    if (*line != NULL)
+    if (*line != nullptr)
     {
         while (((*line)[0] != '\"' ) && ( (*line)[0] != '\0' ))
         {
@@ -235,7 +235,7 @@ static char *line2string(char **line)
 
         if ((*line)[0] != '\"')
         {
-            return NULL;
+            return nullptr;
         }
         (*line)++;
 
@@ -247,7 +247,7 @@ static char *line2string(char **line)
 
         if ((*line)[i] != '\"')
         {
-            *line = NULL;
+            *line = nullptr;
         }
         else
         {
@@ -273,7 +273,7 @@ static void parsestring(char *line, const char *label, char *string)
 static void read_xpm_entry(FILE *in, t_matrix *mm)
 {
     t_mapping   *map;
-    char        *line_buf = NULL, *line = NULL, *str, buf[256] = {0};
+    char        *line_buf = nullptr, *line = nullptr, *str, buf[256] = {0};
     int          i, m, col_len, nch = 0, n_axis_x, n_axis_y, llmax;
     int          llalloc = 0;
     unsigned int r, g, b;
@@ -286,14 +286,14 @@ static void read_xpm_entry(FILE *in, t_matrix *mm)
     mm->legend[0]  = 0;
     mm->label_x[0] = 0;
     mm->label_y[0] = 0;
-    mm->matrix     = NULL;
-    mm->axis_x     = NULL;
-    mm->axis_y     = NULL;
+    mm->matrix     = nullptr;
+    mm->axis_x     = nullptr;
+    mm->axis_y     = nullptr;
     mm->bDiscrete  = FALSE;
 
     llmax = STRLEN;
 
-    while ((NULL != fgetline(&line_buf, llmax, &llalloc, in)) &&
+    while ((nullptr != fgetline(&line_buf, llmax, &llalloc, in)) &&
            (std::strncmp(line_buf, "static", 6) != 0))
     {
         line = line_buf;
@@ -322,7 +322,7 @@ static void read_xpm_entry(FILE *in, t_matrix *mm)
 
     /* Read sizes */
     bGetOnWithIt = FALSE;
-    while (!bGetOnWithIt && (NULL != fgetline(&line_buf, llmax, &llalloc, in)))
+    while (!bGetOnWithIt && (nullptr != fgetline(&line_buf, llmax, &llalloc, in)))
     {
         line = line_buf;
         while (( line[0] != '\"' ) && ( line[0] != '\0' ))
@@ -359,7 +359,7 @@ static void read_xpm_entry(FILE *in, t_matrix *mm)
     /* Read color map */
     snew(map, mm->nmap);
     m = 0;
-    while ((m < mm->nmap) && (NULL != fgetline(&line_buf, llmax, &llalloc, in)))
+    while ((m < mm->nmap) && (nullptr != fgetline(&line_buf, llmax, &llalloc, in)))
     {
         line = std::strchr(line_buf, '\"');
         if  (line)
@@ -448,7 +448,7 @@ static void read_xpm_entry(FILE *in, t_matrix *mm)
         {
             line = std::strstr(line, "x-axis");
             skipstr(line);
-            if (mm->axis_x == NULL)
+            if (mm->axis_x == nullptr)
             {
                 snew(mm->axis_x, mm->nx + 1);
             }
@@ -471,7 +471,7 @@ static void read_xpm_entry(FILE *in, t_matrix *mm)
         {
             line = std::strstr(line, "y-axis");
             skipstr(line);
-            if (mm->axis_y == NULL)
+            if (mm->axis_y == nullptr)
             {
                 snew(mm->axis_y, mm->ny + 1);
             }
@@ -491,7 +491,7 @@ static void read_xpm_entry(FILE *in, t_matrix *mm)
             }
         }
     }
-    while ((line[0] != '\"') && (NULL != fgetline(&line_buf, llmax, &llalloc, in)));
+    while ((line[0] != '\"') && (nullptr != fgetline(&line_buf, llmax, &llalloc, in)));
 
     /* Read matrix */
     snew(mm->matrix, mm->nx);
@@ -539,7 +539,7 @@ static void read_xpm_entry(FILE *in, t_matrix *mm)
             m--;
         }
     }
-    while ((m >= 0) && (NULL != fgetline(&line_buf, llmax, &llalloc, in)));
+    while ((m >= 0) && (nullptr != fgetline(&line_buf, llmax, &llalloc, in)));
     if (m >= 0)
     {
         gmx_incons("Not enough rows in the matrix");
@@ -551,14 +551,14 @@ static void read_xpm_entry(FILE *in, t_matrix *mm)
 int read_xpm_matrix(const char *fnm, t_matrix **mat)
 {
     FILE *in;
-    char *line = NULL;
+    char *line = nullptr;
     int   nmat;
     int   llalloc = 0;
 
     in = gmx_fio_fopen(fnm, "r");
 
     nmat = 0;
-    while (NULL != fgetline(&line, STRLEN, &llalloc, in))
+    while (nullptr != fgetline(&line, STRLEN, &llalloc, in))
     {
         if (std::strstr(line, "/* XPM */"))
         {
@@ -592,18 +592,18 @@ real **matrix2real(t_matrix *in, real **out)
 
     for (i = 0; i < nmap; i++)
     {
-        if ((map[i].desc == NULL) || (sscanf(map[i].desc, "%lf", &tmp) != 1))
+        if ((map[i].desc == nullptr) || (sscanf(map[i].desc, "%lf", &tmp) != 1))
         {
             fprintf(stderr, "Could not convert matrix to reals,\n"
                     "color map entry %d has a non-real description: \"%s\"\n",
                     i, map[i].desc);
             sfree(rmap);
-            return NULL;
+            return nullptr;
         }
         rmap[i] = tmp;
     }
 
-    if (out == NULL)
+    if (out == nullptr)
     {
         snew(out, in->nx);
         for (i = 0; i < in->nx; i++)