Committing clang-format changes

HDFGroup · Aug 3, 2022 · 3d84c15 · 3d84c15
1 parent 3481f37
commit 3d84c15
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 18 deletions.
diff --git a/src/H5FDsubfiling/H5FDioc.c b/src/H5FDsubfiling/H5FDioc.c
@@ -886,7 +886,7 @@ H5FD__ioc_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
     }
     else {
         subfiling_context_t *sf_context  = NULL;
-        void *               file_handle = NULL;
+        void                *file_handle = NULL;
         int                  ioc_flags;
         int                  l_error = 0;
         int                  g_error = 0;
@@ -1598,12 +1598,12 @@ H5FD__ioc_del(const char *name, hid_t fapl)
     h5_stat_t       st;
     MPI_Comm        comm          = MPI_COMM_NULL;
     MPI_Info        info          = MPI_INFO_NULL;
-    FILE *          config_file   = NULL;
-    char *          name_copy     = NULL;
-    char *          name_copy2    = NULL;
-    char *          tmp_filename  = NULL;
-    char *          base_filename = NULL;
-    char *          file_dirname  = NULL;
+    FILE           *config_file   = NULL;
+    char           *name_copy     = NULL;
+    char           *name_copy2    = NULL;
+    char           *tmp_filename  = NULL;
+    char           *base_filename = NULL;
+    char           *file_dirname  = NULL;
     int             mpi_rank      = INT_MAX;
     int             mpi_code;
     herr_t          ret_value = SUCCEED;

diff --git a/src/H5FDsubfiling/H5FDsubfiling.c b/src/H5FDsubfiling/H5FDsubfiling.c
@@ -847,7 +847,7 @@ H5FD__subfiling_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t ma
     H5FD_driver_prop_t             driver_prop; /* Property for driver ID & info */
     hbool_t                        bcasted_eof = FALSE;
     int64_t                        sf_eof      = -1;
-    void *                         file_handle = NULL;
+    void                          *file_handle = NULL;
     int                            mpi_code; /* MPI return code */
     H5FD_t                        *ret_value = NULL;
 

diff --git a/src/H5FDsubfiling/H5subfiling_common.c b/src/H5FDsubfiling/H5subfiling_common.c
@@ -20,7 +20,7 @@
 #include "H5subfiling_err.h"
 
 typedef struct {           /* Format of a context map entry  */
-    void *  file_handle;   /* key value (linear search of the cache) */
+    void   *file_handle;   /* key value (linear search of the cache) */
     int64_t sf_context_id; /* The return value if matching file_handle */
 } file_map_to_context_t;
 
@@ -87,7 +87,7 @@ static herr_t init_subfiling(H5FD_subfiling_shared_config_t *subfiling_config, M
                              int64_t *context_id_out);
 static herr_t init_app_topology(H5FD_subfiling_ioc_select_t ioc_selection_type, MPI_Comm comm,
                                 sf_topology_t **app_topology_out);
-static herr_t init_subfiling_context(subfiling_context_t *           sf_context,
+static herr_t init_subfiling_context(subfiling_context_t            *sf_context,
                                      H5FD_subfiling_shared_config_t *subfiling_config,
                                      sf_topology_t *app_topology, MPI_Comm file_comm);
 static herr_t open_subfile_with_context(subfiling_context_t *sf_context, int file_acc_flags);
@@ -2566,8 +2566,8 @@ open_config_file(subfiling_context_t *sf_context, const char *base_filename, con
 herr_t
 H5_get_num_iocs_from_config_file(FILE *config_file, int *n_io_concentrators)
 {
-    char * config_buf      = NULL;
-    char * ioc_substr      = NULL;
+    char  *config_buf      = NULL;
+    char  *ioc_substr      = NULL;
     long   config_file_len = 0;
     int    read_n_io_concs = 0;
     herr_t ret_value       = SUCCEED;

diff --git a/src/H5FDsubfiling/H5subfiling_common.h b/src/H5FDsubfiling/H5subfiling_common.h
@@ -153,7 +153,7 @@ typedef struct topology {
 typedef struct {
     int64_t        sf_context_id;           /* Generated context ID which embeds the cache index */
     uint64_t       h5_file_id;              /* GUID (basically the inode value) */
-    void *         h5_file_handle;          /* Low-level handle for the HDF5 stub file */
+    void          *h5_file_handle;          /* Low-level handle for the HDF5 stub file */
     int            sf_fid;                  /* value returned by open(file,..)  */
     size_t         sf_write_count;          /* Statistics: write_count  */
     size_t         sf_read_count;           /* Statistics: read_count  */

diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
@@ -81,11 +81,20 @@ const char *volnames[] = {
  *
  */
 const char *drivernames[] = {
-    [SEC2_VFD_IDX] = "sec2",       [DIRECT_VFD_IDX] = "direct", [LOG_VFD_IDX] = "log",
-    [WINDOWS_VFD_IDX] = "windows", [STDIO_VFD_IDX] = "stdio",   [CORE_VFD_IDX] = "core",
-    [FAMILY_VFD_IDX] = "family",   [SPLIT_VFD_IDX] = "split",   [MULTI_VFD_IDX] = "multi",
-    [MPIO_VFD_IDX] = "mpio",       [ROS3_VFD_IDX] = "ros3",     [HDFS_VFD_IDX] = "hdfs",
-    [SUBFILING_VFD_IDX] = H5FD_SUBFILING_NAME, [ONION_VFD_IDX] = "onion",
+    [SEC2_VFD_IDX]      = "sec2",
+    [DIRECT_VFD_IDX]    = "direct",
+    [LOG_VFD_IDX]       = "log",
+    [WINDOWS_VFD_IDX]   = "windows",
+    [STDIO_VFD_IDX]     = "stdio",
+    [CORE_VFD_IDX]      = "core",
+    [FAMILY_VFD_IDX]    = "family",
+    [SPLIT_VFD_IDX]     = "split",
+    [MULTI_VFD_IDX]     = "multi",
+    [MPIO_VFD_IDX]      = "mpio",
+    [ROS3_VFD_IDX]      = "ros3",
+    [HDFS_VFD_IDX]      = "hdfs",
+    [SUBFILING_VFD_IDX] = H5FD_SUBFILING_NAME,
+    [ONION_VFD_IDX]     = "onion",
 };
 
 #define NUM_VOLS    (sizeof(volnames) / sizeof(volnames[0]))