summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2021-01-29 12:55:18 (GMT)
committerGitHub <noreply@github.com>2021-01-29 12:55:18 (GMT)
commit6db183590fd04767e6d01c1e871a18e80101c192 (patch)
tree02c983224b59c2d5c2fd01805e162a48cf02a996 /test
parent5a812bf5197e3394b92f5df8ee103a5eb80da18d (diff)
downloadhdf5-6db183590fd04767e6d01c1e871a18e80101c192.zip
hdf5-6db183590fd04767e6d01c1e871a18e80101c192.tar.gz
hdf5-6db183590fd04767e6d01c1e871a18e80101c192.tar.bz2
develop revert source to clang-format version 11 (#293)
* OESS-98 convert plugin option to FetchContent, add tests * Fixes for pkcfg files because of plugin option * OESS-98 fix tools test for plugins * Keep doxygen comments under 100 chars long - format hint * Whitespace * HDFFV-11144 - Reclassify CMake messages * HDFFV-11099/11100 added help text * Reworked switch statement to compare string instead * Fix typo * Update CDash mode * Correct name of threadsafe * Correct option name * Undo accidental commit * Note LLVM 10 to 11 format default changes * Update format plugin * Undo clang-format version 11 changes * One more correction
Diffstat (limited to 'test')
-rw-r--r--test/accum.c4
-rw-r--r--test/btree2.c4
-rw-r--r--test/cache.c10
-rw-r--r--test/cache_common.h2
-rw-r--r--test/cache_tagging.c106
-rw-r--r--test/chunk_info.c4
-rw-r--r--test/cross_read.c8
-rw-r--r--test/dsets.c38
-rw-r--r--test/dt_arith.c4
-rw-r--r--test/dtypes.c4
-rw-r--r--test/earray.c6
-rw-r--r--test/error_test.c2
-rw-r--r--test/farray.c2
-rw-r--r--test/fheap.c52
-rw-r--r--test/filter_plugin.c4
-rw-r--r--test/gen_bad_ohdr.c2
-rw-r--r--test/gen_bogus.c2
-rw-r--r--test/gen_cross.c4
-rw-r--r--test/links.c28
-rw-r--r--test/mount.c2
-rw-r--r--test/objcopy.c6
-rw-r--r--test/s3comms.c8
-rw-r--r--test/set_extent.c4
-rw-r--r--test/stab.c2
-rw-r--r--test/swmr.c4
-rw-r--r--test/swmr_generator.c2
-rw-r--r--test/swmr_remove_reader.c2
-rw-r--r--test/swmr_sparse_writer.c4
-rw-r--r--test/tattr.c16
-rw-r--r--test/tfile.c2
-rw-r--r--test/th5o.c4
-rw-r--r--test/th5s.c4
-rw-r--r--test/thread_id.c2
-rw-r--r--test/tmisc.c38
-rw-r--r--test/tsohm.c18
-rw-r--r--test/ttsafe.c2
-rw-r--r--test/use_disable_mdc_flushes.c6
-rw-r--r--test/vds.c2
-rw-r--r--test/vfd.c4
39 files changed, 209 insertions, 209 deletions
diff --git a/test/accum.c b/test/accum.c
index b1e4baa..f036f05 100644
--- a/test/accum.c
+++ b/test/accum.c
@@ -2100,8 +2100,8 @@ test_swmr_write_big(hbool_t newest_format)
uint8_t wbuf[1024]; /* Buffer for reading & writing */
unsigned u; /* Local index variable */
#ifdef H5_HAVE_UNISTD_H
- pid_t pid; /* Process ID */
-#endif /* H5_HAVE_UNISTD_H */
+ pid_t pid; /* Process ID */
+#endif /* H5_HAVE_UNISTD_H */
int status; /* Status returned from child process */
char * driver = NULL; /* VFD string (from env variable) */
hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */
diff --git a/test/btree2.c b/test/btree2.c
index 21b821b..ad88179 100644
--- a/test/btree2.c
+++ b/test/btree2.c
@@ -2735,7 +2735,7 @@ test_insert_level2_3internal_redistrib(hid_t fapl, const H5B2_create_t *cparam,
record = 2862; /* Record to left of insertion point in right internal node (now) */
if (check_node_depth(bt2, &record, (unsigned)1) < 0)
TEST_ERROR
-#endif /* NONE */
+#endif /* NONE */
record = 3137; /* Record to right of insertion point in right internal node (now) */
if (check_node_depth(bt2, &record, (unsigned)1) < 0)
TEST_ERROR
@@ -2916,7 +2916,7 @@ test_insert_level2_3internal_split(hid_t fapl, const H5B2_create_t *cparam, cons
record = 3049; /* Record to left of insertion point in middle internal node */
if (check_node_depth(bt2, &record, (unsigned)1) < 0)
TEST_ERROR
-#endif /* NONE */
+#endif /* NONE */
record = 2822; /* Record to right of insertion point in middle internal node */
if (check_node_depth(bt2, &record, (unsigned)1) < 0)
TEST_ERROR
diff --git a/test/cache.c b/test/cache.c
index 5b54bb9..5c01a35 100644
--- a/test/cache.c
+++ b/test/cache.c
@@ -4449,7 +4449,7 @@ check_flush_cache__multi_entry_test(H5F_t *file_ptr, int test_num, unsigned int
test_entry_t *base_addr;
test_entry_t *entry_ptr;
-#if 0 /* JRM */
+#if 0 /* JRM */
/* This gets used a lot, so lets leave it in. */
HDfprintf(stdout, "check_flush_cache__multi_entry_test: test %d\n",
@@ -4637,7 +4637,7 @@ check_flush_cache__pe_multi_entry_test(H5F_t *file_ptr, int test_num, unsigned i
test_entry_t *base_addr;
test_entry_t *entry_ptr;
-#if 0 /* JRM */
+#if 0 /* JRM */
/* This is useful debugging code. Leave it in for now. */
HDfprintf(stdout, "check_flush_cache__pe_multi_entry_test: test %d\n",
@@ -33871,7 +33871,7 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t *file_ptr)
pass = FALSE;
failure_mssg = "unexpected scan restart stats in cedds__expunge_dirty_entry_in_flush_test().";
} /* end if */
-#endif /* H5C_COLLECT_CACHE_STATS */
+#endif /* H5C_COLLECT_CACHE_STATS */
if (pass)
reset_entries();
@@ -35232,7 +35232,7 @@ check_stats__smoke_check_1(H5F_t *file_ptr)
pass = FALSE;
failure_mssg = "Unexpected monster entry level stats in check_stats__smoke_check_1(1).";
} /* end if */
-#endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
+#endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
if (pass)
/* protect and unprotect each entry once. Note
@@ -35306,7 +35306,7 @@ check_stats__smoke_check_1(H5F_t *file_ptr)
pass = FALSE;
failure_mssg = "Unexpected monster entry level stats in check_stats__smoke_check_1(2).";
} /* end if */
-#endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
+#endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
if (pass) {
/* protect and unprotect an entry that is not currently
diff --git a/test/cache_common.h b/test/cache_common.h
index 455acfb..aa32858 100644
--- a/test/cache_common.h
+++ b/test/cache_common.h
@@ -393,7 +393,7 @@ typedef struct test_entry_t {
unsigned flush_dep_npar; /* Number of flush dependency parents */
unsigned flush_dep_nchd; /* Number of flush dependency children */
unsigned
- flush_dep_ndirty_chd; /* Number of dirty flush dependency children (including granchildren, etc.) */
+ flush_dep_ndirty_chd; /* Number of dirty flush dependency children (including granchildren, etc.) */
hbool_t pinned_from_client; /* entry was pinned by client call */
hbool_t pinned_from_cache; /* entry was pinned by cache internally */
unsigned flush_order; /* Order that entry was flushed in */
diff --git a/test/cache_tagging.c b/test/cache_tagging.c
index eab5d18..3b662a8 100644
--- a/test/cache_tagging.c
+++ b/test/cache_tagging.c
@@ -443,8 +443,8 @@ check_file_creation_tags(hid_t fcpl_id, int type)
/* Variable Declarations */
hid_t fid = -1; /* File Identifier */
#ifndef NDEBUG
- int verbose = FALSE; /* verbose test outout */
-#endif /* NDEBUG */
+ int verbose = FALSE; /* verbose test outout */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = 0;
haddr_t sbe_tag = 0;
@@ -548,10 +548,10 @@ check_file_open_tags(hid_t fcpl, int type)
hid_t fid = -1; /* File Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
- hid_t fapl = -1; /* File access prop list */
- haddr_t root_tag; /* Root Group Tag */
- haddr_t sbe_tag; /* Sblock Extension Tag */
+#endif /* NDEBUG */
+ hid_t fapl = -1; /* File access prop list */
+ haddr_t root_tag; /* Root Group Tag */
+ haddr_t sbe_tag; /* Sblock Extension Tag */
/* Testing Macro */
TESTING("tag application during file open");
@@ -677,8 +677,8 @@ check_group_creation_tags(void)
hid_t fid = -1; /* File Identifier */
hid_t gid = -1; /* Group Identifier */
#ifndef NDEBUG
- int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+ int verbose = FALSE; /* verbose file outout */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = HADDR_UNDEF; /* Root Group Tag */
haddr_t g_tag; /* Group Tag */
@@ -800,8 +800,8 @@ check_multi_group_creation_tags(void)
hid_t fid = -1; /* File Identifier */
hid_t gid = -1; /* Group Identifier */
#ifndef NDEBUG
- int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+ int verbose = FALSE; /* verbose file outout */
+#endif /* NDEBUG */
char gname[16]; /* group name buffer */
int i = 0; /* iterator */
hid_t fapl = -1; /* File access prop list */
@@ -952,8 +952,8 @@ check_link_iteration_tags(void)
hid_t sid = -1; /* Group Identifier */
hid_t did = -1; /* Group Identifier */
#ifndef NDEBUG
- int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+ int verbose = FALSE; /* verbose file outout */
+#endif /* NDEBUG */
int i = 0; /* iterator */
haddr_t root_tag = 0; /* Root Group Tag Value */
char dsetname[500]; /* Name of dataset */
@@ -1094,8 +1094,8 @@ check_dense_attribute_tags(void)
hid_t did = -1; /* Group Identifier */
hid_t dcpl = -1; /* Group Identifier */
#ifndef NDEBUG
- int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+ int verbose = FALSE; /* verbose file outout */
+#endif /* NDEBUG */
int i = 0; /* iterator */
hid_t fapl = -1; /* File access property list */
haddr_t d_tag = 0; /* Dataset tag value */
@@ -1324,8 +1324,8 @@ check_group_open_tags(void)
hid_t fid = -1; /* File Identifier */
hid_t gid = -1; /* Group Identifier */
#ifndef NDEBUG
- int verbose = FALSE; /* verbose file output */
-#endif /* NDEBUG */
+ int verbose = FALSE; /* verbose file output */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = HADDR_UNDEF;
haddr_t g_tag;
@@ -1455,8 +1455,8 @@ check_attribute_creation_tags(hid_t fcpl, int type)
hid_t gid = -1; /* Group Identifier */
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
- int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+ int verbose = FALSE; /* verbose file outout */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = 0; /* Root group tag */
haddr_t g_tag = 0;
@@ -1620,8 +1620,8 @@ check_attribute_open_tags(hid_t fcpl, int type)
hid_t gid = -1; /* Group Identifier */
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
- int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+ int verbose = FALSE; /* verbose file outout */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = 0;
haddr_t g_tag = 0;
@@ -1787,8 +1787,8 @@ check_attribute_rename_tags(hid_t fcpl, int type)
hid_t aid = -1; /* Attribute Identifier */
hid_t sid = -1; /* Dataset Identifier */
#ifndef NDEBUG
- int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+ int verbose = FALSE; /* verbose file outout */
+#endif /* NDEBUG */
int * data = NULL; /* data buffer */
int i, j, k = 0; /* iterators */
hid_t fapl = -1; /* File access prop list */
@@ -2000,8 +2000,8 @@ check_attribute_delete_tags(hid_t fcpl, int type)
hid_t aid = -1; /* Attribute Identifier */
hid_t sid = -1; /* Dataset Identifier */
#ifndef NDEBUG
- int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+ int verbose = FALSE; /* verbose file outout */
+#endif /* NDEBUG */
int * data = NULL; /* data buffer */
int i, j, k = 0; /* iterators */
hid_t fapl = -1; /* File access prop list */
@@ -2191,8 +2191,8 @@ check_dataset_creation_tags(hid_t fcpl, int type)
hid_t did = -1; /* Dataset Identifier */
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
- int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+ int verbose = FALSE; /* verbose file outout */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -2351,8 +2351,8 @@ check_dataset_creation_earlyalloc_tags(hid_t fcpl, int type)
hid_t did = -1; /* Dataset Identifier */
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
- int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+ int verbose = FALSE; /* verbose file outout */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -2517,8 +2517,8 @@ check_dataset_open_tags(void)
hid_t did = -1; /* Dataset Identifier */
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
- int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+ int verbose = FALSE; /* verbose file outout */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -2669,8 +2669,8 @@ check_dataset_write_tags(void)
hid_t did = -1; /* Dataset Identifier */
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
- int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+ int verbose = FALSE; /* verbose file outout */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -2836,8 +2836,8 @@ check_attribute_write_tags(hid_t fcpl, int type)
hid_t aid = -1; /* Attribute Identifier */
hid_t sid = -1; /* Dataset Identifier */
#ifndef NDEBUG
- int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+ int verbose = FALSE; /* verbose file outout */
+#endif /* NDEBUG */
int * data = NULL; /* data buffer */
int i, j, k = 0; /* iterators */
hid_t fapl = -1; /* File access prop list */
@@ -3022,8 +3022,8 @@ check_dataset_read_tags(void)
hid_t did = -1; /* Dataset Identifier */
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
- int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+ int verbose = FALSE; /* verbose file outout */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -3184,8 +3184,8 @@ check_dataset_size_retrieval(void)
hid_t did = -1; /* Dataset Identifier */
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
- int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+ int verbose = FALSE; /* verbose file outout */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -3348,8 +3348,8 @@ check_dataset_extend_tags(void)
hid_t did = -1; /* Dataset Identifier */
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
- int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+ int verbose = FALSE; /* verbose file outout */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -3510,8 +3510,8 @@ check_object_info_tags(void)
hid_t fid = -1; /* File Identifier */
hid_t gid = -1; /* Group Identifier */
#ifndef NDEBUG
- int verbose = FALSE; /* verbose file output */
-#endif /* NDEBUG */
+ int verbose = FALSE; /* verbose file output */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = HADDR_UNDEF;
haddr_t g_tag;
@@ -3645,8 +3645,8 @@ check_object_copy_tags(void)
hid_t fid = -1; /* File Identifier */
hid_t gid = -1; /* Group Identifier */
#ifndef NDEBUG
- int verbose = FALSE; /* verbose file output */
-#endif /* NDEBUG */
+ int verbose = FALSE; /* verbose file output */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = HADDR_UNDEF;
haddr_t g_tag;
@@ -3795,8 +3795,8 @@ check_link_removal_tags(hid_t fcpl, int type)
hid_t sid = -1; /* Dataspace Identifier */
hid_t gid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
- int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+ int verbose = FALSE; /* verbose file outout */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -3984,8 +3984,8 @@ check_link_getname_tags(void)
hid_t sid = -1; /* Dataspace Identifier */
hid_t gid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
- int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+ int verbose = FALSE; /* verbose file outout */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -4161,8 +4161,8 @@ check_external_link_creation_tags(void)
hid_t fid2 = -1; /* File Identifier */
hid_t gid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
- int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+ int verbose = FALSE; /* verbose file outout */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = 0;
@@ -4288,8 +4288,8 @@ check_external_link_open_tags(void)
hid_t gid = -1; /* Dataspace Identifier */
hid_t xid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
- int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */
+ int verbose = FALSE; /* verbose file outout */
+#endif /* NDEBUG */
H5O_native_info_t ninfo; /* Native object info struct */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = 0;
@@ -4462,7 +4462,7 @@ check_invalid_tag_application(void)
H5HL_t *lheap = NULL;
hid_t fapl = -1; /* File access prop list */
hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */
-#endif /* H5C_DO_TAGGING_SANITY_CHECKS */
+#endif /* H5C_DO_TAGGING_SANITY_CHECKS */
/* Testing Macro */
TESTING("failure on invalid tag application");
diff --git a/test/chunk_info.c b/test/chunk_info.c
index 04b3ad0..d22d44b 100644
--- a/test/chunk_info.c
+++ b/test/chunk_info.c
@@ -67,7 +67,7 @@ const char *FILENAME[] = {"tchunk_info_earliest", "tchunk_info_v18", "tchunk_in
#define V2_BTREE_INDEX_DSET_NAME "Version 2 B-Tree Index Dataset"
#define SKIP_FILTER_DSET_NAME "Dataset with Skipping One Filter"
#define FILENAME_BUF_SIZE 256 /* Size for file names */
-#define RANK 2 /* Rank for datasets */
+#define RANK 2 /* Rank for datasets */
/* Dimension of the dataset */
#define NX 24
@@ -489,7 +489,7 @@ test_get_chunk_info_highest_v18(hid_t fapl)
Bytef * z_dst; /*destination buffer */
uLongf z_dst_nbytes = (uLongf)DEFLATE_SIZE_ADJUST(CHK_SIZE);
uLong z_src_nbytes = (uLong)CHK_SIZE;
-#endif /* end H5_HAVE_FILTER_DEFLATE */
+#endif /* end H5_HAVE_FILTER_DEFLATE */
void * inbuf = NULL; /* Pointer to new buffer */
hsize_t chunk_size = CHK_SIZE; /* Size of a chunk, can be compressed or not */
hsize_t ii, jj; /* Array indices */
diff --git a/test/cross_read.c b/test/cross_read.c
index 7455752..22c6828 100644
--- a/test/cross_read.c
+++ b/test/cross_read.c
@@ -275,7 +275,7 @@ check_file(char *filename)
TESTING("dataset of LE FLOAT with Deflate filter");
#ifdef H5_HAVE_FILTER_DEFLATE
nerrors += check_data_f(DATASETNAME16, fid);
-#else /*H5_HAVE_FILTER_DEFLATE*/
+#else /*H5_HAVE_FILTER_DEFLATE*/
SKIPPED();
HDputs(not_supported);
#endif /*H5_HAVE_FILTER_DEFLATE*/
@@ -283,7 +283,7 @@ check_file(char *filename)
TESTING("dataset of BE FLOAT with Deflate filter");
#ifdef H5_HAVE_FILTER_DEFLATE
nerrors += check_data_f(DATASETNAME17, fid);
-#else /*H5_HAVE_FILTER_DEFLATE*/
+#else /*H5_HAVE_FILTER_DEFLATE*/
SKIPPED();
HDputs(not_supported);
#endif /*H5_HAVE_FILTER_DEFLATE*/
@@ -291,7 +291,7 @@ check_file(char *filename)
TESTING("dataset of LE FLOAT with Szip filter");
#ifdef H5_HAVE_FILTER_SZIP
nerrors += check_data_f(DATASETNAME18, fid);
-#else /*H5_HAVE_FILTER_SZIP*/
+#else /*H5_HAVE_FILTER_SZIP*/
SKIPPED();
HDputs(not_supported);
#endif /*H5_HAVE_FILTER_SZIP*/
@@ -299,7 +299,7 @@ check_file(char *filename)
TESTING("dataset of BE FLOAT with Szip filter");
#ifdef H5_HAVE_FILTER_SZIP
nerrors += check_data_f(DATASETNAME19, fid);
-#else /*H5_HAVE_FILTER_SZIP*/
+#else /*H5_HAVE_FILTER_SZIP*/
SKIPPED();
HDputs(not_supported);
#endif /*H5_HAVE_FILTER_SZIP*/
diff --git a/test/dsets.c b/test/dsets.c
index 4f1cfff..45c4273 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -193,15 +193,15 @@ const char *FILENAME[] = {"dataset", /* 0 */
#define DATA_NOT_CORRUPTED 0
/* Parameters for the "set local" test */
-#define BOGUS2_PERM_NPARMS 2 /* Number of "permanent" parameters */
+#define BOGUS2_PERM_NPARMS 2 /* Number of "permanent" parameters */
#define BOGUS2_PARAM_1 13 /* (No particular meaning, just for checking value) */
#define BOGUS2_PARAM_2 35 /* (No particular meaning, just for checking value) */
-#define BOGUS2_ALL_NPARMS 4 /* Total number of parameter = permanent + "local" parameters */
+#define BOGUS2_ALL_NPARMS 4 /* Total number of parameter = permanent + "local" parameters */
/* Dimensionality for conversion buffer test */
-#define DIM1 100 /* Dim. Size of data member # 1 */
+#define DIM1 100 /* Dim. Size of data member # 1 */
#define DIM2 5000 /* Dim. Size of data member # 2 */
-#define DIM3 10 /* Dim. Size of data member # 3 */
+#define DIM3 10 /* Dim. Size of data member # 3 */
/* Parameters for internal filter test */
#define FILTER_CHUNK_DIM1 2
@@ -2412,7 +2412,7 @@ test_get_filter_info(void)
if (((flags & H5Z_FILTER_CONFIG_ENCODE_ENABLED) != 0) ||
((flags & H5Z_FILTER_CONFIG_DECODE_ENABLED) == 0))
TEST_ERROR
- } /* end else */
+ } /* end else */
#endif /* H5_HAVE_FILTER_SZIP */
/* Verify that get_filter_info throws an error when given a bad filter */
@@ -2454,7 +2454,7 @@ test_filters(hid_t file, hid_t
#ifdef H5_HAVE_FILTER_DEFLATE
hsize_t deflate_size; /* Size of dataset with deflate filter */
-#endif /* H5_HAVE_FILTER_DEFLATE */
+#endif /* H5_HAVE_FILTER_DEFLATE */
#ifdef H5_HAVE_FILTER_SZIP
hsize_t szip_size; /* Size of dataset with szip filter */
@@ -2466,7 +2466,7 @@ test_filters(hid_t file, hid_t
#if defined(H5_HAVE_FILTER_DEFLATE) || defined(H5_HAVE_FILTER_SZIP)
hsize_t combo_size; /* Size of dataset with multiple filters */
-#endif /* defined(H5_HAVE_FILTER_DEFLATE) || defined(H5_HAVE_FILTER_SZIP) */
+#endif /* defined(H5_HAVE_FILTER_DEFLATE) || defined(H5_HAVE_FILTER_SZIP) */
/* test the H5Zget_filter_info function */
if (test_get_filter_info() < 0)
@@ -2569,7 +2569,7 @@ test_filters(hid_t file, hid_t
/* Clean up objects used for this test */
if (H5Pclose(dc) < 0)
goto error;
-#else /* H5_HAVE_FILTER_DEFLATE */
+#else /* H5_HAVE_FILTER_DEFLATE */
TESTING("deflate filter");
SKIPPED();
HDputs(" Deflate filter not enabled");
@@ -2611,7 +2611,7 @@ test_filters(hid_t file, hid_t
SKIPPED();
}
-#else /* H5_HAVE_FILTER_SZIP */
+#else /* H5_HAVE_FILTER_SZIP */
TESTING("szip filter");
SKIPPED();
HDputs(" Szip filter not enabled");
@@ -2686,7 +2686,7 @@ test_filters(hid_t file, hid_t
/* Clean up objects used for this test */
if (H5Pclose(dc) < 0)
goto error;
-#else /* H5_HAVE_FILTER_DEFLATE */
+#else /* H5_HAVE_FILTER_DEFLATE */
TESTING("shuffle+deflate+fletcher32 filters");
SKIPPED();
HDputs(" Deflate filter not enabled");
@@ -2764,7 +2764,7 @@ test_filters(hid_t file, hid_t
SKIPPED();
}
-#else /* H5_HAVE_FILTER_SZIP */
+#else /* H5_HAVE_FILTER_SZIP */
TESTING("shuffle+szip+fletcher32 filters");
SKIPPED();
HDputs(" szip filter not enabled");
@@ -2820,7 +2820,7 @@ test_missing_filter(hid_t file)
H5_FAILED();
HDprintf(" Line %d: Can't unregister deflate filter\n", __LINE__);
goto error;
- } /* end if */
+ } /* end if */
#endif /* H5_HAVE_FILTER_DEFLATE */
/* Verify deflate filter is not registered currently */
if (H5Zfilter_avail(H5Z_FILTER_DEFLATE) != FALSE) {
@@ -3006,7 +3006,7 @@ test_missing_filter(hid_t file)
H5_FAILED();
HDprintf(" Line %d: Deflate filter not available\n", __LINE__);
goto error;
- } /* end if */
+ } /* end if */
#endif /* H5_HAVE_FILTER_DEFLATE */
/* Pop API context */
@@ -6257,7 +6257,7 @@ test_can_apply_szip(hid_t
const hsize_t chunk_dims[2] = {250, 2048}; /* Chunk dimensions */
const hsize_t chunk_dims2[2] = {2, 1}; /* Chunk dimensions */
herr_t ret; /* Status value */
-#endif /* H5_HAVE_FILTER_SZIP */
+#endif /* H5_HAVE_FILTER_SZIP */
TESTING("dataset szip filter 'can apply' callback");
@@ -6409,7 +6409,7 @@ test_can_apply_szip(hid_t
SKIPPED();
HDputs(" Szip encoding is not enabled.");
}
-#else /* H5_HAVE_FILTER_SZIP */
+#else /* H5_HAVE_FILTER_SZIP */
SKIPPED();
HDputs(" Szip filter is not enabled.");
#endif /* H5_HAVE_FILTER_SZIP */
@@ -10668,7 +10668,7 @@ test_fixed_array(hid_t fapl)
#ifdef H5_HAVE_FILTER_DEFLATE
unsigned compress; /* Whether chunks should be compressed */
-#endif /* H5_HAVE_FILTER_DEFLATE */
+#endif /* H5_HAVE_FILTER_DEFLATE */
h5_stat_size_t empty_size; /* Size of an empty file */
h5_stat_size_t file_size; /* Size of each file created */
@@ -11087,7 +11087,7 @@ test_fixed_array(hid_t fapl)
} /* end for */
#ifdef H5_HAVE_FILTER_DEFLATE
- } /* end for */
+ } /* end for */
#endif /* H5_HAVE_FILTER_DEFLATE */
/* Release buffers */
@@ -11179,7 +11179,7 @@ test_single_chunk(hid_t fapl)
#ifdef H5_HAVE_FILTER_DEFLATE
unsigned compress; /* Whether chunks should be compressed */
-#endif /* H5_HAVE_FILTER_DEFLATE */
+#endif /* H5_HAVE_FILTER_DEFLATE */
size_t n, i; /* local index variables */
herr_t ret; /* Generic return value */
@@ -11391,7 +11391,7 @@ test_single_chunk(hid_t fapl)
} /* end for */
#ifdef H5_HAVE_FILTER_DEFLATE
- } /* end for */
+ } /* end for */
#endif /* H5_HAVE_FILTER_DEFLATE */
/* Release buffers */
diff --git a/test/dt_arith.c b/test/dt_arith.c
index 49c1e8c..7b2274c 100644
--- a/test/dt_arith.c
+++ b/test/dt_arith.c
@@ -5165,7 +5165,7 @@ run_int_fp_conv(const char *name)
#if H5_SIZEOF_LONG_LONG != H5_SIZEOF_LONG
#if H5_LLONG_TO_LDOUBLE_CORRECT
nerrors += test_conv_int_fp(name, TEST_NORMAL, H5T_NATIVE_LLONG, H5T_NATIVE_LDOUBLE);
-#else /* H5_LLONG_TO_LDOUBLE_CORRECT */
+#else /* H5_LLONG_TO_LDOUBLE_CORRECT */
{
char str[256]; /*hello string */
@@ -5177,7 +5177,7 @@ run_int_fp_conv(const char *name)
#endif /* H5_LLONG_TO_LDOUBLE_CORRECT */
#if H5_LLONG_TO_LDOUBLE_CORRECT
nerrors += test_conv_int_fp(name, TEST_NORMAL, H5T_NATIVE_ULLONG, H5T_NATIVE_LDOUBLE);
-#else /* H5_LLONG_TO_LDOUBLE_CORRECT */
+#else /* H5_LLONG_TO_LDOUBLE_CORRECT */
{
char str[256]; /*hello string */
diff --git a/test/dtypes.c b/test/dtypes.c
index 8ff49b9..184c099 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -6486,7 +6486,7 @@ test_int_float_except(void)
hid_t dxpl; /* Dataset transfer property list */
except_info_t e; /* Exception information */
unsigned u; /* Local index variables */
-#endif /* H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 */
+#endif /* H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 */
TESTING("exceptions for int <-> float conversions");
@@ -6602,7 +6602,7 @@ test_int_float_except(void)
TEST_ERROR
PASSED();
-#else /* H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 */
+#else /* H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 */
SKIPPED();
HDputs(" Test skipped due to int or float not 4 bytes.");
#endif /* H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 */
diff --git a/test/earray.c b/test/earray.c
index 845b4c5..d10b46f 100644
--- a/test/earray.c
+++ b/test/earray.c
@@ -375,7 +375,7 @@ check_stats(const H5EA_t *ea, const earray_state_t *state)
"\n",
earray_stats.stored.data_blk_size, state->data_blk_size);
TEST_ERROR
- } /* end if */
+ } /* end if */
#endif /* NOT_YET */
if (earray_stats.stored.nsuper_blks != state->nsuper_blks) {
HDfprintf(stdout,
@@ -391,7 +391,7 @@ check_stats(const H5EA_t *ea, const earray_state_t *state)
"\n",
earray_stats.stored.super_blk_size, state->super_blk_size);
TEST_ERROR
- } /* end if */
+ } /* end if */
#endif /* NOT_YET */
/* All tests passed */
@@ -757,7 +757,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
PASSED();
}
-#else /* NDEBUG */
+#else /* NDEBUG */
SKIPPED();
HDputs(" Not tested when assertions are disabled");
#endif /* NDEBUG */
diff --git a/test/error_test.c b/test/error_test.c
index ba5a917..2a99837 100644
--- a/test/error_test.c
+++ b/test/error_test.c
@@ -132,7 +132,7 @@ test_error(hid_t file)
#ifdef H5_USE_16_API
if (old_func != (H5E_auto_t)H5Eprint)
TEST_ERROR;
-#else /* H5_USE_16_API */
+#else /* H5_USE_16_API */
if (old_func != (H5E_auto2_t)H5Eprint2)
TEST_ERROR;
#endif /* H5_USE_16_API */
diff --git a/test/farray.c b/test/farray.c
index 09421c0..1207a37 100644
--- a/test/farray.c
+++ b/test/farray.c
@@ -481,7 +481,7 @@ test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t H5_ATTR_UNUSE
PASSED();
}
-#else /* NDEBUG */
+#else /* NDEBUG */
SKIPPED();
HDputs(" Not tested when assertions are disabled");
#endif /* NDEBUG */
diff --git a/test/fheap.c b/test/fheap.c
index b167012..2b79ae8 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -9423,14 +9423,14 @@ test_man_fill_direct_skip_2nd_indirect_start_block_add_skipped(hid_t fapl, H5HF_
H5HF_t * fh = NULL; /* Fractal heap wrapper */
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
- unsigned num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the */
+ unsigned num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the */
/* first indirect blocks */
- unsigned row; /* Current row in indirect block */
- h5_stat_size_t empty_size; /* Size of a file with an empty heap */
- size_t obj_size; /* Size of object */
- size_t fill_size; /* Size of objects for "bulk" filled blocks */
- fheap_heap_state_t state; /* State of fractal heap */
- unsigned u; /* Local index variable */
+ unsigned row; /* Current row in indirect block */
+ h5_stat_size_t empty_size; /* Size of a file with an empty heap */
+ size_t obj_size; /* Size of object */
+ size_t fill_size; /* Size of objects for "bulk" filled blocks */
+ fheap_heap_state_t state; /* State of fractal heap */
+ unsigned u; /* Local index variable */
/* Test description */
const char *base_desc = "filling direct blocks and skipping row of non-root indirect blocks, then "
"backfill and extend, then remove all objects %s";
@@ -9556,7 +9556,7 @@ test_man_fill_2nd_direct_less_one_wrap_start_block_add_skipped(hid_t fapl, H5HF_
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
unsigned
- num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
size_t fill_size; /* Size of objects for "bulk" filled blocks */
@@ -9702,8 +9702,8 @@ test_man_fill_direct_skip_2nd_indirect_skip_2nd_block_add_skipped(hid_t fapl, H5
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
unsigned
- num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
- unsigned row; /* Current row in indirect block */
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ unsigned row; /* Current row in indirect block */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
size_t fill_size; /* Size of objects for "bulk" filled blocks */
@@ -9865,7 +9865,7 @@ test_man_fill_direct_skip_indirect_two_rows_add_skipped(hid_t fapl, H5HF_create_
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
unsigned
- num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
unsigned max_dblock_rows; /* Max. # of rows (of direct blocks) in the root indirect block */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
@@ -10021,7 +10021,7 @@ test_man_fill_direct_skip_indirect_two_rows_skip_indirect_row_add_skipped(hid_t
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
unsigned
- num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
unsigned max_dblock_rows; /* Max. # of rows (of direct blocks) in the root indirect block */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
@@ -10478,7 +10478,7 @@ test_man_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped(h
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
unsigned
- num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
size_t fill_size; /* Size of objects for "bulk" filled blocks */
@@ -10631,7 +10631,7 @@ test_man_fill_2nd_direct_fill_direct_skip2_3rd_indirect_start_block_add_skipped(
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
unsigned
- num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
size_t fill_size; /* Size of objects for "bulk" filled blocks */
@@ -10788,7 +10788,7 @@ test_man_fill_3rd_direct_less_one_fill_direct_wrap_start_block_add_skipped(hid_t
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
unsigned
- num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
size_t fill_size; /* Size of objects for "bulk" filled blocks */
@@ -10952,7 +10952,7 @@ test_man_fill_1st_row_3rd_direct_fill_2nd_direct_less_one_wrap_start_block_add_s
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
unsigned
- num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
size_t fill_size; /* Size of objects for "bulk" filled blocks */
@@ -11120,7 +11120,7 @@ test_man_fill_3rd_direct_fill_direct_skip_start_block_add_skipped(hid_t fapl, H5
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
unsigned
- num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
size_t fill_size; /* Size of objects for "bulk" filled blocks */
@@ -11283,7 +11283,7 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_blo
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
unsigned
- num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
size_t fill_size; /* Size of objects for "bulk" filled blocks */
@@ -11466,7 +11466,7 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_two_rows_
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
unsigned
- num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
size_t fill_size; /* Size of objects for "bulk" filled blocks */
@@ -11686,7 +11686,7 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_star
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
unsigned
- num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
size_t fill_size; /* Size of objects for "bulk" filled blocks */
@@ -11886,7 +11886,7 @@ test_man_fill_4th_direct_less_one_fill_2nd_direct_fill_direct_skip_3rd_indirect_
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
unsigned
- num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
size_t fill_size; /* Size of objects for "bulk" filled blocks */
@@ -12417,7 +12417,7 @@ test_man_frag_2nd_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *
haddr_t fh_addr; /* Address of fractal heap */
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
unsigned
- num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
+ num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
size_t obj_size; /* Size of object */
size_t fill_size; /* Size of objects for "bulk" filled blocks */
@@ -14951,8 +14951,8 @@ test_filtered_man_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
#ifdef NOT_YET
- h5_stat_size_t file_size; /* Size of file currently */
-#endif /* NOT_YET */
+ h5_stat_size_t file_size; /* Size of file currently */
+#endif /* NOT_YET */
unsigned char heap_id[HEAP_ID_LEN]; /* Heap ID for object */
size_t obj_size; /* Size of object */
size_t robj_size; /* Size of object read */
@@ -15124,8 +15124,8 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa
fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */
h5_stat_size_t empty_size; /* Size of a file with an empty heap */
#ifdef NOT_YET
- h5_stat_size_t file_size; /* Size of file currently */
-#endif /* NOT_YET */
+ h5_stat_size_t file_size; /* Size of file currently */
+#endif /* NOT_YET */
unsigned char heap_id1[HEAP_ID_LEN]; /* Heap ID for object #1 */
unsigned char heap_id2[HEAP_ID_LEN]; /* Heap ID for object #2 */
size_t obj_size; /* Size of object */
diff --git a/test/filter_plugin.c b/test/filter_plugin.c
index cf2272c..7956ab3 100644
--- a/test/filter_plugin.c
+++ b/test/filter_plugin.c
@@ -463,7 +463,7 @@ test_dataset_write_with_filters(hid_t fid)
/* Clean up objects used for this test */
if (H5Pclose(dcpl_id) < 0)
TEST_ERROR;
-#else /* H5_HAVE_FILTER_DEFLATE */
+#else /* H5_HAVE_FILTER_DEFLATE */
SKIPPED();
HDputs(" Deflate filter not enabled");
#endif /* H5_HAVE_FILTER_DEFLATE */
@@ -649,7 +649,7 @@ test_dataset_read_with_filters(hid_t fid)
if (H5Dclose(did) < 0)
TEST_ERROR;
-#else /* H5_HAVE_FILTER_DEFLATE */
+#else /* H5_HAVE_FILTER_DEFLATE */
SKIPPED();
HDputs(" Deflate filter not enabled");
#endif /* H5_HAVE_FILTER_DEFLATE */
diff --git a/test/gen_bad_ohdr.c b/test/gen_bad_ohdr.c
index 641beac..ca635a1 100644
--- a/test/gen_bad_ohdr.c
+++ b/test/gen_bad_ohdr.c
@@ -112,7 +112,7 @@ error:
H5Fclose(fid);
}
H5E_END_TRY;
-#else /* H5O_ENABLE_BAD_MESG_COUNT */
+#else /* H5O_ENABLE_BAD_MESG_COUNT */
HDputs("H5O_BAD_MESG_COUNT compiler macro not defined!");
#endif /* H5O_ENABLE_BAD_MESG_COUNT */
return 1;
diff --git a/test/gen_bogus.c b/test/gen_bogus.c
index ad85898..b21adeb 100644
--- a/test/gen_bogus.c
+++ b/test/gen_bogus.c
@@ -179,7 +179,7 @@ error:
H5Fclose(fid);
}
H5E_END_TRY;
-#else /* H5O_ENABLE_BOGUS */
+#else /* H5O_ENABLE_BOGUS */
HDputs("H5O_ENABLE_BOGUS compiler macro not defined!");
#endif /* H5O_ENABLE_BOGUS */
return 1;
diff --git a/test/gen_cross.c b/test/gen_cross.c
index 28ddf54..030cc65 100644
--- a/test/gen_cross.c
+++ b/test/gen_cross.c
@@ -925,7 +925,7 @@ create_deflate_dsets_float(hid_t fid, hid_t fsid, hid_t msid)
if (H5Pclose(dcpl) < 0)
TEST_ERROR
-#else /* H5_HAVE_FILTER_DEFLATE */
+#else /* H5_HAVE_FILTER_DEFLATE */
const char *not_supported = "Deflate filter is not enabled. Can't create the dataset.";
HDputs(not_supported);
@@ -1328,7 +1328,7 @@ main(void)
/* Create a dataset of FLOAT with szip filter */
if (create_szip_dsets_float(file, filespace, memspace) < 0)
TEST_ERROR;
-#else /* H5_HAVE_FILTER_SZIP */
+#else /* H5_HAVE_FILTER_SZIP */
HDputs("Szip filter is not enabled. Can't create the dataset.");
#endif /* H5_HAVE_FILTER_SZIP */
diff --git a/test/links.c b/test/links.c
index cb01007..9253e48 100644
--- a/test/links.c
+++ b/test/links.c
@@ -9805,8 +9805,8 @@ external_set_elink_cb(hid_t fapl, hbool_t new_format)
base_driver == H5FD_MPIO || base_driver == H5FD_CORE)
? H5P_DEFAULT
: fapl;
- op_data.fam_size = ELINK_CB_FAM_SIZE;
- op_data.code = 0;
+ op_data.fam_size = ELINK_CB_FAM_SIZE;
+ op_data.code = 0;
/* Create family fapl */
if ((fam_fapl = H5Pcopy(fapl)) < 0)
@@ -12321,7 +12321,7 @@ external_symlink(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
char * tmpname = NULL;
char * cwdpath = NULL;
hbool_t have_posix_compat_vfd; /* Whether VFD used is compatible w/POSIX I/O calls */
-#endif /* H5_HAVE_SYMLINK */
+#endif /* H5_HAVE_SYMLINK */
if (new_format)
TESTING("external links w/symlink files (w/new group format)")
@@ -12575,7 +12575,7 @@ error:
return FAIL;
-#else /* H5_HAVE_SYMLINK */
+#else /* H5_HAVE_SYMLINK */
SKIPPED();
HDputs(" Current file system or operating system doesn't support symbolic links");
@@ -19195,8 +19195,8 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u
unsigned v; /* Local index variable */
hsize_t skip; /* # of links to skip in group */
#ifndef H5_NO_DEPRECATED_SYMBOLS
- int gskip; /* # of links to skip in group, with H5Giterate */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+ int gskip; /* # of links to skip in group, with H5Giterate */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
herr_t ret; /* Generic return value */
/* Iterate over links in group */
@@ -19304,7 +19304,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u
if (nvisit != (max_links / 2))
TEST_ERROR
- } /* end else */
+ } /* end else */
#endif /* H5_NO_DEPRECATED_SYMBOLS */
/* Iterate over links in group, stopping in the middle */
@@ -19683,8 +19683,8 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links
unsigned v; /* Local index variable */
hsize_t skip; /* # of links to skip in group */
#ifndef H5_NO_DEPRECATED_SYMBOLS
- int gskip; /* # of links to skip in group, with H5Giterate */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+ int gskip; /* # of links to skip in group, with H5Giterate */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
herr_t ret; /* Generic return value */
/* Iterate over links in group */
@@ -19792,7 +19792,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links
if (nvisit != (max_links / 2))
TEST_ERROR
- } /* end else */
+ } /* end else */
#endif /* H5_NO_DEPRECATED_SYMBOLS */
/* Iterate over links in group, stopping in the middle */
@@ -22515,12 +22515,12 @@ main(void)
nerrors += ud_hard_links(fapl2) < 0 ? 1 : 0; /* requires new format groups */
#ifndef H5_NO_DEPRECATED_SYMBOLS
nerrors += ud_hard_links_deprec(fapl2) < 0 ? 1 : 0; /* requires new format groups */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
- nerrors += ud_link_reregister(fapl2) < 0 ? 1 : 0; /* requires new format groups */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
+ nerrors += ud_link_reregister(fapl2) < 0 ? 1 : 0; /* requires new format groups */
#ifndef H5_NO_DEPRECATED_SYMBOLS
nerrors += ud_link_reregister_deprec(fapl2) < 0 ? 1 : 0; /* requires new format groups */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
- } /* end if */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
+ } /* end if */
nerrors += ud_callbacks(my_fapl, new_format) < 0 ? 1 : 0;
#ifndef H5_NO_DEPRECATED_SYMBOLS
nerrors += ud_callbacks_deprec(my_fapl, new_format) < 0 ? 1 : 0;
diff --git a/test/mount.c b/test/mount.c
index 5d345a8..395a19a 100644
--- a/test/mount.c
+++ b/test/mount.c
@@ -1194,7 +1194,7 @@ test_interlink(hid_t fapl)
FAIL_STACK_ERROR
if (H5Tclose(type) < 0)
FAIL_STACK_ERROR
-#else /* NOT_NOW */
+#else /* NOT_NOW */
SKIPPED();
HDputs(" Test skipped due file pointer sharing issue (Jira 7638).");
#endif /* NOT_NOW */
diff --git a/test/objcopy.c b/test/objcopy.c
index 31744af..876e7de 100644
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -4495,7 +4495,7 @@ test_copy_dataset_compressed(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid
#ifndef H5_HAVE_FILTER_DEFLATE
SKIPPED();
HDputs(" Deflation filter not available");
-#else /* H5_HAVE_FILTER_DEFLATE */
+#else /* H5_HAVE_FILTER_DEFLATE */
/* set initial data values */
for (i = 0; i < DIM_SIZE_1; i++)
for (j = 0; j < DIM_SIZE_2; j++)
@@ -4920,7 +4920,7 @@ test_copy_dataset_no_edge_filt(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h
#ifndef H5_HAVE_FILTER_DEFLATE
SKIPPED();
HDputs(" Deflation filter not available");
-#else /* H5_HAVE_FILTER_DEFLATE */
+#else /* H5_HAVE_FILTER_DEFLATE */
/* set initial data values */
for (i = 0; i < DIM_SIZE_1; i++)
for (j = 0; j < DIM_SIZE_2; j++)
@@ -7274,7 +7274,7 @@ test_copy_dataset_compressed_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
#ifndef H5_HAVE_FILTER_DEFLATE
SKIPPED();
HDputs(" Deflation filter not available");
-#else /* H5_HAVE_FILTER_DEFLATE */
+#else /* H5_HAVE_FILTER_DEFLATE */
/* set initial data values */
for (i = 0; i < DIM_SIZE_1; i++) {
for (j = 0; j < DIM_SIZE_2; j++) {
diff --git a/test/s3comms.c b/test/s3comms.c
index 48f11c5..2687433 100644
--- a/test/s3comms.c
+++ b/test/s3comms.c
@@ -291,7 +291,7 @@ jserr_str(const char *expected, const char *actual, const char *reason)
if ((long)(actual) == (long)(expected)) { \
JSERR_LONG((expected), (actual), (reason)) \
goto error; \
- } /* JSVERIFY_NOT */
+ } /* JSVERIFY_NOT */
#endif /* JSVERIFY_NOT unused */
/*----------------------------------------------------------------------------
@@ -348,7 +348,7 @@ jserr_str(const char *expected, const char *actual, const char *reason)
if ((long)(actual) == (long)(expected)) { \
JSERR_LONG((expected), (actual), (reason)) \
goto error; \
- } /* JSVERIFY_NOT */
+ } /* JSVERIFY_NOT */
#endif /* JSVERIFY_NOT unused */
/*----------------------------------------------------------------------------
@@ -372,7 +372,7 @@ jserr_str(const char *expected, const char *actual, const char *reason)
#define S3_TEST_RESOURCE_TEXT_PUBLIC "Poe_Raven.txt"
#define S3_TEST_RESOURCE_MISSING "missing.csv"
-#define S3_TEST_RUN_TIMEOUT 0 /* run tests that might hang */
+#define S3_TEST_RUN_TIMEOUT 0 /* run tests that might hang */
#define S3_TEST_MAX_URL_SIZE 256 /* char array size */
/* Global variables for aws test profile.
@@ -1290,7 +1290,7 @@ test_HMAC_SHA256(void)
HDfprintf(stdout, "ERROR:\n!!! \"%s\"\n != \"%s\"\n", cases[i].exp, dest);
TEST_ERROR;
}
-#else /* VERBOSE not defined */
+#else /* VERBOSE not defined */
/* simple pass/fail test
*/
JSVERIFY(0, HDstrncmp(cases[i].exp, dest, HDstrlen(cases[i].exp)), NULL);
diff --git a/test/set_extent.c b/test/set_extent.c
index 672d5ff..2ad4fd5 100644
--- a/test/set_extent.c
+++ b/test/set_extent.c
@@ -243,11 +243,11 @@ do_ranks(hid_t fapl, hbool_t new_format)
#ifdef H5_HAVE_FILTER_DEFLATE
if (H5Pset_deflate(dcpl, 9) < 0)
TEST_ERROR
-#else /* H5_HAVE_FILTER_DEFLATE */
+#else /* H5_HAVE_FILTER_DEFLATE */
if (H5Pclose(dcpl) < 0)
TEST_ERROR
continue;
-#endif /* H5_HAVE_FILTER_DEFLATE */
+#endif /* H5_HAVE_FILTER_DEFLATE */
} /* end if */
if (config & CONFIG_FILL) {
diff --git a/test/stab.c b/test/stab.c
index e68c000..739a1ba 100644
--- a/test/stab.c
+++ b/test/stab.c
@@ -1271,7 +1271,7 @@ old_api(hid_t fapl)
TEST_ERROR
PASSED();
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+#else /* H5_NO_DEPRECATED_SYMBOLS */
/* Shut compiler up */
fapl = fapl;
diff --git a/test/swmr.c b/test/swmr.c
index ded0115..61d312b 100644
--- a/test/swmr.c
+++ b/test/swmr.c
@@ -2351,7 +2351,7 @@ test_start_swmr_write_concur(hid_t H5_ATTR_UNUSED in_fapl, hbool_t H5_ATTR_UNUSE
return 0;
} /* test_start_swmr_write_concur() */
-#else /* defined(H5_HAVE_FORK && defined(H5_HAVE_WAITPID) */
+#else /* defined(H5_HAVE_FORK && defined(H5_HAVE_WAITPID) */
static int
test_start_swmr_write_concur(hid_t in_fapl, hbool_t new_format)
@@ -6508,7 +6508,7 @@ test_refresh_concur(hid_t H5_ATTR_UNUSED in_fapl, hbool_t H5_ATTR_UNUSED new_for
return 0;
} /* test_refresh_concur() */
-#else /* defined(H5_HAVE_FORK && defined(H5_HAVE_WAITPID) */
+#else /* defined(H5_HAVE_FORK && defined(H5_HAVE_WAITPID) */
static int
test_refresh_concur(hid_t in_fapl, hbool_t new_format)
diff --git a/test/swmr_generator.c b/test/swmr_generator.c
index 9e7c050..931da94 100644
--- a/test/swmr_generator.c
+++ b/test/swmr_generator.c
@@ -96,7 +96,7 @@ gen_skeleton(const char *filename, hbool_t verbose, hbool_t swmr_write, int comp
#ifdef FILLVAL_WORKS
symbol_t fillval; /* Dataset fill value */
#endif /* FILLVAL_WORKS */
- unsigned u, v; /* Local index variable */
+ unsigned u, v; /* Local index variable */
HDassert(filename);
HDassert(index_type);
diff --git a/test/swmr_remove_reader.c b/test/swmr_remove_reader.c
index 1700ece..9017793 100644
--- a/test/swmr_remove_reader.c
+++ b/test/swmr_remove_reader.c
@@ -122,7 +122,7 @@ check_dataset(hid_t fid, unsigned verbose, const char *sym_name, symbol_t *recor
* not work with SWMR currently (see note in swmr_generator.c), we
* simply initialize rec_id to 0. */
record->rec_id = (uint64_t)ULLONG_MAX - 1;
-#else /* FILLVAL_WORKS */
+#else /* FILLVAL_WORKS */
record->rec_id = (uint64_t)0;
#endif /* FILLVAL_WORKS */
if (H5Dread(dsid, symbol_tid, rec_sid, file_sid, H5P_DEFAULT, record) < 0)
diff --git a/test/swmr_sparse_writer.c b/test/swmr_sparse_writer.c
index a253de5..4706b7a 100644
--- a/test/swmr_sparse_writer.c
+++ b/test/swmr_sparse_writer.c
@@ -149,8 +149,8 @@ add_records(hid_t fid, unsigned verbose, unsigned long nrecords, unsigned long f
symbol_t record; /* The record to add to the dataset */
unsigned long rec_to_flush; /* # of records left to write before flush */
#ifdef OUT
- volatile int dummy; /* Dummy varialbe for busy sleep */
-#endif /* OUT */
+ volatile int dummy; /* Dummy varialbe for busy sleep */
+#endif /* OUT */
hsize_t dim[2] = {1, 0}; /* Dataspace dimensions */
unsigned long u, v; /* Local index variables */
diff --git a/test/tattr.c b/test/tattr.c
index 346c1b9..7bc215d 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -5436,10 +5436,10 @@ test_attr_corder_delete(hid_t fcpl, hid_t fapl)
#ifdef LATER
h5_stat_size_t empty_size; /* Size of empty file */
h5_stat_size_t file_size; /* Size of file after operating on it */
-#endif /* LATER */
- unsigned curr_dset; /* Current dataset to work on */
- unsigned u; /* Local index variable */
- herr_t ret; /* Generic return value */
+#endif /* LATER */
+ unsigned curr_dset; /* Current dataset to work on */
+ unsigned u; /* Local index variable */
+ herr_t ret; /* Generic return value */
/* Output message about test being performed */
MESSAGE(5, ("Testing Deleting Object w/Dense Attribute Storage and Creation Order Info\n"));
@@ -5602,7 +5602,7 @@ test_attr_corder_delete(hid_t fcpl, hid_t fapl)
CHECK(file_size, FAIL, "h5_get_file_size");
VERIFY(file_size, empty_size, "h5_get_file_size");
#endif /* LATER */
- } /* end for */
+ } /* end for */
/* Close property list */
ret = H5Pclose(dcpl);
@@ -6861,8 +6861,8 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx
unsigned v; /* Local index variable */
hsize_t skip; /* # of attributes to skip on object */
#ifndef H5_NO_DEPRECATED_SYMBOLS
- unsigned oskip; /* # of attributes to skip on object, with H5Aiterate1 */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+ unsigned oskip; /* # of attributes to skip on object, with H5Aiterate1 */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
int old_nerrs; /* Number of errors when entering this check */
herr_t ret; /* Generic return value */
@@ -7054,7 +7054,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx
nvisit++;
VERIFY(skip, (max_attrs / 2), "H5Aiterate1");
- } /* end else */
+ } /* end else */
#endif /* H5_NO_DEPRECATED_SYMBOLS */
/* Iterate over attributes on object, stopping in the middle */
diff --git a/test/tfile.c b/test/tfile.c
index ed071d6..5668bad 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -7857,7 +7857,7 @@ test_file(void)
#ifndef H5_NO_DEPRECATED_SYMBOLS
test_file_ishdf5(env_h5_drvr); /* Test detecting HDF5 files correctly */
test_deprec(); /* Test deprecated routines */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
ret = H5Pclose(fapl_id);
CHECK(ret, FAIL, "H5Pclose");
diff --git a/test/th5o.c b/test/th5o.c
index a1849f0..8b67159 100644
--- a/test/th5o.c
+++ b/test/th5o.c
@@ -1736,8 +1736,8 @@ test_h5o(void)
test_h5o_open(); /* Test generic open function */
#ifndef H5_NO_DEPRECATED_SYMBOLS
- test_h5o_open_by_addr(); /* Test opening objects by address */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+ test_h5o_open_by_addr(); /* Test opening objects by address */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
test_h5o_open_by_token(); /* Test opening objects by token */
test_h5o_close(); /* Test generic close function */
test_h5o_refcount(); /* Test incrementing and decrementing reference count */
diff --git a/test/th5s.c b/test/th5s.c
index 6eeec1c..04ac2e6 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -102,8 +102,8 @@ struct space4_struct {
#define CONFIG_8 1
#define CONFIG_16 2
#define CONFIG_32 3
-#define POWER8 256 /* 2^8 */
-#define POWER16 65536 /* 2^16 */
+#define POWER8 256 /* 2^8 */
+#define POWER16 65536 /* 2^16 */
#define POWER32 4294967296 /* 2^32 */
/****************************************************************
diff --git a/test/thread_id.c b/test/thread_id.c
index e39b674..d8ddaf8 100644
--- a/test/thread_id.c
+++ b/test/thread_id.c
@@ -314,7 +314,7 @@ main(void)
return failed ? EXIT_FAILURE : EXIT_SUCCESS;
}
-#else /*H5_HAVE_THREADSAFE && !H5_HAVE_WIN_THREADS*/
+#else /*H5_HAVE_THREADSAFE && !H5_HAVE_WIN_THREADS*/
int
main(void)
{
diff --git a/test/tmisc.c b/test/tmisc.c
index 304564c..500cc9f 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -1254,9 +1254,9 @@ test_misc8(void)
int * wdata; /* Data to write */
int * tdata; /* Temporary pointer to data write */
#ifdef VERIFY_DATA
- int *rdata; /* Data to read */
- int *tdata2; /* Temporary pointer to data to read */
-#endif /* VERIFY_DATA */
+ int *rdata; /* Data to read */
+ int *tdata2; /* Temporary pointer to data to read */
+#endif /* VERIFY_DATA */
unsigned u, v; /* Local index variables */
int mdc_nelmts; /* Metadata number of elements */
size_t rdcc_nelmts; /* Raw data number of elements */
@@ -1578,7 +1578,7 @@ test_misc8(void)
if (storage_size >= (MISC8_DIM0 * MISC8_DIM1 * H5Tget_size(H5T_NATIVE_INT)))
TestErrPrintf("Error on line %d: data wasn't compressed! storage_size=%u\n", __LINE__,
(unsigned)storage_size);
-#else /* Compression is not configured */
+#else /* Compression is not configured */
if (storage_size != (MISC8_DIM0 * MISC8_DIM1 * H5Tget_size(H5T_NATIVE_INT)))
TestErrPrintf("Error on line %d: wrong storage size! storage_size=%u\n", __LINE__,
(unsigned)storage_size);
@@ -1612,7 +1612,7 @@ test_misc8(void)
if (storage_size >= (MISC8_DIM0 * MISC8_DIM1 * H5Tget_size(H5T_NATIVE_INT)))
TestErrPrintf("Error on line %d: data wasn't compressed! storage_size=%u\n", __LINE__,
(unsigned)storage_size);
-#else /* Compression is not configured */
+#else /* Compression is not configured */
if (storage_size != (MISC8_DIM0 * MISC8_DIM1 * H5Tget_size(H5T_NATIVE_INT)))
TestErrPrintf("Error on line %d: wrong storage size! storage_size=%u\n", __LINE__,
(unsigned)storage_size);
@@ -1677,7 +1677,7 @@ test_misc8(void)
if (storage_size >= (4 * MISC8_CHUNK_DIM0 * MISC8_CHUNK_DIM1 * H5Tget_size(H5T_NATIVE_INT)))
TestErrPrintf("Error on line %d: data wasn't compressed! storage_size=%u\n", __LINE__,
(unsigned)storage_size);
-#else /* Compression is not configured */
+#else /* Compression is not configured */
if (storage_size != (4 * MISC8_CHUNK_DIM0 * MISC8_CHUNK_DIM1 * H5Tget_size(H5T_NATIVE_INT)))
TestErrPrintf("Error on line %d: wrong storage size! storage_size=%u\n", __LINE__,
(unsigned)storage_size);
@@ -2962,8 +2962,8 @@ test_misc18(void)
hid_t did1, did2; /* Dataset IDs */
hid_t aid; /* Attribute ID */
#ifndef H5_NO_DEPRECATED_SYMBOLS
- H5O_info1_t old_oinfo; /* (deprecated) information about object */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+ H5O_info1_t old_oinfo; /* (deprecated) information about object */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
H5O_info2_t oinfo; /* Data model information about object */
H5O_native_info_t ninfo; /* Native file format information about object */
char attr_name[32]; /* Attribute name buffer */
@@ -5082,7 +5082,7 @@ test_misc27(void)
H5E_BEGIN_TRY { gid = H5Gopen2(fid, MISC27_GROUP, H5P_DEFAULT); }
H5E_END_TRY;
VERIFY(gid, FAIL, "H5Gopen2");
-#else /* H5_STRICT_FORMAT_CHECKS */
+#else /* H5_STRICT_FORMAT_CHECKS */
/* Open group with incorrect # of object header messages */
gid = H5Gopen2(fid, MISC27_GROUP, H5P_DEFAULT);
CHECK(gid, FAIL, "H5Gopen2");
@@ -5399,7 +5399,7 @@ test_misc31(void)
hid_t group_id; /* Group id */
hid_t dtype_id; /* Datatype id */
herr_t ret; /* Generic return value */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
/* Output message about test being performed */
MESSAGE(5, ("Deprecated routines initialize after H5close()\n"));
@@ -5474,7 +5474,7 @@ test_misc31(void)
ret = H5Tclose(dtype_id);
CHECK(ret, FAIL, "H5Tclose");
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+#else /* H5_NO_DEPRECATED_SYMBOLS */
/* Output message about test being skipped */
MESSAGE(5, (" ...Skipped"));
#endif /* H5_NO_DEPRECATED_SYMBOLS */
@@ -5523,7 +5523,7 @@ test_misc32(void)
CHECK_PTR_NULL(buffer, "H5allocate_memory"); /*BAD*/
buffer = H5allocate_memory(0, TRUE);
CHECK_PTR_NULL(buffer, "H5allocate_memory"); /*BAD*/
-#endif /* NDEBUG */
+#endif /* NDEBUG */
/* RESIZE */
@@ -5542,7 +5542,7 @@ test_misc32(void)
#ifdef NDEBUG
resized = H5resize_memory(NULL, 0);
CHECK_PTR_NULL(resized, "H5resize_memory"); /*BAD*/
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end test_misc32() */
@@ -5700,7 +5700,7 @@ test_misc35(void)
CHECK(arr_size_start, 0, "H5get_free_list_sizes");
CHECK(blk_size_start, 0, "H5get_free_list_sizes");
CHECK(fac_size_start, 0, "H5get_free_list_sizes");
-#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
+#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
/* All the values should be == 0 */
VERIFY(reg_size_start, 0, "H5get_free_list_sizes");
VERIFY(arr_size_start, 0, "H5get_free_list_sizes");
@@ -5739,7 +5739,7 @@ test_misc35(void)
CHECK(alloc_stats.total_alloc_blocks_count, 0, "H5get_alloc_stats");
CHECK(alloc_stats.curr_alloc_blocks_count, 0, "H5get_alloc_stats");
CHECK(alloc_stats.peak_alloc_blocks_count, 0, "H5get_alloc_stats");
-#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
+#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
/* All the values should be == 0 */
VERIFY(alloc_stats.total_alloc_bytes, 0, "H5get_alloc_stats");
VERIFY(alloc_stats.curr_alloc_bytes, 0, "H5get_alloc_stats");
@@ -5897,10 +5897,10 @@ test_misc(void)
test_misc19(); /* Test incrementing & decrementing ref count on IDs */
test_misc20(); /* Test problems with truncated dimensions in version 2 of storage layout message */
#ifdef H5_HAVE_FILTER_SZIP
- test_misc21(); /* Test that "late" allocation time is treated the same as "incremental", for chunked
- datasets w/a filters */
- test_misc22(); /* check szip bits per pixel */
-#endif /* H5_HAVE_FILTER_SZIP */
+ test_misc21(); /* Test that "late" allocation time is treated the same as "incremental", for chunked
+ datasets w/a filters */
+ test_misc22(); /* check szip bits per pixel */
+#endif /* H5_HAVE_FILTER_SZIP */
test_misc23(); /* Test intermediate group creation */
test_misc24(); /* Test inappropriate API opens of objects */
test_misc25a(); /* Exercise null object header message merge bug */
diff --git a/test/tsohm.c b/test/tsohm.c
index 1e68628..71e42e6 100644
--- a/test/tsohm.c
+++ b/test/tsohm.c
@@ -819,7 +819,7 @@ test_sohm_size1(void)
hsize_t oh_sizes[3];
unsigned oh_size_index = 0;
-#if 0 /* TBD: lying comment or bug. See Jira HDFFV-10646 */
+#if 0 /* TBD: lying comment or bug. See Jira HDFFV-10646 */
hsize_t norm_oh_size;
#endif /* Jira HDFFV-10646 */
hsize_t sohm_oh_size;
@@ -922,7 +922,7 @@ test_sohm_size1(void)
norm_empty_filesize = file_sizes[0];
norm_final_filesize = file_sizes[1];
norm_final_filesize2 = file_sizes[2];
-#if 0 /* TBD: lying comment or bug. See Jira HDFFV-10646 */
+#if 0 /* TBD: lying comment or bug. See Jira HDFFV-10646 */
norm_oh_size = oh_sizes[0];
#endif /* Jira HDFFV-10646 */
@@ -941,7 +941,7 @@ test_sohm_size1(void)
*/
VERIFY(sohm_btree_oh_size, sohm_oh_size, "H5Oget_info_by_name");
-#if 0 /* TBD: lying comment or bug. See Jira HDFFV-10646 */
+#if 0 /* TBD: lying comment or bug. See Jira HDFFV-10646 */
/* Object headers in SOHM files should be smaller than normal object
* headers.
*/
@@ -992,7 +992,7 @@ test_sohm_size1(void)
*
*---------------------------------------------------------------------------
*/
-#if 0 /* TODO: REVEALS BUG TO BE FIXED - SEE JIRA HDFFV-10645 */
+#if 0 /* TODO: REVEALS BUG TO BE FIXED - SEE JIRA HDFFV-10645 */
static void
test_sohm_size_consistency_open_create(void)
{
@@ -3817,12 +3817,12 @@ test_sohm(void)
{
MESSAGE(5, ("Testing Shared Object Header Messages\n"));
- test_sohm_fcpl(); /* Test SOHMs and file creation plists */
- test_sohm_fcpl_errors(); /* Bogus H5P* calls for SOHMs */
- test_sohm_size1(); /* Tests the sizes of files with one SOHM */
-#if 0 /* TODO: REVEALS BUG TO BE FIXED - SEE JIRA HDFFV-10645 */
+ test_sohm_fcpl(); /* Test SOHMs and file creation plists */
+ test_sohm_fcpl_errors(); /* Bogus H5P* calls for SOHMs */
+ test_sohm_size1(); /* Tests the sizes of files with one SOHM */
+#if 0 /* TODO: REVEALS BUG TO BE FIXED - SEE JIRA HDFFV-10645 */
test_sohm_size_consistency_open_create();
-#endif /* Jira HDFFV-10645 */
+#endif /* Jira HDFFV-10645 */
test_sohm_attrs(); /* Tests shared messages in attributes */
test_sohm_size2(0); /* Tests the sizes of files with multiple SOHMs */
test_sohm_size2(1); /* Tests the sizes of files with multiple
diff --git a/test/ttsafe.c b/test/ttsafe.c
index 6862a0b..2b98ded 100644
--- a/test/ttsafe.c
+++ b/test/ttsafe.c
@@ -60,7 +60,7 @@ tts_is_threadsafe(void)
#ifdef H5_HAVE_THREADSAFE
is_ts = FALSE;
should_be = TRUE;
-#else /* H5_HAVE_THREADSAFE */
+#else /* H5_HAVE_THREADSAFE */
is_ts = TRUE;
should_be = FALSE;
#endif /* H5_HAVE_THREADSAFE */
diff --git a/test/use_disable_mdc_flushes.c b/test/use_disable_mdc_flushes.c
index a12ea31..1f0e3d4 100644
--- a/test/use_disable_mdc_flushes.c
+++ b/test/use_disable_mdc_flushes.c
@@ -33,9 +33,9 @@ const char *progname_g = "use_disable_mdc_flushes"; /* program name */
/* these two definitions must match each other */
#define UC_DATATYPE H5T_NATIVE_SHORT /* use case HDF5 data type */
-#define UC_CTYPE short /* use case C data type */
-#define UC_RANK 3 /* use case dataset rank */
-#define Chunksize_DFT 256 /* chunksize default */
+#define UC_CTYPE short /* use case C data type */
+#define UC_RANK 3 /* use case dataset rank */
+#define Chunksize_DFT 256 /* chunksize default */
#define Hgoto_error(val) \
{ \
ret_value = val; \
diff --git a/test/vds.c b/test/vds.c
index a14e9c3..4c5929e 100644
--- a/test/vds.c
+++ b/test/vds.c
@@ -907,7 +907,7 @@ test_api(test_api_config_t config, hid_t fapl, H5F_libver_t low)
TEST_ERROR
ex_dcpl = -1;
-#else /* VDS_POINT_SELECTIONS */
+#else /* VDS_POINT_SELECTIONS */
/*
* Test 3: Verify point selections fail
diff --git a/test/vfd.c b/test/vfd.c
index 6a109bb..da142b2 100644
--- a/test/vfd.c
+++ b/test/vfd.c
@@ -617,7 +617,7 @@ test_direct(void)
#ifndef H5_HAVE_DIRECT
SKIPPED();
return 0;
-#else /*H5_HAVE_DIRECT*/
+#else /*H5_HAVE_DIRECT*/
/* Set property list and file name for Direct driver. Set memory alignment boundary
* and file block size to 512 which is the minimum for Linux 2.6. */
@@ -2183,7 +2183,7 @@ test_ros3(void)
#ifndef H5_HAVE_ROS3_VFD
SKIPPED();
return 0;
-#else /* H5_HAVE_ROS3_VFD */
+#else /* H5_HAVE_ROS3_VFD */
/* Set property list and file name for ROS3 driver. */
if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)