From 9059377477607e996a0442422368149611a19d90 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 05:38:32 +0000 Subject: [PATCH] Committing clang-format changes --- src/H5Dchunk.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index fd1a80aa4fc..ff5c339bab0 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -5554,15 +5554,15 @@ H5D__chunk_collective_fill(const H5D_t *dset, H5D_chunk_coll_fill_info_t *chunk_ size_t leftover_blocks; /* Number of leftover blocks to handle */ int blocks; /* converted to int for MPI */ int leftover; /* converted to int for MPI */ - H5FD_mpio_xfer_t prev_xfer_mode; /* Previous data xfer mode */ - bool have_xfer_mode = false; /* Whether the previous xffer mode has been retrieved */ + H5FD_mpio_xfer_t prev_xfer_mode; /* Previous data xfer mode */ + bool have_xfer_mode = false; /* Whether the previous xffer mode has been retrieved */ size_t i; /* Local index variable */ haddr_t *io_addrs = NULL; size_t *io_sizes = NULL; const void **io_wbufs = NULL; H5FD_mem_t io_types[2]; bool all_same_block_len = true; - bool need_sort = false; + bool need_sort = false; size_t io_2sizes[2]; herr_t ret_value = SUCCEED; /* Return value */ @@ -5605,15 +5605,15 @@ H5D__chunk_collective_fill(const H5D_t *dset, H5D_chunk_coll_fill_info_t *chunk_ H5_CHECKED_ASSIGN(blocks, int, num_blocks, size_t); H5_CHECKED_ASSIGN(leftover, int, leftover_blocks, size_t); - /* Check if we have any chunks to write on this rank */ - if (num_blocks > 0 || (leftover && leftover > mpi_rank)) { + /* Check if we have any chunks to write on this rank */ + if (num_blocks > 0 || (leftover && leftover > mpi_rank)) { if (NULL == (io_addrs = H5MM_malloc((size_t)(blocks + 1) * sizeof(*io_addrs)))) - HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "couldn't allocate space for I/O addresses vector"); + HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, + "couldn't allocate space for I/O addresses vector"); if (NULL == (io_wbufs = H5MM_malloc((size_t)(blocks + 1) * sizeof(*io_wbufs)))) HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "couldn't allocate space for I/O buffers vector"); - } /* @@ -5630,8 +5630,8 @@ H5D__chunk_collective_fill(const H5D_t *dset, H5D_chunk_coll_fill_info_t *chunk_ } if (need_sort) - qsort(chunk_fill_info->chunk_info, chunk_fill_info->num_chunks, - sizeof(struct chunk_coll_fill_info), H5D__chunk_cmp_coll_fill_info); + qsort(chunk_fill_info->chunk_info, chunk_fill_info->num_chunks, sizeof(struct chunk_coll_fill_info), + H5D__chunk_cmp_coll_fill_info); if (all_same_block_len) { io_2sizes[0] = chunk_fill_info->chunk_info[0].chunk_size; @@ -5660,8 +5660,7 @@ H5D__chunk_collective_fill(const H5D_t *dset, H5D_chunk_coll_fill_info_t *chunk_ } if (leftover && leftover > mpi_rank) { - io_addrs[blocks] = - chunk_fill_info->chunk_info[(blocks * mpi_size) + mpi_rank].addr; + io_addrs[blocks] = chunk_fill_info->chunk_info[(blocks * mpi_size) + mpi_rank].addr; if (!all_same_block_len) io_sizes[blocks] = chunk_fill_info->chunk_info[(blocks * mpi_size) + mpi_rank].chunk_size; @@ -5669,7 +5668,8 @@ H5D__chunk_collective_fill(const H5D_t *dset, H5D_chunk_coll_fill_info_t *chunk_ if (chunk_fill_info->chunk_info[(blocks * mpi_size) + mpi_rank].unfiltered_partial_chunk) { assert(partial_chunk_fill_buf); io_wbufs[blocks] = partial_chunk_fill_buf; - } else + } + else io_wbufs[blocks] = fill_buf; blocks++; @@ -5692,7 +5692,6 @@ H5D__chunk_collective_fill(const H5D_t *dset, H5D_chunk_coll_fill_info_t *chunk_ all_same_block_len ? io_2sizes : io_sizes, io_wbufs) < 0) HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "vector write call failed"); - done: if (have_xfer_mode) /* Set transfer mode */