Fix clang-tidy-11 for topology module

[alexxy/gromacs.git] / src / gromacs / topology / block.cpp

diff --git a/src/gromacs/topology/block.cpp b/src/gromacs/topology/block.cpp
index b31d5e2c06905ee77a30f874ccaf2a0ab318ea96..8ffa830c50a7032b751470e72e2e645bb0a0e8ce 100644 (file)
--- a/src/gromacs/topology/block.cpp
+++ b/src/gromacs/topology/block.cpp
@@ -4,7 +4,7 @@
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
  * Copyright (c) 2013,2014,2015,2017,2018 by the GROMACS development team.
- * Copyright (c) 2019,2020, by the GROMACS development team, led by
+ * Copyright (c) 2019,2020,2021, 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.
@@ -104,7 +104,7 @@ void init_blocka_null(t_blocka* block)
 
 t_blocka* new_blocka()
 {
-    t_blocka* block;
+    t_blocka* block = nullptr;
 
     snew(block, 1);
     snew(block->index, 1);
@@ -235,17 +235,15 @@ static int pr_listoflists_title(FILE* fp, int indent, const char* title, const g
 
 static void low_pr_blocka(FILE* fp, int indent, const char* title, const t_blocka* block, gmx_bool bShowNumbers)
 {
-    int i;
-
     if (available(fp, block, indent, title))
     {
         indent = pr_blocka_title(fp, indent, title, block);
-        for (i = 0; i <= block->nr; i++)
+        for (int i = 0; i <= block->nr; i++)
         {
             pr_indent(fp, indent + INDENT);
             fprintf(fp, "%s->index[%d]=%d\n", title, bShowNumbers ? i : -1, block->index[i]);
         }
-        for (i = 0; i < block->nra; i++)
+        for (int i = 0; i < block->nra; i++)
         {
             pr_indent(fp, indent + INDENT);
             fprintf(fp, "%s->a[%d]=%d\n", title, bShowNumbers ? i : -1, block->a[i]);
@@ -255,19 +253,17 @@ static void low_pr_blocka(FILE* fp, int indent, const char* title, const t_block
 
 void pr_block(FILE* fp, int indent, const char* title, const t_block* block, gmx_bool bShowNumbers)
 {
-    int i, start;
-
     if (available(fp, block, indent, title))
     {
-        indent = pr_block_title(fp, indent, title, block);
-        start  = 0;
+        indent    = pr_block_title(fp, indent, title, block);
+        int start = 0;
         if (block->index[start] != 0)
         {
             fprintf(fp, "block->index[%d] should be 0\n", start);
         }
         else
         {
-            for (i = 0; i < block->nr; i++)
+            for (int i = 0; i < block->nr; i++)
             {
                 int end = block->index[i + 1];
                 pr_indent(fp, indent);
@@ -292,23 +288,24 @@ void pr_block(FILE* fp, int indent, const char* title, const t_block* block, gmx
 
 void pr_blocka(FILE* fp, int indent, const char* title, const t_blocka* block, gmx_bool bShowNumbers)
 {
-    int i, j, ok, size, start, end;
+    bool ok = false;
 
     if (available(fp, block, indent, title))
     {
-        indent = pr_blocka_title(fp, indent, title, block);
-        start  = 0;
-        end    = start;
-        if ((ok = static_cast<int>(block->index[start] == 0)) == 0)
+        indent    = pr_blocka_title(fp, indent, title, block);
+        int start = 0;
+        int end   = start;
+        ok        = (block->index[start] == 0);
+        if (!ok)
         {
             fprintf(fp, "block->index[%d] should be 0\n", start);
         }
         else
         {
-            for (i = 0; i < block->nr; i++)
+            for (int i = 0; i < block->nr; i++)
             {
-                end  = block->index[i + 1];
-                size = pr_indent(fp, indent);
+                end      = block->index[i + 1];
+                int size = pr_indent(fp, indent);
                 if (end <= start)
                 {
                     size += fprintf(fp, "%s[%d]={", title, i);
@@ -322,7 +319,7 @@ void pr_blocka(FILE* fp, int indent, const char* title, const t_blocka* block, g
                                     bShowNumbers ? start : -1,
                                     bShowNumbers ? end - 1 : -1);
                 }
-                for (j = start; j < end; j++)
+                for (int j = start; j < end; j++)
                 {
                     if (j > start)
                     {