Committing clang-format changes

HDFGroup · Aug 17, 2023 · 182d9c1 · 182d9c1
1 parent 665783c
commit 182d9c1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/src/H5Dint.c b/src/H5Dint.c
@@ -1664,11 +1664,11 @@ H5D__append_flush_setup(H5D_t *dset, hid_t dapl_id)
 static herr_t
 H5D__open_oid(H5D_t *dataset, hid_t dapl_id)
 {
-    H5P_genplist_t *plist;                       /* Property list */
-    H5O_fill_t     *fill_prop;                   /* Pointer to dataset's fill value info */
-    unsigned        alloc_time_state;            /* Allocation time state */
-    htri_t          msg_exists;                  /* Whether a particular type of message exists */
-    hbool_t         layout_init       = FALSE;   /* Flag to indicate that chunk information was initialized */
+    H5P_genplist_t *plist;                     /* Property list */
+    H5O_fill_t     *fill_prop;                 /* Pointer to dataset's fill value info */
+    unsigned        alloc_time_state;          /* Allocation time state */
+    htri_t          msg_exists;                /* Whether a particular type of message exists */
+    hbool_t         layout_init       = FALSE; /* Flag to indicate that chunk information was initialized */
     hbool_t         must_init_storage = FALSE;
     herr_t          ret_value         = SUCCEED; /* Return value */
 
@@ -1824,9 +1824,10 @@ H5D__open_oid(H5D_t *dataset, hid_t dapl_id)
      * will coordinate that.
      */
     must_init_storage = (H5F_INTENT(dataset->oloc.file) & H5F_ACC_RDWR) &&
-            !(*dataset->shared->layout.ops->is_space_alloc)(&dataset->shared->layout.storage);
-    must_init_storage = must_init_storage && (H5F_HAS_FEATURE(dataset->oloc.file, H5FD_FEAT_ALLOCATE_EARLY)
-            || (H5F_HAS_FEATURE(dataset->oloc.file, H5FD_FEAT_HAS_MPI) && dataset->shared->dcpl_cache.pline.nused == 0));
+                        !(*dataset->shared->layout.ops->is_space_alloc)(&dataset->shared->layout.storage);
+    must_init_storage = must_init_storage && (H5F_HAS_FEATURE(dataset->oloc.file, H5FD_FEAT_ALLOCATE_EARLY) ||
+                                              (H5F_HAS_FEATURE(dataset->oloc.file, H5FD_FEAT_HAS_MPI) &&
+                                               dataset->shared->dcpl_cache.pline.nused == 0));
 
     if (must_init_storage && (H5D__alloc_storage(dataset, H5D_ALLOC_OPEN, FALSE, NULL) < 0))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize file storage");

diff --git a/testpar/t_chunk_alloc.c b/testpar/t_chunk_alloc.c
@@ -538,13 +538,14 @@ test_chunk_alloc_incr_ser_to_par(void)
 
     filename = (const char *)GetTestParameters();
     if (MAINPROCESS && VERBOSE_MED)
-        printf("Chunked dataset incremental file space allocation serial to parallel test on file %s\n", filename);
+        printf("Chunked dataset incremental file space allocation serial to parallel test on file %s\n",
+               filename);
 
     nchunks      = (size_t)(CHUNK_FACTOR * mpi_size);
     dset_dims[0] = (hsize_t)(nchunks * CHUNK_SIZE);
 
     if (mpi_rank == 0) {
-        hsize_t chunk_dims[1] = { CHUNK_SIZE };
+        hsize_t chunk_dims[1] = {CHUNK_SIZE};
         hid_t   space_id      = H5I_INVALID_HID;
         hid_t   dcpl_id       = H5I_INVALID_HID;
 
@@ -564,7 +565,8 @@ test_chunk_alloc_incr_ser_to_par(void)
         VRFY((space_id >= 0), "H5Screate_simple");
 
         /* Create a chunked dataset without a filter applied to it */
-        dset_id = H5Dcreate2(fid, "dset_no_filter", H5T_NATIVE_INT, space_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT);
+        dset_id =
+            H5Dcreate2(fid, "dset_no_filter", H5T_NATIVE_INT, space_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT);
         VRFY((dset_id >= 0), "H5Dcreate2");
 
         ret = H5Dclose(dset_id);
@@ -683,7 +685,8 @@ test_chunk_alloc_incr_ser_to_par(void)
     ret = H5Dget_space_status(dset_id, &space_status);
     VRFY((ret == SUCCEED), "H5Dread");
 
-    VRFY((space_status == H5D_SPACE_STATUS_NOT_ALLOCATED), "file space allocation status verification succeeded");
+    VRFY((space_status == H5D_SPACE_STATUS_NOT_ALLOCATED),
+         "file space allocation status verification succeeded");
 
     alloc_size = H5Dget_storage_size(dset_id);
     VRFY((0 == alloc_size), "file space allocation size verification succeeded");
@@ -754,4 +757,3 @@ test_chunk_alloc_incr_ser_to_par(void)
     H5Pclose(fapl_id);
     H5Fclose(fid);
 }
-
diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c
@@ -373,8 +373,8 @@ main(int argc, char **argv)
     AddTest("selnone", none_selection_chunk, NULL, "chunked dataset with none-selection", PARATESTFILE);
     AddTest("calloc", test_chunk_alloc, NULL, "parallel extend Chunked allocation on serial file",
             PARATESTFILE);
-    AddTest("chkallocser2par", test_chunk_alloc_incr_ser_to_par, NULL, "chunk allocation from serial to parallel file access",
-            PARATESTFILE);
+    AddTest("chkallocser2par", test_chunk_alloc_incr_ser_to_par, NULL,
+            "chunk allocation from serial to parallel file access", PARATESTFILE);
     AddTest("fltread", test_filter_read, NULL, "parallel read of dataset written serially with filters",
             PARATESTFILE);