From d597a1af8794cd72fcd01b768b41643408158c93 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 28 Feb 2022 19:07:55 +0000 Subject: Committing clang-format changes --- src/H5Dchunk.c | 7 ++----- src/H5FDint.c | 40 ++++++++++++++++++---------------------- src/H5FDprivate.h | 14 ++++++-------- src/H5Fio.c | 6 ++---- src/H5Fprivate.h | 8 +++----- 5 files changed, 31 insertions(+), 44 deletions(-) diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index 19986b6..ffaf1a7 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -2674,9 +2674,7 @@ H5D__chunk_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_ * already verified it won't be used, and the metadata accumulator * because this is raw data) */ if (H5F_shared_select_read(H5F_SHARED(io_info->dset->oloc.file), H5FD_MEM_DRAW, (uint32_t)num_chunks, - chunk_mem_spaces, - chunk_file_spaces, chunk_addrs, element_sizes, - bufs) < 0) + chunk_mem_spaces, chunk_file_spaces, chunk_addrs, element_sizes, bufs) < 0) HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "chunk selection read failed") /* Clean up memory */ @@ -3008,8 +3006,7 @@ H5D__chunk_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize * already verified it won't be used, and the metadata accumulator * because this is raw data) */ if (H5F_shared_select_write(H5F_SHARED(io_info->dset->oloc.file), H5FD_MEM_DRAW, (uint32_t)num_chunks, - chunk_mem_spaces, - chunk_file_spaces, chunk_addrs, element_sizes, + chunk_mem_spaces, chunk_file_spaces, chunk_addrs, element_sizes, bufs) < 0) HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "chunk selection read failed") diff --git a/src/H5FDint.c b/src/H5FDint.c index e57c26a..f624aa8 100644 --- a/src/H5FDint.c +++ b/src/H5FDint.c @@ -96,13 +96,13 @@ typedef struct H5FD_get_driver_ud_t { /********************/ /* Local Prototypes */ /********************/ -static int H5FD__get_driver_cb(void *obj, hid_t id, void *_op_data); +static int H5FD__get_driver_cb(void *obj, hid_t id, void *_op_data); static herr_t H5FD__read_selection_translate(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, uint32_t count, - H5S_t **mem_spaces, H5S_t **file_spaces, - haddr_t offsets[], size_t element_sizes[], void *bufs[] /* out */); + H5S_t **mem_spaces, H5S_t **file_spaces, haddr_t offsets[], + size_t element_sizes[], void *bufs[] /* out */); static herr_t H5FD__write_selection_translate(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, uint32_t count, - H5S_t **mem_spaces, H5S_t **file_spaces, - haddr_t offsets[], size_t element_sizes[], const void *bufs[]); + H5S_t **mem_spaces, H5S_t **file_spaces, haddr_t offsets[], + size_t element_sizes[], const void *bufs[]); /*********************/ /* Package Variables */ @@ -734,8 +734,8 @@ done: */ static herr_t H5FD__read_selection_translate(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, uint32_t count, - H5S_t **mem_spaces, H5S_t **file_spaces, - haddr_t offsets[], size_t element_sizes[], void *bufs[] /* out */) + H5S_t **mem_spaces, H5S_t **file_spaces, haddr_t offsets[], + size_t element_sizes[], void *bufs[] /* out */) { hbool_t extend_sizes = FALSE; hbool_t extend_bufs = FALSE; @@ -1032,9 +1032,8 @@ done: *------------------------------------------------------------------------- */ herr_t -H5FD_read_selection(H5FD_t *file, H5FD_mem_t type, uint32_t count, H5S_t **mem_spaces, - H5S_t **file_spaces, haddr_t offsets[], size_t element_sizes[], - void *bufs[] /* out */) +H5FD_read_selection(H5FD_t *file, H5FD_mem_t type, uint32_t count, H5S_t **mem_spaces, H5S_t **file_spaces, + haddr_t offsets[], size_t element_sizes[], void *bufs[] /* out */) { hbool_t offsets_cooked = FALSE; hid_t mem_space_ids_static[8]; @@ -1306,9 +1305,8 @@ H5FD_read_selection_id(H5FD_t *file, H5FD_mem_t type, uint32_t count, hid_t mem_ } /* Translate to vector or scalar I/O */ - if (H5FD__read_selection_translate(file, type, dxpl_id, count, mem_spaces, - file_spaces, offsets, element_sizes, - bufs) < 0) + if (H5FD__read_selection_translate(file, type, dxpl_id, count, mem_spaces, file_spaces, offsets, + element_sizes, bufs) < 0) HGOTO_ERROR(H5E_VFL, H5E_READERROR, FAIL, "translation to vector or scalar read failed") } @@ -1354,8 +1352,8 @@ done: */ static herr_t H5FD__write_selection_translate(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, uint32_t count, - H5S_t **mem_spaces, H5S_t **file_spaces, - haddr_t offsets[], size_t element_sizes[], const void *bufs[]) + H5S_t **mem_spaces, H5S_t **file_spaces, haddr_t offsets[], + size_t element_sizes[], const void *bufs[]) { hbool_t extend_sizes = FALSE; hbool_t extend_bufs = FALSE; @@ -1650,9 +1648,8 @@ done: *------------------------------------------------------------------------- */ herr_t -H5FD_write_selection(H5FD_t *file, H5FD_mem_t type, uint32_t count, H5S_t **mem_spaces, - H5S_t **file_spaces, haddr_t offsets[], size_t element_sizes[], - const void *bufs[]) +H5FD_write_selection(H5FD_t *file, H5FD_mem_t type, uint32_t count, H5S_t **mem_spaces, H5S_t **file_spaces, + haddr_t offsets[], size_t element_sizes[], const void *bufs[]) { hbool_t offsets_cooked = FALSE; hid_t mem_space_ids_static[8]; @@ -1909,9 +1906,8 @@ H5FD_write_selection_id(H5FD_t *file, H5FD_mem_t type, uint32_t count, hid_t mem } /* Translate to vector or scalar I/O */ - if (H5FD__write_selection_translate(file, type, dxpl_id, count, mem_spaces, - file_spaces, offsets, element_sizes, - bufs) < 0) + if (H5FD__write_selection_translate(file, type, dxpl_id, count, mem_spaces, file_spaces, offsets, + element_sizes, bufs) < 0) HGOTO_ERROR(H5E_VFL, H5E_WRITEERROR, FAIL, "translation to vector or scalar write failed") } @@ -2135,7 +2131,7 @@ H5FD_sort_vector_io_req(hbool_t *vector_was_sorted, uint32_t _count, H5FD_mem_t size_t **s_sizes_ptr, void ***s_bufs_ptr) { herr_t ret_value = SUCCEED; /* Return value */ - size_t count = (size_t)_count; + size_t count = (size_t)_count; size_t i; struct H5FD_vsrt_tmp_t *srt_tmp = NULL; diff --git a/src/H5FDprivate.h b/src/H5FDprivate.h index 8e08f11..3b6e23c 100644 --- a/src/H5FDprivate.h +++ b/src/H5FDprivate.h @@ -148,14 +148,12 @@ H5_DLL herr_t H5FD_read_vector(H5FD_t *file, uint32_t count, H5FD_mem_t types[] size_t sizes[], void *bufs[] /* out */); H5_DLL herr_t H5FD_write_vector(H5FD_t *file, uint32_t count, H5FD_mem_t types[], haddr_t addrs[], size_t sizes[], const void *bufs[] /* out */); -H5_DLL herr_t H5FD_read_selection(H5FD_t *file, H5FD_mem_t type, uint32_t count, - struct H5S_t **mem_spaces, - struct H5S_t **file_spaces, haddr_t offsets[], - size_t element_sizes[], void *bufs[] /* out */); -H5_DLL herr_t H5FD_write_selection(H5FD_t *file, H5FD_mem_t type, uint32_t count, - struct H5S_t **mem_spaces, - struct H5S_t **file_spaces, haddr_t offsets[], - size_t element_sizes[], const void *bufs[]); +H5_DLL herr_t H5FD_read_selection(H5FD_t *file, H5FD_mem_t type, uint32_t count, struct H5S_t **mem_spaces, + struct H5S_t **file_spaces, haddr_t offsets[], size_t element_sizes[], + void *bufs[] /* out */); +H5_DLL herr_t H5FD_write_selection(H5FD_t *file, H5FD_mem_t type, uint32_t count, struct H5S_t **mem_spaces, + struct H5S_t **file_spaces, haddr_t offsets[], size_t element_sizes[], + const void *bufs[]); H5_DLL herr_t H5FD_read_selection_id(H5FD_t *file, H5FD_mem_t type, uint32_t count, hid_t mem_space_ids[], hid_t file_space_ids[], haddr_t offsets[], size_t element_sizes[], void *bufs[] /* out */); diff --git a/src/H5Fio.c b/src/H5Fio.c index e111af9..53fec97 100644 --- a/src/H5Fio.c +++ b/src/H5Fio.c @@ -255,8 +255,7 @@ done: */ herr_t H5F_shared_select_read(H5F_shared_t *f_sh, H5FD_mem_t type, uint32_t count, H5S_t **mem_spaces, - H5S_t **file_spaces, haddr_t offsets[], size_t element_sizes[], - void *bufs[] /* out */) + H5S_t **file_spaces, haddr_t offsets[], size_t element_sizes[], void *bufs[] /* out */) { H5FD_mem_t map_type; /* Mapped memory type */ herr_t ret_value = SUCCEED; /* Return value */ @@ -301,8 +300,7 @@ done: */ herr_t H5F_shared_select_write(H5F_shared_t *f_sh, H5FD_mem_t type, uint32_t count, H5S_t **mem_spaces, - H5S_t **file_spaces, haddr_t offsets[], size_t element_sizes[], - const void *bufs[]) + H5S_t **file_spaces, haddr_t offsets[], size_t element_sizes[], const void *bufs[]) { H5FD_mem_t map_type; /* Mapped memory type */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index 979041f..c5662f7 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -926,13 +926,11 @@ H5_DLL herr_t H5F_block_write(H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t si /* Functions that operate on selections of elements in the file */ H5_DLL herr_t H5F_shared_select_read(H5F_shared_t *f_sh, H5FD_mem_t type, uint32_t count, - struct H5S_t **mem_spaces, - struct H5S_t **file_spaces, haddr_t offsets[], + struct H5S_t **mem_spaces, struct H5S_t **file_spaces, haddr_t offsets[], size_t element_sizes[], void *bufs[] /* out */); H5_DLL herr_t H5F_shared_select_write(H5F_shared_t *f_sh, H5FD_mem_t type, uint32_t count, - struct H5S_t **mem_spaces, - struct H5S_t **file_spaces, haddr_t offsets[], - size_t element_sizes[], const void *bufs[]); + struct H5S_t **mem_spaces, struct H5S_t **file_spaces, + haddr_t offsets[], size_t element_sizes[], const void *bufs[]); /* Functions that flush or evict */ H5_DLL herr_t H5F_flush_tagged_metadata(H5F_t *f, haddr_t tag); -- cgit v0.12