1.10 merge clang tidy of examples and hl (#966)

* Merge of clang tidy of examples and hl from 1.12

* Committing clang-format changes

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

6 files changed, 65 insertions, 44 deletions

diff --git a/hl/test/gen_test_ds.c b/hl/test/gen_test_ds.c
index 368c083..a56e6cf 100644
--- a/hl/test/gen_test_ds.c
+++ b/hl/test/gen_test_ds.c
@@ -75,7 +75,7 @@ main(int argc, char **argv)
     int  nerrors = 0;
     char filename[65];
 
-    if (argc < 2) {
+    if (argc < 2 || !argv[0] || !argv[1]) {
         HDprintf("Usage: gen_test [le | be]\n");
         return 1;
     }
diff --git a/hl/test/test_ds.c b/hl/test/test_ds.c
index cc941cc..964e13f 100644
--- a/hl/test/test_ds.c
+++ b/hl/test/test_ds.c
@@ -406,10 +406,10 @@ create_int_dataset(hid_t fid, const char *dsidx, int fulldims)
 herr_t
 create_long_dataset(hid_t fid, const char *dsname, const char *dsidx, int fulldims)
 {
-    int     rank    = 4;
-    int     rankds  = 1;
-    hsize_t dims[4] = {DIM1_SIZE, DIM2_SIZE, DIM3_SIZE, DIM4_SIZE};
-    long *  buf;
+    int     rank                = 4;
+    int     rankds              = 1;
+    hsize_t dims[4]             = {DIM1_SIZE, DIM2_SIZE, DIM3_SIZE, DIM4_SIZE};
+    long *  buf                 = NULL;
     hsize_t s1_dim[1]           = {DIM1_SIZE};
     hsize_t s2_dim[1]           = {DIM2_SIZE};
     hsize_t s3_dim[1]           = {DIM3_SIZE};
@@ -431,49 +431,54 @@ create_long_dataset(hid_t fid, const char *dsname, const char *dsidx, int fulldi
 
     /* Allocate buffer */
     if (NULL == (buf = (long *)HDmalloc(sizeof(long) * DIM1_SIZE * DIM2_SIZE * DIM3_SIZE * DIM4_SIZE)))
-        return FAIL;
+        goto error;
 
     /* make a dataset */
     if (H5LTmake_dataset_long(fid, dsname, rank, dims, buf) >= 0) {
         if (fulldims == 0) {
             /* make a DS dataset for the first dimension */
             if (create_DS1_long_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, NULL) < 0)
-                return FAIL;
+                goto error;
 
             /* make a DS dataset for the second dimension */
             if (create_DS2_long_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, NULL, NULL) < 0)
-                return FAIL;
+                goto error;
 
             /* make a DS dataset for the third dimension */
             if (create_DS3_long_datasets(fid, dsidx, rankds, s3_dim, s3_wbuf, NULL, NULL, NULL) < 0)
-                return FAIL;
+                goto error;
 
             /* make a DS dataset for the fourth dimension */
             if (create_DS4_long_datasets(fid, dsidx, rankds, s4_dim, s4_wbuf, NULL, NULL, NULL, NULL) < 0)
-                return FAIL;
+                goto error;
         }
         else {
             if (create_DS1_long_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, s11_wbuf) < 0)
-                return FAIL;
+                goto error;
 
             if (create_DS2_long_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, s21_wbuf, s22_wbuf) < 0)
-                return FAIL;
+                goto error;
 
             if (create_DS3_long_datasets(fid, dsidx, rankds, s3_dim, s3_wbuf, s31_wbuf, s32_wbuf, s33_wbuf) <
                 0)
-                return FAIL;
+                goto error;
 
             if (create_DS4_long_datasets(fid, dsidx, rankds, s4_dim, s4_wbuf, s41_wbuf, s42_wbuf, s43_wbuf,
                                          s44_wbuf) < 0)
-                return FAIL;
+                goto error;
         }
     }
     else
-        return FAIL;
+        goto error;
 
     HDfree(buf);
 
     return SUCCEED;
+
+error:
+    HDfree(buf);
+
+    return FAIL;
 }
 
 herr_t
