Merge pull request #1782 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:warning_fixes to develop

* commit '1c4101c6a77dd9223483dd9e3f7bec0f9e92f435':
  Fixed various warnings in testhdf5 files.
  Warning fixes: * fix for static/const flipped in H5Dint.c * Removed missing done target in H5Rint.c * Fixed misleading indentation in h5format_convert.c

1 files changed, 6 insertions, 4 deletions

diff --git a/tools/src/h5format_convert/h5format_convert.c b/tools/src/h5format_convert/h5format_convert.c
index b9ed9ce..5fb02f4 100644
--- a/tools/src/h5format_convert/h5format_convert.c
+++ b/tools/src/h5format_convert/h5format_convert.c
@@ -260,8 +260,9 @@ convert(hid_t fid, const char *dname)
             h5tools_setstatus(EXIT_FAILURE);
             goto error;
 	    }
-        else if(verbose_g)
+        else if(verbose_g) {
             HDfprintf(stdout, "Retrieve the dataset's chunk indexing type\n");
+        }
 
         if(idx_type == H5D_CHUNK_IDX_BTREE) {
             if(verbose_g)
@@ -269,8 +270,9 @@ convert(hid_t fid, const char *dname)
             h5tools_setstatus(EXIT_SUCCESS);
             goto done;
 	    }
-        else if (verbose_g)
+        else if(verbose_g) {
             HDfprintf(stdout, "Dataset's chunk indexing type is not version 1 B-tree\n");
+        }
 
 	    break;
 
@@ -302,8 +304,8 @@ convert(hid_t fid, const char *dname)
     if(noop_g) {
         if(verbose_g)
             HDfprintf(stdout, "Not converting the dataset\n");
-            h5tools_setstatus(EXIT_SUCCESS);
-            goto done;
+        h5tools_setstatus(EXIT_SUCCESS);
+        goto done;
     }
 
     if(verbose_g)