From 62f49513eb9f18d3825c6b8bb40559662cdae97a Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Jun 2023 16:29:43 +0000 Subject: [PATCH] Committing clang-format changes --- c++/examples/h5tutr_extend.cpp | 2 +- c++/test/ttypes.cpp | 2 +- examples/h5_vds-exc.c | 2 +- examples/h5_vds-exclim.c | 2 +- hl/examples/ex_image2.c | 2 +- hl/src/H5DS.c | 6 +- hl/test/test_ld.c | 3 +- src/H5Dchunk.c | 4 +- src/H5FDint.c | 12 +-- src/H5Pdxpl.c | 4 +- src/H5VLpassthru.c | 2 +- test/app_ref.c | 4 +- test/cache.c | 26 ++--- test/cache_common.c | 8 +- test/cache_tagging.c | 8 +- test/chunk_info.c | 12 +-- test/dsets.c | 58 +++++------ test/dtypes.c | 2 +- test/file_image.c | 14 +-- test/fillval.c | 4 +- test/flush1.c | 4 +- test/flush2.c | 4 +- test/links.c | 108 ++++++++++----------- test/links_env.c | 6 +- test/mf.c | 4 +- test/mount.c | 3 +- test/objcopy.c | 2 +- test/objcopy_ref.c | 12 +-- test/onion.c | 8 +- test/set_extent.c | 2 +- test/swmr.c | 6 +- test/tattr.c | 3 +- test/tsohm.c | 41 ++++---- test/unlink.c | 4 +- test/vds.c | 4 +- test/vfd.c | 32 +++--- testpar/t_filters_parallel.c | 2 +- tools/src/h5copy/h5copy.c | 10 +- tools/src/h5import/h5import.h | 28 +++--- tools/src/h5repack/h5repack_main.c | 4 +- tools/src/h5stat/h5stat.c | 10 +- tools/test/h5format_convert/h5fc_gentest.c | 16 +-- tools/test/misc/repart_test.c | 2 +- 43 files changed, 248 insertions(+), 244 deletions(-) diff --git a/c++/examples/h5tutr_extend.cpp b/c++/examples/h5tutr_extend.cpp index af9e9ea61d9..3916f9ab06c 100644 --- a/c++/examples/h5tutr_extend.cpp +++ b/c++/examples/h5tutr_extend.cpp @@ -111,7 +111,7 @@ main(void) prop = dataset->getCreatePlist(); // Get information to obtain memory dataspace. - rank = filespace->getSimpleExtentNdims(); + rank = filespace->getSimpleExtentNdims(); (void)filespace->getSimpleExtentDims(dimsr); if (H5D_CHUNKED == prop.getLayout()) { diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp index 9e03d51ebc1..16ed192f4f8 100644 --- a/c++/test/ttypes.cpp +++ b/c++/test/ttypes.cpp @@ -45,7 +45,7 @@ using namespace H5; */ static const char *FILENAME[] = {"dtypes1.h5", "dtypes2.h5", "dtypes3.h5", "dtypes4.h5", - "encode_decode.h5", "h5_type_operators.h5", NULL}; + "encode_decode.h5", "h5_type_operators.h5", NULL}; typedef enum flt_t { FLT_FLOAT, FLT_DOUBLE, FLT_LDOUBLE, FLT_OTHER } flt_t; diff --git a/examples/h5_vds-exc.c b/examples/h5_vds-exc.c index 7653280b91e..01597ccb3ea 100644 --- a/examples/h5_vds-exc.c +++ b/examples/h5_vds-exc.c @@ -49,7 +49,7 @@ main(void) kdims[3] = {KDIM0, KDIM1, KDIM2}, kdims_max[3] = {H5S_UNLIMITED, KDIM1, KDIM2}, ndims[3] = {NDIM0, NDIM1, NDIM2}, ndims_max[3] = {H5S_UNLIMITED, NDIM1, NDIM2}, start[3], /* Hyperslab parameters */ - count[3], block[3]; + count[3], block[3]; hsize_t start_out[3], stride_out[3], count_out[3], block_out[3]; int k = 2; int n = 3; diff --git a/examples/h5_vds-exclim.c b/examples/h5_vds-exclim.c index 30ccf92fa56..4fb5536ab6d 100644 --- a/examples/h5_vds-exclim.c +++ b/examples/h5_vds-exclim.c @@ -48,7 +48,7 @@ main(void) herr_t status; hsize_t vdsdims[3] = {VDSDIM0, VDSDIM1, VDSDIM2}, kdims[3] = {KDIM0, KDIM1, KDIM2}, ndims[3] = {NDIM0, NDIM1, NDIM2}, start[3], /* Hyperslab parameters */ - count[3], block[3]; + count[3], block[3]; hsize_t start_out[3], stride_out[3], count_out[3], block_out[3]; int k = 2; int n = 3; diff --git a/hl/examples/ex_image2.c b/hl/examples/ex_image2.c index 9bb602e16c6..9ce1746f702 100644 --- a/hl/examples/ex_image2.c +++ b/hl/examples/ex_image2.c @@ -22,7 +22,7 @@ #define PAL_NAME "palette" #define PAL_ENTRIES 256 -static int read_data(const char *file_name, hsize_t *width, hsize_t *height); +static int read_data(const char *file_name, hsize_t *width, hsize_t *height); static unsigned char *gbuf = NULL; /* global buffer for image data */ int diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c index 4214899b707..25a9a14fe34 100644 --- a/hl/src/H5DS.c +++ b/hl/src/H5DS.c @@ -153,12 +153,12 @@ H5DSattach_scale(hid_t did, hid_t dsid, unsigned int idx) ds_list_t *dsbuf_w = NULL; /* array of "REFERENCE_LIST" attribute data to write when adding new reference to a dataset */ hobj_ref_t ref_to_ds = 0; /* reference to the DS */ - hobj_ref_t ref_j; /* iterator reference */ + hobj_ref_t ref_j; /* iterator reference */ /* Variables to be used when new references are used */ nds_list_t ndsl; - nds_list_t *ndsbuf = NULL; - nds_list_t *ndsbuf_w = NULL; + nds_list_t *ndsbuf = NULL; + nds_list_t *ndsbuf_w = NULL; H5R_ref_t nref_to_ds = {0}; H5R_ref_t nref_j; hbool_t is_new_ref; diff --git a/hl/test/test_ld.c b/hl/test/test_ld.c index 178c0abd65f..78be7e5a882 100644 --- a/hl/test/test_ld.c +++ b/hl/test/test_ld.c @@ -61,7 +61,8 @@ static int one_tests[ONE_NTESTS] = {3, -1, 0, -9, 1}; * {4,10}->{4,12}; {4,10}->{4,9}; {4,10}->{4,10} */ #define TWO_NTESTS 9 -static int two_tests[TWO_NTESTS][2] = {{2, 2}, {2, -1}, {2, 0}, {-1, 2}, {-1, -1}, {-1, 0}, {0, 2}, {0, -1}, {0, 0}}; +static int two_tests[TWO_NTESTS][2] = {{2, 2}, {2, -1}, {2, 0}, {-1, 2}, {-1, -1}, + {-1, 0}, {0, 2}, {0, -1}, {0, 0}}; /* Verify that the two input values are the same */ #define VERIFY_EQUAL(_x, _y) \ diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index 1d6a0f4fa61..2e7b87bfb5e 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -2699,7 +2699,7 @@ H5D__chunk_read(H5D_io_info_t *io_info, H5D_dset_io_info_t *dset_info) /* Different blocks depending on whether we're using selection I/O */ if (io_info->use_select_io == H5D_SELECTION_IO_MODE_ON) { - size_t num_chunks = 0; + size_t num_chunks = 0; size_t element_sizes[2] = {dset_info->type_info.src_type_size, 0}; void *bufs[2] = {dset_info->buf.vp, NULL}; @@ -3020,7 +3020,7 @@ H5D__chunk_write(H5D_io_info_t *io_info, H5D_dset_io_info_t *dset_info) /* Different blocks depending on whether we're using selection I/O */ if (io_info->use_select_io == H5D_SELECTION_IO_MODE_ON) { - size_t num_chunks = 0; + size_t num_chunks = 0; size_t element_sizes[2] = {dset_info->type_info.dst_type_size, 0}; const void *bufs[2] = {dset_info->buf.cvp, NULL}; diff --git a/src/H5FDint.c b/src/H5FDint.c index 2644efddd3f..847941f1c22 100644 --- a/src/H5FDint.c +++ b/src/H5FDint.c @@ -357,8 +357,8 @@ H5FD_read_vector(H5FD_t *file, uint32_t count, H5FD_mem_t types[], haddr_t addrs hbool_t extend_sizes = FALSE; hbool_t extend_types = FALSE; uint32_t i; - size_t size = 0; - H5FD_mem_t type = H5FD_MEM_DEFAULT; + size_t size = 0; + H5FD_mem_t type = H5FD_MEM_DEFAULT; hid_t dxpl_id = H5I_INVALID_HID; /* DXPL for operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -762,8 +762,8 @@ H5FD__read_selection_translate(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, uin hbool_t extend_bufs = FALSE; uint32_t i; size_t element_size = 0; - void *buf = NULL; - hbool_t use_vector = FALSE; + void *buf = NULL; + hbool_t use_vector = FALSE; haddr_t addrs_local[H5FD_LOCAL_VECTOR_LEN]; haddr_t *addrs = addrs_local; size_t sizes_local[H5FD_LOCAL_VECTOR_LEN]; @@ -1409,8 +1409,8 @@ H5FD__write_selection_translate(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, ui hbool_t extend_bufs = FALSE; uint32_t i; size_t element_size = 0; - const void *buf = NULL; - hbool_t use_vector = FALSE; + const void *buf = NULL; + hbool_t use_vector = FALSE; haddr_t addrs_local[H5FD_LOCAL_VECTOR_LEN]; haddr_t *addrs = addrs_local; size_t sizes_local[H5FD_LOCAL_VECTOR_LEN]; diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c index 27a04fb2470..7dfcacb6462 100644 --- a/src/H5Pdxpl.c +++ b/src/H5Pdxpl.c @@ -2399,8 +2399,8 @@ herr_t H5Pset_dataset_io_hyperslab_selection(hid_t plist_id, unsigned rank, H5S_seloper_t op, const hsize_t start[], const hsize_t stride[], const hsize_t count[], const hsize_t block[]) { - H5P_genplist_t *plist = NULL; /* Property list pointer */ - H5S_t *space = NULL; /* Dataspace to hold selection */ + H5P_genplist_t *plist = NULL; /* Property list pointer */ + H5S_t *space = NULL; /* Dataspace to hold selection */ hbool_t space_created = FALSE; /* Whether a new dataspace has been created */ hbool_t reset_prop_on_error = FALSE; /* Whether to reset the property on failure */ herr_t ret_value = SUCCEED; /* return value */ diff --git a/src/H5VLpassthru.c b/src/H5VLpassthru.c index cb184408b1d..a2cedfb0397 100644 --- a/src/H5VLpassthru.c +++ b/src/H5VLpassthru.c @@ -1796,7 +1796,7 @@ H5VL_pass_through_file_specific(void *file, H5VL_file_specific_args_t *args, hid H5VL_pass_through_t *new_o; H5VL_file_specific_args_t my_args; H5VL_file_specific_args_t *new_args; - H5VL_pass_through_info_t *info = NULL; + H5VL_pass_through_info_t *info = NULL; hid_t under_vol_id = -1; herr_t ret_value; diff --git a/test/app_ref.c b/test/app_ref.c index 80b0b092350..68b4e5baa99 100644 --- a/test/app_ref.c +++ b/test/app_ref.c @@ -57,8 +57,8 @@ typedef enum { static const char *FILENAME[] = {"app_ref", NULL}; static const char *IDNAME[T_NUMCLASSES] = {"File", "Property List", "Property Class", "Datatype", - "Dataspace", "Dataset", "Attribute", "Group", - "Error Class", "Error Message", "Error Stack"}; + "Dataspace", "Dataset", "Attribute", "Group", + "Error Class", "Error Message", "Error Stack"}; static int rc[T_NUMCLASSES]; diff --git a/test/cache.c b/test/cache.c index b4c527b0422..80052a4c55b 100644 --- a/test/cache.c +++ b/test/cache.c @@ -14156,7 +14156,7 @@ static unsigned check_double_pin_err(unsigned paged) { herr_t result; - H5F_t *file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr = NULL; if (paged) @@ -14241,7 +14241,7 @@ static unsigned check_double_unpin_err(unsigned paged) { herr_t result; - H5F_t *file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr = NULL; if (paged) @@ -14335,7 +14335,7 @@ static unsigned check_pin_entry_errs(unsigned paged) { herr_t result; - H5F_t *file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr = NULL; if (paged) @@ -14442,7 +14442,7 @@ check_pin_entry_errs(unsigned paged) static unsigned check_double_protect_err(unsigned paged) { - H5F_t *file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr = NULL; H5C_cache_entry_t *cache_entry_ptr; @@ -14525,7 +14525,7 @@ static unsigned check_double_unprotect_err(unsigned paged) { herr_t result; - H5F_t *file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr = NULL; if (paged) @@ -14606,7 +14606,7 @@ static unsigned check_mark_entry_dirty_errs(unsigned paged) { herr_t result; - H5F_t *file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr = NULL; if (paged) @@ -14685,7 +14685,7 @@ static unsigned check_expunge_entry_errs(unsigned paged) { herr_t result; - H5F_t *file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr = NULL; if (paged) @@ -14797,9 +14797,9 @@ static unsigned check_move_entry_errs(unsigned paged) { herr_t result; - H5F_t *file_ptr = NULL; - H5C_t *cache_ptr = NULL; - test_entry_t *entry_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; + test_entry_t *entry_ptr = NULL; test_entry_t *entry_0_0_ptr = NULL; test_entry_t *entry_0_1_ptr = NULL; test_entry_t *entry_1_0_ptr = NULL; @@ -14914,7 +14914,7 @@ static unsigned check_resize_entry_errs(unsigned paged) { herr_t result; - H5F_t *file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr = NULL; if (paged) @@ -15015,7 +15015,7 @@ static unsigned check_unprotect_ro_dirty_err(unsigned paged) { herr_t result; - H5F_t *file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr = NULL; if (paged) @@ -15135,7 +15135,7 @@ check_unprotect_ro_dirty_err(unsigned paged) static unsigned check_protect_ro_rw_err(unsigned paged) { - H5F_t *file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr = NULL; void *thing_ptr = NULL; diff --git a/test/cache_common.c b/test/cache_common.c index bc646994911..82ef9e4eb43 100644 --- a/test/cache_common.c +++ b/test/cache_common.c @@ -3024,7 +3024,7 @@ mark_entry_dirty(int32_t type, int32_t idx) void move_entry(H5C_t *cache_ptr, int32_t type, int32_t idx, hbool_t main_addr) { - herr_t result = 0; + herr_t result = 0; hbool_t done = TRUE; /* will set to FALSE if we have work to do */ haddr_t old_addr = HADDR_UNDEF; haddr_t new_addr = HADDR_UNDEF; @@ -4946,7 +4946,7 @@ check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, hbool_t d int64_t cache_hits = 0; int64_t cache_accesses = 0; double expected_hit_rate; - double hit_rate = 0.0; + double hit_rate = 0.0; H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; @@ -5066,8 +5066,8 @@ check_and_validate_cache_size(hid_t file_id, size_t *max_size_ptr, size_t *min_c size_t cur_size = 0; uint32_t expected_cur_num_entries; int cur_num_entries = 0; - H5F_t *file_ptr = NULL; - H5C_t *cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; /* get a pointer to the files internal data structure */ if (pass) { diff --git a/test/cache_tagging.c b/test/cache_tagging.c index 0b700993529..e1656a2e84e 100644 --- a/test/cache_tagging.c +++ b/test/cache_tagging.c @@ -547,10 +547,10 @@ check_file_open_tags(hid_t fcpl, int type) /* Variable Declarations */ hid_t fid = -1; /* File Identifier */ #ifndef NDEBUG - int verbose = FALSE; /* verbose file output */ -#endif /* NDEBUG */ - hid_t fapl = -1; /* File access prop list */ - haddr_t root_tag; /* Root Group Tag */ + int verbose = FALSE; /* verbose file output */ +#endif /* NDEBUG */ + hid_t fapl = -1; /* File access prop list */ + haddr_t root_tag; /* Root Group Tag */ haddr_t sbe_tag = HADDR_UNDEF; /* Sblock Extension Tag */ /* Testing Macro */ diff --git a/test/chunk_info.c b/test/chunk_info.c index d460f6fb225..6533458a96e 100644 --- a/test/chunk_info.c +++ b/test/chunk_info.c @@ -48,12 +48,12 @@ /* Test file names, using H5F_libver_t as indices */ static const char *FILENAME[] = {"tchunk_info_earliest", - "tchunk_info_v18", - "tchunk_info_v110", - "tchunk_info_v112", - "tchunk_info_v114", - "tchunk_info_v116", - NULL}; + "tchunk_info_v18", + "tchunk_info_v110", + "tchunk_info_v112", + "tchunk_info_v114", + "tchunk_info_v116", + NULL}; /* File to be used in test_failed_attempts */ #define FILTERMASK_FILE "tflt_msk" diff --git a/test/dsets.c b/test/dsets.c index be35778567c..3c299aff43e 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -56,35 +56,35 @@ #endif static const char *FILENAME[] = {"dataset", /* 0 */ - "compact_dataset", /* 1 */ - "dset_offset", /* 2 */ - "max_compact_dataset", /* 3 */ - "simple", /* 4 */ - "set_local", /* 5 */ - "random_chunks", /* 6 */ - "huge_chunks", /* 7 */ - "chunk_cache", /* 8 */ - "big_chunk", /* 9 */ - "chunk_fast", /* 10 */ - "chunk_expand", /* 11 */ - "chunk_fixed", /* 12 */ - "copy_dcpl_newfile", /* 13 */ - "partial_chunks", /* 14 */ - "layout_extend", /* 15 */ - "zero_chunk", /* 16 */ - "chunk_single", /* 17 */ - "swmr_non_latest", /* 18 */ - "earray_hdr_fd", /* 19 */ - "farray_hdr_fd", /* 20 */ - "bt2_hdr_fd", /* 21 */ - "storage_size", /* 22 */ - "dls_01_strings", /* 23 */ - "power2up", /* 24 */ - "version_bounds", /* 25 */ - "alloc_0sized", /* 26 */ - "h5s_block", /* 27 */ - "h5s_plist", /* 28 */ - NULL}; + "compact_dataset", /* 1 */ + "dset_offset", /* 2 */ + "max_compact_dataset", /* 3 */ + "simple", /* 4 */ + "set_local", /* 5 */ + "random_chunks", /* 6 */ + "huge_chunks", /* 7 */ + "chunk_cache", /* 8 */ + "big_chunk", /* 9 */ + "chunk_fast", /* 10 */ + "chunk_expand", /* 11 */ + "chunk_fixed", /* 12 */ + "copy_dcpl_newfile", /* 13 */ + "partial_chunks", /* 14 */ + "layout_extend", /* 15 */ + "zero_chunk", /* 16 */ + "chunk_single", /* 17 */ + "swmr_non_latest", /* 18 */ + "earray_hdr_fd", /* 19 */ + "farray_hdr_fd", /* 20 */ + "bt2_hdr_fd", /* 21 */ + "storage_size", /* 22 */ + "dls_01_strings", /* 23 */ + "power2up", /* 24 */ + "version_bounds", /* 25 */ + "alloc_0sized", /* 26 */ + "h5s_block", /* 27 */ + "h5s_plist", /* 28 */ + NULL}; #define OHMIN_FILENAME_A "ohdr_min_a" diff --git a/test/dtypes.c b/test/dtypes.c index 28c70e997a1..92f4c4dc3ab 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -77,7 +77,7 @@ } while (0) static const char *FILENAME[] = {"dtypes0", "dtypes1", "dtypes2", "dtypes3", "dtypes4", "dtypes5", - "dtypes6", "dtypes7", "dtypes8", "dtypes9", "dtypes10", NULL}; + "dtypes6", "dtypes7", "dtypes8", "dtypes9", "dtypes10", NULL}; #define TESTFILE "bad_compound.h5" diff --git a/test/file_image.c b/test/file_image.c index 5b2c9fc3b8a..b0df7f79040 100644 --- a/test/file_image.c +++ b/test/file_image.c @@ -49,13 +49,13 @@ static const char *FILENAME[] = {"file_image_core_test", NULL}; * files we don't want to delete on cleanup. */ static const char *FILENAME2[] = {"sec2_get_file_image_test", - "stdio_get_file_image_test", - "core_get_file_image_test", - "family_get_file_image_test", - "multi_get_file_image_test", - "split_get_file_image_test", - "get_file_image_error_rejection_test", - NULL}; + "stdio_get_file_image_test", + "core_get_file_image_test", + "family_get_file_image_test", + "multi_get_file_image_test", + "split_get_file_image_test", + "get_file_image_error_rejection_test", + NULL}; typedef struct { unsigned char used_callbacks; /* Bitfield for tracking callbacks */ diff --git a/test/fillval.c b/test/fillval.c index 33d7dabd183..729c2731b96 100644 --- a/test/fillval.c +++ b/test/fillval.c @@ -26,7 +26,7 @@ /* #define NO_FILLING */ static const char *FILENAME[] = {"fillval_1", "fillval_2", "fillval_3", "fillval_4", "fillval_5", - "fillval_6", "fillval_7", "fillval_8", "fillval_9", NULL}; + "fillval_6", "fillval_7", "fillval_8", "fillval_9", NULL}; /* Common type for compound datatype operations */ typedef struct { @@ -873,7 +873,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f int i, j, *buf = NULL, odd; unsigned u; comp_datatype rd_c, fill_c, should_be_c; - comp_datatype *buf_c = NULL; + comp_datatype *buf_c = NULL; H5D_space_status_t allocation = H5D_SPACE_STATUS_ERROR; fill_c.a = 0; diff --git a/test/flush1.c b/test/flush1.c index 0fac1808269..b9a68b4cf61 100644 --- a/test/flush1.c +++ b/test/flush1.c @@ -28,8 +28,8 @@ #include "H5FDpkg.h" /* File drivers */ static const char *FILENAME[] = {"flush", "flush-swmr", "noflush", - "noflush-swmr", "flush_extend", "flush_extend-swmr", - "noflush_extend", "noflush_extend-swmr", NULL}; + "noflush-swmr", "flush_extend", "flush_extend-swmr", + "noflush_extend", "noflush_extend-swmr", NULL}; /* Number and size of dataset dims, chunk size, etc. */ #define NDIMS 1 diff --git a/test/flush2.c b/test/flush2.c index 2ac03d4f4b8..2a529072381 100644 --- a/test/flush2.c +++ b/test/flush2.c @@ -31,8 +31,8 @@ #define H5F_ACS_CLEAR_STATUS_FLAGS_NAME "clear_status_flags" static const char *FILENAME[] = {"flush", "flush-swmr", "noflush", - "noflush-swmr", "flush_extend", "flush_extend-swmr", - "noflush_extend", "noflush_extend-swmr", NULL}; + "noflush-swmr", "flush_extend", "flush_extend-swmr", + "noflush_extend", "noflush_extend-swmr", NULL}; /* Number and size of dataset dims, chunk size, etc. */ #define NELEMENTS 10000 diff --git a/test/links.c b/test/links.c index a768253f58b..9a08a2677a7 100644 --- a/test/links.c +++ b/test/links.c @@ -47,60 +47,60 @@ #define SYMLINK2 TMPDIR2 "sym2.h5" static const char *FILENAME[] = {"links0", - "links1", - "links2", - "links3", - "links4a", /* 4 */ - "links4b", /* 5 */ - "links4c", /* 6 */ - "links4d", /* 7 */ - "links5", /* 8 */ - "links6", /* 9 */ - "links7", /* 10 */ - "links8", /* 11 */ - "extlinks0", /* 12: main files */ - TMPDIR "extlinks0", /* 13: */ - "extlinks1", /* 14: target files */ - TMPDIR "extlinks1", /* 15: */ - "extlinks2", /* 16: */ - TMPDIR "extlinks2", /* 17: */ - "extlinks3", /* 18: */ - TMPDIR "extlinks3", /* 19: */ - "extlinks4", /* 20: */ - TMPDIR "extlinks4", /* 21: */ - "extlinks5", /* 22: */ - TMPDIR "extlinks6", /* 23: */ - "extlinks7", /* 24: */ - TMPDIR "extlinks7", /* 25: */ - TMPDIR "extlinks8", /* 26: */ - "extlinks9", /* 27: */ - TMPDIR "extlinks9", /* 28: */ - "extlinks10", - /* 29: */ /* TESTS for windows */ - TMPDIR "extlinks10", /* 30: */ - TMPDIR "extlinks11", /* 31: */ - TMPDIR "extlinks12", /* 32: */ - "extlinks13", /* 33: */ - TMPDIR "extlinks13", /* 34: */ - TMPDIR "extlinks14", /* 35: */ - TMPDIR "extlinks15", /* 36: */ - "extlinks16A", - /* 37: */ /* TESTS for H5P_set_elink_fapl */ - "extlinks16B", /* 38: */ - "extlinks17", /* 39: */ - "extlinks18A", /* 40: */ - "extlinks18B", /* 41: */ - "extlinks19A", /* 42: */ - "extlinks19B", /* 43: */ - "extlinks20", /* 44: */ - "extlinks21A", /* 45: Files for symlink() tests*/ - TMPDIR2 "extlinks21B", /* 46: */ - TMPDIR2 "extlinks21C", /* 47: */ - "extlinks21C", /* 48: (same as #47, only without the TMPDIR2 prefix) */ - TMPDIR "extlinks21D", /* 49: */ - TMPDIR "extlinks21E", /* 50: */ - "extlinks21E", /* 51: (same as #50, only without the TMPDIR prefix) */ - NULL}; + "links1", + "links2", + "links3", + "links4a", /* 4 */ + "links4b", /* 5 */ + "links4c", /* 6 */ + "links4d", /* 7 */ + "links5", /* 8 */ + "links6", /* 9 */ + "links7", /* 10 */ + "links8", /* 11 */ + "extlinks0", /* 12: main files */ + TMPDIR "extlinks0", /* 13: */ + "extlinks1", /* 14: target files */ + TMPDIR "extlinks1", /* 15: */ + "extlinks2", /* 16: */ + TMPDIR "extlinks2", /* 17: */ + "extlinks3", /* 18: */ + TMPDIR "extlinks3", /* 19: */ + "extlinks4", /* 20: */ + TMPDIR "extlinks4", /* 21: */ + "extlinks5", /* 22: */ + TMPDIR "extlinks6", /* 23: */ + "extlinks7", /* 24: */ + TMPDIR "extlinks7", /* 25: */ + TMPDIR "extlinks8", /* 26: */ + "extlinks9", /* 27: */ + TMPDIR "extlinks9", /* 28: */ + "extlinks10", + /* 29: */ /* TESTS for windows */ + TMPDIR "extlinks10", /* 30: */ + TMPDIR "extlinks11", /* 31: */ + TMPDIR "extlinks12", /* 32: */ + "extlinks13", /* 33: */ + TMPDIR "extlinks13", /* 34: */ + TMPDIR "extlinks14", /* 35: */ + TMPDIR "extlinks15", /* 36: */ + "extlinks16A", + /* 37: */ /* TESTS for H5P_set_elink_fapl */ + "extlinks16B", /* 38: */ + "extlinks17", /* 39: */ + "extlinks18A", /* 40: */ + "extlinks18B", /* 41: */ + "extlinks19A", /* 42: */ + "extlinks19B", /* 43: */ + "extlinks20", /* 44: */ + "extlinks21A", /* 45: Files for symlink() tests*/ + TMPDIR2 "extlinks21B", /* 46: */ + TMPDIR2 "extlinks21C", /* 47: */ + "extlinks21C", /* 48: (same as #47, only without the TMPDIR2 prefix) */ + TMPDIR "extlinks21D", /* 49: */ + TMPDIR "extlinks21E", /* 50: */ + "extlinks21E", /* 51: (same as #50, only without the TMPDIR prefix) */ + NULL}; #define FAMILY_SIZE 1024 #define CORE_INCREMENT 1024 diff --git a/test/links_env.c b/test/links_env.c index dced52ff602..95d25814906 100644 --- a/test/links_env.c +++ b/test/links_env.c @@ -26,9 +26,9 @@ #define NAME_BUF_SIZE 1024 static const char *FILENAME[] = {"extlinks_env0", /* 0: main file */ - "extlinks_env1", /* 1: target file */ - TMPDIR "extlinks_env1", /* 2 */ - NULL}; + "extlinks_env1", /* 1: target file */ + TMPDIR "extlinks_env1", /* 2 */ + NULL}; static int external_link_env(hid_t fapl, hbool_t new_format); diff --git a/test/mf.c b/test/mf.c index 78b19acfead..9c72ce35673 100644 --- a/test/mf.c +++ b/test/mf.c @@ -367,8 +367,8 @@ test_mf_eoa_shrink(const char *env_h5_drvr, hid_t fapl) char filename[FILENAME_LEN]; /* Filename to use */ H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size = 0, new_file_size; /* file size */ - H5FD_mem_t type = H5FD_MEM_DEFAULT; - haddr_t addr = 0; + H5FD_mem_t type = H5FD_MEM_DEFAULT; + haddr_t addr = 0; haddr_t ma_addr = HADDR_UNDEF, new_ma_addr = HADDR_UNDEF; hsize_t ma_size = 0, new_ma_size = 0; hbool_t suitable_vfd; diff --git a/test/mount.c b/test/mount.c index 09ce35e8aa2..2c06992c822 100644 --- a/test/mount.c +++ b/test/mount.c @@ -20,7 +20,8 @@ #include "H5Fprivate.h" /* File access */ #include "H5Iprivate.h" /* IDs */ -static const char *FILENAME[] = {"mount_1", "mount_2", "mount_3", "mount_4", "mount_5", "mount_6", "mount_7", NULL}; +static const char *FILENAME[] = {"mount_1", "mount_2", "mount_3", "mount_4", + "mount_5", "mount_6", "mount_7", NULL}; /* For "mount_after_close" test */ #define RANK 2 diff --git a/test/objcopy.c b/test/objcopy.c index 069c80c5a92..79f27df1005 100644 --- a/test/objcopy.c +++ b/test/objcopy.c @@ -61,7 +61,7 @@ #include "H5Opkg.h" /* Object header */ static const char *FILENAME[] = {"objcopy_src", "objcopy_dst", "objcopy_ext", "objcopy_src2", - "verbound_src", "verbound_dst", NULL}; + "verbound_src", "verbound_dst", NULL}; /* Configuration, really a series of bit flags. Maximum value is all three * bit flags enabled. diff --git a/test/objcopy_ref.c b/test/objcopy_ref.c index 6dee7b70216..282512e8fb0 100644 --- a/test/objcopy_ref.c +++ b/test/objcopy_ref.c @@ -24,12 +24,12 @@ #include "H5Fpkg.h" /* File access */ static const char *FILENAME[] = {"objcopy_ref_src", - "objcopy_ref_dst", - "objcopy_ref_ext", - "objcopy_ref_src2", - "verbound_ref_src", - "verbound_ref_dst", - NULL}; + "objcopy_ref_dst", + "objcopy_ref_ext", + "objcopy_ref_src2", + "verbound_ref_src", + "verbound_ref_dst", + NULL}; /* Configuration, really a series of bit flags. Maximum value is all three * bit flags enabled. diff --git a/test/onion.c b/test/onion.c index c6324e02858..12cb57642df 100644 --- a/test/onion.c +++ b/test/onion.c @@ -912,10 +912,10 @@ test_header_encode_decode(void) ptr = exp + H5FD_ONION_ENCODED_SIZE_HEADER - 4; UINT32ENCODE(ptr, checksum); - hdr.version = H5FD_ONION_HEADER_VERSION_CURR; - hdr.flags = 12; - hdr.origin_eof = 8589934609ull; - hdr.page_size = 4096; + hdr.version = H5FD_ONION_HEADER_VERSION_CURR; + hdr.flags = 12; + hdr.origin_eof = 8589934609ull; + hdr.page_size = 4096; hdr.history_addr = 123456; hdr.history_size = 88; diff --git a/test/set_extent.c b/test/set_extent.c index dc2e549f479..486f6838a04 100644 --- a/test/set_extent.c +++ b/test/set_extent.c @@ -27,7 +27,7 @@ */ static const char *FILENAME[] = {"set_extent1", "set_extent2", "set_extent3", "set_extent4", - "set_extent5", "set_extent6", NULL}; + "set_extent5", "set_extent6", NULL}; #define NAME_BUF_SIZE 1024 #define EXT_FILE_NAME1 "ext1.bin" diff --git a/test/swmr.c b/test/swmr.c index 6116945617d..f4fd0cbd222 100644 --- a/test/swmr.c +++ b/test/swmr.c @@ -49,9 +49,9 @@ #include "H5Opkg.h" /* Object headers */ static const char *FILENAME[] = {"swmr0", /* 0 */ - "swmr1", /* 1 */ - "swmr2", /* 2 */ - NULL}; + "swmr1", /* 1 */ + "swmr2", /* 2 */ + NULL}; #define NAME_BUF_SIZE 1024 /* Length of file name */ diff --git a/test/tattr.c b/test/tattr.c index 4f0462577b3..9ac34e66705 100644 --- a/test/tattr.c +++ b/test/tattr.c @@ -86,7 +86,8 @@ static int attr_data1a[ATTR1_DIM1] = {256, 11945, -22107}; #define ATTR2_RANK 2 #define ATTR2_DIM1 2 #define ATTR2_DIM2 2 -static int attr_data2[ATTR2_DIM1][ATTR2_DIM2] = {{7614, -416}, {197814, -3}}; /* Test data for 2nd attribute */ +static int attr_data2[ATTR2_DIM1][ATTR2_DIM2] = {{7614, -416}, + {197814, -3}}; /* Test data for 2nd attribute */ #define ATTR3_NAME "Attr3" #define ATTR3_RANK 3 diff --git a/test/tsohm.c b/test/tsohm.c index 72cb3d7799c..9de3dfd5cc5 100644 --- a/test/tsohm.c +++ b/test/tsohm.c @@ -34,11 +34,12 @@ static const unsigned def_minsizes[H5O_SHMESG_MAX_NINDEXES] = {250, 250, 250, /* Non-default SOHM values for testing */ #define TEST_NUM_INDEXES 4 static const unsigned test_type_flags[H5O_SHMESG_MAX_NINDEXES] = {H5O_SHMESG_FILL_FLAG, - H5O_SHMESG_DTYPE_FLAG | H5O_SHMESG_ATTR_FLAG, - H5O_SHMESG_SDSPACE_FLAG, - H5O_SHMESG_PLINE_FLAG, - 0, - 0}; + H5O_SHMESG_DTYPE_FLAG | + H5O_SHMESG_ATTR_FLAG, + H5O_SHMESG_SDSPACE_FLAG, + H5O_SHMESG_PLINE_FLAG, + 0, + 0}; static const unsigned test_minsizes[H5O_SHMESG_MAX_NINDEXES] = {0, 2, 40, 100, 3, 1000}; #define TEST_L2B 65 #define TEST_B2L 64 @@ -70,15 +71,15 @@ typedef struct dtype1_struct { #define DTYPE2_SIZE 1024 static const char *DSETNAME[] = {"dataset0", "dataset1", "dataset2", "dataset3", "dataset4", - "dataset5", "dataset6", "dataset7", "dataset8", "dataset9", - "dataset10", "dataset11", NULL}; + "dataset5", "dataset6", "dataset7", "dataset8", "dataset9", + "dataset10", "dataset11", NULL}; static const char *EXTRA_DSETNAME[] = {"ex_dataset0", "ex_dataset1", "ex_dataset2", - "ex_dataset3", "ex_dataset4", "ex_dataset5", - "ex_dataset6", "ex_dataset7", "ex_dataset8", - "ex_dataset9", "ex_dataset10", "ex_dataset11", - "ex_dataset12", "ex_dataset13", "ex_dataset14", - "ex_dataset15", "ex_dataset16", "ex_dataset17", - "ex_dataset18", "ex_dataset19", NULL}; + "ex_dataset3", "ex_dataset4", "ex_dataset5", + "ex_dataset6", "ex_dataset7", "ex_dataset8", + "ex_dataset9", "ex_dataset10", "ex_dataset11", + "ex_dataset12", "ex_dataset13", "ex_dataset14", + "ex_dataset15", "ex_dataset16", "ex_dataset17", + "ex_dataset18", "ex_dataset19", NULL}; #define SOHM_HELPER_NUM_EX_DSETS 20 typedef struct complex_t { double re; @@ -86,14 +87,14 @@ typedef struct complex_t { } complex_t; #define ENUM_NUM_MEMBS 20 static const char *ENUM_NAME[] = {"enum_member0", "enum_member1", "enum_member2", - "enum_member3", "enum_member4", "enum_member5", - "enum_member6", "enum_member7", "enum_member8", - "enum_member9", "enum_member10", "enum_member11", - "enum_member12", "enum_member13", "enum_member14", - "enum_member15", "enum_member16", "enum_member17", - "enum_member18", "enum_member19", NULL}; + "enum_member3", "enum_member4", "enum_member5", + "enum_member6", "enum_member7", "enum_member8", + "enum_member9", "enum_member10", "enum_member11", + "enum_member12", "enum_member13", "enum_member14", + "enum_member15", "enum_member16", "enum_member17", + "enum_member18", "enum_member19", NULL}; static const int ENUM_VAL[] = {0, 13, -500, 63, 64, -64, 65, 2048, 1, 2, -1, - 7, 130, -5000, 630, 640, -640, 650, 20480, 10, -1001, -10}; + 7, 130, -5000, 630, 640, -640, 650, 20480, 10, -1001, -10}; #define SIZE2_RANK1 6 #define SIZE2_RANK2 10 #define SIZE2_DIMS \ diff --git a/test/unlink.c b/test/unlink.c index 8f9b0168fc4..078d0e09ccf 100644 --- a/test/unlink.c +++ b/test/unlink.c @@ -26,8 +26,8 @@ #include "H5Gpkg.h" /* Groups */ static const char *FILENAME[] = {"unlink", "new_move_a", "new_move_b", "lunlink", - "filespace", "slashes", "resurrect_set", "resurrect_type", - "resurrect_group", "unlink_chunked", "full_group", NULL}; + "filespace", "slashes", "resurrect_set", "resurrect_type", + "resurrect_group", "unlink_chunked", "full_group", NULL}; /* Macros for test_create_unlink() & test_filespace */ #define GROUPNAME "group" diff --git a/test/vds.c b/test/vds.c index 3313c30dfb7..6bb076cc5ea 100644 --- a/test/vds.c +++ b/test/vds.c @@ -30,8 +30,8 @@ typedef enum { } test_api_config_t; static const char *FILENAME[] = {"vds_virt_0", "vds_virt_1", "vds_src_0", "vds_src_1", "vds%%_src", - "vds_dapl", "vds_virt_2", "vds_virt_3", "vds_src_2", "vds_src_3", - "vds%%_src2", "vds_dapl2", NULL}; + "vds_dapl", "vds_virt_2", "vds_virt_3", "vds_src_2", "vds_src_3", + "vds%%_src2", "vds_dapl2", NULL}; /* Define to enable verbose test output */ /* #define VDS_TEST_VERBOSE 1 */ diff --git a/test/vfd.c b/test/vfd.c index 5aedc272eba..ce38ae3df59 100644 --- a/test/vfd.c +++ b/test/vfd.c @@ -48,22 +48,22 @@ #endif /* H5_HAVE_DIRECT */ static const char *FILENAME[] = {"sec2_file", /*0*/ - "core_file", /*1*/ - "family_file", /*2*/ - "new_family_v16", /*3*/ - "multi_file", /*4*/ - "direct_file", /*5*/ - "log_file", /*6*/ - "stdio_file", /*7*/ - "windows_file", /*8*/ - "new_multi_file_v16", /*9*/ - "ro_s3_file", /*10*/ - "splitter_rw_file", /*11*/ - "splitter_wo_file", /*12*/ - "splitter.log", /*13*/ - "ctl_file", /*14*/ - "ctl_splitter_wo_file", /*15*/ - NULL}; + "core_file", /*1*/ + "family_file", /*2*/ + "new_family_v16", /*3*/ + "multi_file", /*4*/ + "direct_file", /*5*/ + "log_file", /*6*/ + "stdio_file", /*7*/ + "windows_file", /*8*/ + "new_multi_file_v16", /*9*/ + "ro_s3_file", /*10*/ + "splitter_rw_file", /*11*/ + "splitter_wo_file", /*12*/ + "splitter.log", /*13*/ + "ctl_file", /*14*/ + "ctl_splitter_wo_file", /*15*/ + NULL}; #define LOG_FILENAME "log_vfd_out.log" diff --git a/testpar/t_filters_parallel.c b/testpar/t_filters_parallel.c index 81b9f71fb7d..76f6695615c 100644 --- a/testpar/t_filters_parallel.c +++ b/testpar/t_filters_parallel.c @@ -21,7 +21,7 @@ #include "t_filters_parallel.h" static const char *FILENAME[] = {"t_filters_parallel", NULL}; -char filenames[1][256]; +char filenames[1][256]; static MPI_Comm comm = MPI_COMM_WORLD; static MPI_Info info = MPI_INFO_NULL; diff --git a/tools/src/h5copy/h5copy.c b/tools/src/h5copy/h5copy.c index a6f844b40fb..d23387662ef 100644 --- a/tools/src/h5copy/h5copy.c +++ b/tools/src/h5copy/h5copy.c @@ -30,11 +30,11 @@ static struct h5_long_options l_opts[] = {{"destination", require_arg, 'd'}, {"version", no_arg, 'V'}, {"enable-error-stack", optional_arg, 'E'}, {NULL, 0, '\0'}}; -static char *fname_src = NULL; -static char *fname_dst = NULL; -static char *oname_src = NULL; -static char *oname_dst = NULL; -static char *str_flag = NULL; +static char *fname_src = NULL; +static char *fname_dst = NULL; +static char *oname_src = NULL; +static char *oname_dst = NULL; +static char *str_flag = NULL; /*------------------------------------------------------------------------- * Function: leave diff --git a/tools/src/h5import/h5import.h b/tools/src/h5import/h5import.h index 3dee67ea070..46c366caa55 100644 --- a/tools/src/h5import/h5import.h +++ b/tools/src/h5import/h5import.h @@ -111,20 +111,20 @@ struct Options { }; static char keytable[NUM_KEYS][30] = {"PATH", - "INPUT-CLASS", - "INPUT-SIZE", - "RANK", - "DIMENSION-SIZES", - "OUTPUT-CLASS", - "OUTPUT-SIZE", - "OUTPUT-ARCHITECTURE", - "OUTPUT-BYTE-ORDER", - "CHUNKED-DIMENSION-SIZES", - "COMPRESSION-TYPE", - "COMPRESSION-PARAM", - "EXTERNAL-STORAGE", - "MAXIMUM-DIMENSIONS", - "INPUT-BYTE-ORDER"}; + "INPUT-CLASS", + "INPUT-SIZE", + "RANK", + "DIMENSION-SIZES", + "OUTPUT-CLASS", + "OUTPUT-SIZE", + "OUTPUT-ARCHITECTURE", + "OUTPUT-BYTE-ORDER", + "CHUNKED-DIMENSION-SIZES", + "COMPRESSION-TYPE", + "COMPRESSION-PARAM", + "EXTERNAL-STORAGE", + "MAXIMUM-DIMENSIONS", + "INPUT-BYTE-ORDER"}; static int state_table[15][8] = { /* token ordering: FILNAME OPT_o OPT_c OPT_h OPT_d OPT_p OPT_t OPT_s */ diff --git a/tools/src/h5repack/h5repack_main.c b/tools/src/h5repack/h5repack_main.c index 530c9fa5b99..ca122e4399b 100644 --- a/tools/src/h5repack/h5repack_main.c +++ b/tools/src/h5repack/h5repack_main.c @@ -21,8 +21,8 @@ static int parse_command_line(int argc, const char *const *argv, pack_opt_t *op static void leave(int ret) H5_ATTR_NORETURN; /* module-scoped variables */ -static int has_i = 0; -static int has_o = 0; +static int has_i = 0; +static int has_o = 0; static const char *infile = NULL; static const char *outfile = NULL; diff --git a/tools/src/h5stat/h5stat.c b/tools/src/h5stat/h5stat.c index a94f21fa893..495954ea746 100644 --- a/tools/src/h5stat/h5stat.c +++ b/tools/src/h5stat/h5stat.c @@ -36,11 +36,11 @@ /* File space management strategies: see H5Fpublic.h for declarations */ static const char *FS_STRATEGY_NAME[] = {"H5F_FSPACE_STRATEGY_FSM_AGGR", - "H5F_FSPACE_STRATEGY_PAGE", - "H5F_FSPACE_STRATEGY_AGGR", - "H5F_FSPACE_STRATEGY_NONE", - "unknown", - NULL}; + "H5F_FSPACE_STRATEGY_PAGE", + "H5F_FSPACE_STRATEGY_AGGR", + "H5F_FSPACE_STRATEGY_NONE", + "unknown", + NULL}; /* Datatype statistics for datasets */ typedef struct dtype_info_t { diff --git a/tools/test/h5format_convert/h5fc_gentest.c b/tools/test/h5format_convert/h5fc_gentest.c index da1d7b31535..d7b8cd855da 100644 --- a/tools/test/h5format_convert/h5fc_gentest.c +++ b/tools/test/h5format_convert/h5fc_gentest.c @@ -28,14 +28,14 @@ #define ERR_LEVEL_FILE "h5fc_err_level.h5" static const char *FILENAME[] = {"h5fc_ext1_i.h5", /* 0 */ - "h5fc_ext1_s.h5", /* 1 */ - "h5fc_ext1_f.h5", /* 2 */ - "h5fc_ext2_is.h5", /* 3 */ - "h5fc_ext2_if.h5", /* 4 */ - "h5fc_ext2_sf.h5", /* 5 */ - "h5fc_ext3_isf.h5", /* 6 */ - "h5fc_ext_none.h5", /* 7 */ - NULL}; + "h5fc_ext1_s.h5", /* 1 */ + "h5fc_ext1_f.h5", /* 2 */ + "h5fc_ext2_is.h5", /* 3 */ + "h5fc_ext2_if.h5", /* 4 */ + "h5fc_ext2_sf.h5", /* 5 */ + "h5fc_ext3_isf.h5", /* 6 */ + "h5fc_ext_none.h5", /* 7 */ + NULL}; #define GROUP "GROUP" diff --git a/tools/test/misc/repart_test.c b/tools/test/misc/repart_test.c index 965ba5dc274..a7ca4326d1b 100644 --- a/tools/test/misc/repart_test.c +++ b/tools/test/misc/repart_test.c @@ -23,7 +23,7 @@ #define FAMILY_H5REPART_SIZE2 (5 * KB) static const char *FILENAME[] = {"fst_family%05d.h5", "scd_family%05d.h5", "family_to_single.h5", - "family_to_sec2.h5", NULL}; + "family_to_sec2.h5", NULL}; herr_t test_family_h5repart_opens(void); herr_t test_single_h5repart_opens(void);