@@ -4959,12 +4964,12 @@ read_data(const char *fname, int ndims, hsize_t *dims, float **buf)
     }
 
     for (i = 0, nelms = 1; i < ndims; i++) {
-        if (fscanf(f, "%s %u", str, &j) && HDferror(f)) {
+        if (HDfscanf(f, "%s %u", str, &j) && HDferror(f)) {
             HDprintf("fscanf error in file %s\n", data_file);
             HDfclose(f);
             return -1;
         } /* end if */
-        if (fscanf(f, "%d", &n) < 0 && HDferror(f)) {
+        if (HDfscanf(f, "%d", &n) < 0 && HDferror(f)) {
             HDprintf("fscanf error in file %s\n", data_file);
             HDfclose(f);
             return -1;
@@ -4982,7 +4987,7 @@ read_data(const char *fname, int ndims, hsize_t *dims, float **buf)
     }
 
     for (j = 0; j < nelms; j++) {
-        if (fscanf(f, "%f", &val) < 0 && HDferror(f)) {
+        if (HDfscanf(f, "%f", &val) < 0 && HDferror(f)) {
             HDprintf("fscanf error in file %s\n", data_file);
             HDfclose(f);
             return -1;
diff --git a/hl/test/test_file_image.c b/hl/test/test_file_image.c
index b397a81..bde8adc 100644
--- a/hl/test/test_file_image.c
+++ b/hl/test/test_file_image.c
@@ -53,8 +53,8 @@
 static int
 test_file_image(size_t open_images, size_t nflags, const unsigned *flags)
 {
-    hid_t * file_id, *dset_id, file_space, plist; /* HDF5 ids */
-    hsize_t dims1[RANK]    = {2, 3};              /* original dimension of datasets */
+    hid_t * file_id = NULL, *dset_id = NULL, file_space, plist; /* HDF5 ids */
+    hsize_t dims1[RANK]    = {2, 3};                            /* original dimension of datasets */
     hsize_t max_dims[RANK] = {H5S_UNLIMITED, H5S_UNLIMITED};
     int     data1[6]       = {1, 2, 3, 4, 5, 6};    /* original contents of dataset */
     int     data2[6]       = {7, 8, 9, 10, 11, 12}; /* "wrong" contents of dataset */
@@ -63,10 +63,10 @@ test_file_image(size_t open_images, size_t nflags, const unsigned *flags)
     hsize_t dims4[RANK] = {3, 5};                   /* extended dimensions of datasets */
     int     data4[15]   = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
     /* extended contents of dataset */
-    ssize_t *       buf_size;    /* pointer to array of buffer sizes */
-    void **         buf_ptr;     /* pointer to array of pointers to image buffers */
-    char **         filename;    /* pointer to array of pointers to filenames */
-    unsigned *      input_flags; /* pointer to array of flag combinations */
+    ssize_t *       buf_size    = NULL; /* pointer to array of buffer sizes */
+    void **         buf_ptr     = NULL; /* pointer to array of pointers to image buffers */
+    char **         filename    = NULL; /* pointer to array of pointers to filenames */
+    unsigned *      input_flags = NULL; /* pointer to array of flag combinations */
     size_t          i, j, k, nrow, n_values;
     herr_t          status1;
     void *          handle_ptr       = NULL; /* pointers to driver buffer */
@@ -85,7 +85,7 @@ test_file_image(size_t open_images, size_t nflags, const unsigned *flags)
         FAIL_PUTS_ERROR("malloc() failed");
 
     /* allocate array to store the name of each of the open images */
-    if (NULL == (filename = (char **)HDmalloc(sizeof(char *) * open_images)))
+    if (NULL == (filename = (char **)HDcalloc(1, sizeof(char *) * open_images)))
         FAIL_PUTS_ERROR("malloc() failed");
 
     /* allocate array to store the size of each of the open images */
@@ -110,6 +110,8 @@ test_file_image(size_t open_images, size_t nflags, const unsigned *flags)
 
         /* allocate name buffer for image i */
         filename[i] = (char *)HDmalloc(sizeof(char) * 32);
+        if (!filename[i])
+            FAIL_PUTS_ERROR("HDmalloc() failed");
 
         /* create file name */
         HDsprintf(filename[i], "image_file%d.h5", (int)i);
@@ -232,6 +234,9 @@ test_file_image(size_t open_images, size_t nflags, const unsigned *flags)
             if (input_flags[i] & H5LT_FILE_IMAGE_OPEN_RW && !(input_flags[i] & H5LT_FILE_IMAGE_DONT_COPY)) {
 
                 void *tmp_ptr = HDmalloc((size_t)buf_size[i]);
+                if (!tmp_ptr)
+                    FAIL_PUTS_ERROR("buffer allocation failed");
+
                 /* Copy vfd buffer to a temporary buffer */
                 HDmemcpy(tmp_ptr, (void *)*core_buf_ptr_ptr, (size_t)buf_size[i]);
                 /* Clear status_flags in the superblock for the vfd buffer: file locking is using status_flags
@@ -525,6 +530,17 @@ test_file_image(size_t open_images, size_t nflags, const unsigned *flags)
     return 0;
 
 error:
+    if (filename) {
+        for (i = 0; i < open_images; i++)
+            HDfree(filename[i]);
+        HDfree(filename);
+    }
+    HDfree(file_id);
+    HDfree(dset_id);
+    HDfree(buf_ptr);
+    HDfree(buf_size);
+    HDfree(input_flags);
+
     H5_FAILED();
     return -1;
 }
diff --git a/hl/test/test_image.c b/hl/test/test_image.c
index dc1be96..81340c1 100644
--- a/hl/test/test_image.c
+++ b/hl/test/test_image.c
@@ -580,11 +580,11 @@ test_generate(void)
     !
     */
 
-    if (fscanf(f, "%d %d %d", &imax, &jmax, &kmax) < 0 && HDferror(f)) {
+    if (HDfscanf(f, "%d %d %d", &imax, &jmax, &kmax) < 0 && HDferror(f)) {
         HDprintf("fscanf error in file %s.\n", data_file);
         goto out;
     } /* end if */
-    if (fscanf(f, "%f %f %f", &valex, &xmin, &xmax) < 0 && HDferror(f)) {
+    if (HDfscanf(f, "%f %f %f", &valex, &xmin, &xmax) < 0 && HDferror(f)) {
         HDprintf("fscanf error in file %s.\n", data_file);
         goto out;
     } /* end if */
@@ -615,7 +615,7 @@ test_generate(void)
         goto out;
 
     for (i = 0; i < n_elements; i++) {
-        if (fscanf(f, "%f ", &value) < 0 && HDferror(f)) {
+        if (HDfscanf(f, "%f ", &value) < 0 && HDferror(f)) {
             HDprintf("fscanf error in file %s.\n", data_file);
             goto out;
         } /* end if */
@@ -779,32 +779,32 @@ read_data(const char *fname, /*IN*/
         goto out;
     }
 
-    if (fscanf(f, "%s", str) < 0 && HDferror(f)) {
+    if (HDfscanf(f, "%s", str) < 0 && HDferror(f)) {
         HDprintf("fscanf error in file %s.\n", data_file);
         goto out;
     } /* end if */
 
-    if (fscanf(f, "%d", &color_planes) < 0 && HDferror(f)) {
+    if (HDfscanf(f, "%d", &color_planes) < 0 && HDferror(f)) {
         HDprintf("fscanf error in file %s.\n", data_file);
         goto out;
     } /* end if */
 
-    if (fscanf(f, "%s", str) < 0 && HDferror(f)) {
+    if (HDfscanf(f, "%s", str) < 0 && HDferror(f)) {
         HDprintf("fscanf error in file %s.\n", data_file);
         goto out;
     } /* end if */
 
-    if (fscanf(f, "%d", &h) < 0 && HDferror(f)) {
+    if (HDfscanf(f, "%d", &h) < 0 && HDferror(f)) {
         HDprintf("fscanf error in file %s.\n", data_file);
         goto out;
     } /* end if */
 
-    if (fscanf(f, "%s", str) < 0 && HDferror(f)) {
+    if (HDfscanf(f, "%s", str) < 0 && HDferror(f)) {
         HDprintf("fscanf error in file %s.\n", data_file);
         goto out;
     } /* end if */
 
-    if (fscanf(f, "%d", &w) < 0 && HDferror(f)) {
+    if (HDfscanf(f, "%d", &w) < 0 && HDferror(f)) {
         HDprintf("fscanf error in file %s.\n", data_file);
         goto out;
     } /* end if */
@@ -838,7 +838,7 @@ read_data(const char *fname, /*IN*/
 
     /* Read data elements */
     for (i = 0; i < n_elements; i++) {
-        if (fscanf(f, "%d", &n) < 0 && HDferror(f)) {
+        if (HDfscanf(f, "%d", &n) < 0 && HDferror(f)) {
             HDprintf("fscanf error in file %s.\n", data_file);
             goto out;
         } /* end if */
@@ -936,7 +936,7 @@ read_palette(const char *fname, rgb_t *palette, size_t palette_size)
         return -1;
     }
 
-    if (sscanf(buffer, "%u", &nentries) != 1) {
+    if (HDsscanf(buffer, "%u", &nentries) != 1) {
         HDfclose(file);
         return -1;
     }
@@ -950,7 +950,7 @@ read_palette(const char *fname, rgb_t *palette, size_t palette_size)
     /* read the palette entries */
     for (u = 0; u < nentries; u++) {
         /* extract the red, green and blue color components.  */
-        if (fscanf(file, "%u %u %u", &red, &green, &blue) != 3) {
+        if (HDfscanf(file, "%u %u %u", &red, &green, &blue) != 3) {
             HDfclose(file);
             return -1;
         }
diff --git a/hl/test/test_packet.c b/hl/test/test_packet.c
index 311f36a..88f227b 100644
--- a/hl/test/test_packet.c
+++ b/hl/test/test_packet.c
@@ -45,10 +45,10 @@ typedef struct particle_t {
  * a static array of particles for writing and checking reads
  *-------------------------------------------------------------------------
  */
-static particle_t testPart[NRECORDS] = {{"zero", 0, 0, 0.0f, 0.0},    {"one", 10, 10, 1.0f, 10.0},
-                                        {"two", 20, 20, 2.0f, 20.0},  {"three", 30, 30, 3.0f, 30.0},
-                                        {"four", 40, 40, 4.0f, 40.0}, {"five", 50, 50, 5.0f, 50.0},
-                                        {"six", 60, 60, 6.0f, 60.0},  {"seven", 70, 70, 7.0f, 70.0}};
+static particle_t testPart[NRECORDS] = {{"zero", 0, 0, 0.0F, 0.0},    {"one", 10, 10, 1.0F, 10.0},
+                                        {"two", 20, 20, 2.0F, 20.0},  {"three", 30, 30, 3.0F, 30.0},
+                                        {"four", 40, 40, 4.0F, 40.0}, {"Five", 50, 50, 5.0F, 50.0},
+                                        {"six", 60, 60, 6.0F, 60.0},  {"seven", 70, 70, 7.0F, 70.0}};
 
 /*-------------------------------------------------------------------------
  * function that compares one particle
diff --git a/hl/test/test_table.c b/hl/test/test_table.c
index 531f778..6199e27 100644
--- a/hl/test/test_table.c
+++ b/hl/test/test_table.c
@@ -245,7 +245,7 @@ test_table(hid_t fid, int do_write)
                                  {"six", 60, 6.0, 60.0, 60},
                                  {"seven", 70, 7.0, 70.0, 70}};
     /* buffers for the field "Pressure" and "New_field" */
-    float pressure_in[NRECORDS] = {0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f};
+    float pressure_in[NRECORDS] = {0.0F, 1.0F, 2.0F, 3.0F, 4.0F, 5.0F, 6.0F, 7.0F};
     float pressure_out[NRECORDS];
     int   buf_new[NRECORDS] = {0, 1, 2, 3, 4, 5, 6, 7};
     /* buffers for the fields "Latitude,Longitude"  */
@@ -254,8 +254,8 @@ test_table(hid_t fid, int do_write)
     /* buffers for the fields "Name,Pressure"  */
     namepressure_t namepre_out[NRECORDS];
     namepressure_t namepre_in[NRECORDS] = {
-        {"zero", 0.0f}, {"one", 1.0f},  {"two", 2.0f}, {"three", 3.0f},
-        {"four", 4.0f}, {"five", 5.0f}, {"six", 6.0f}, {"seven", 7.0f},
+        {"zero", 0.0F}, {"one", 1.0F},  {"two", 2.0F}, {"three", 3.0F},
+        {"four", 4.0F}, {"five", 5.0F}, {"six", 6.0F}, {"seven", 7.0F},
     };
 
     /*-------------------------------------------------------------------------