summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@lbl.gov>2020-11-30 23:25:40 (GMT)
committerGitHub <noreply@github.com>2020-11-30 23:25:40 (GMT)
commitff04956a6cbdda015cb6c5239d7d6007976fd2a4 (patch)
tree7b99577556c6336d79f4beaca0df7c898b2dad08
parent71a42ab05e4c16f8d2915ddc131ef5892ddf9a24 (diff)
downloadhdf5-ff04956a6cbdda015cb6c5239d7d6007976fd2a4.zip
hdf5-ff04956a6cbdda015cb6c5239d7d6007976fd2a4.tar.gz
hdf5-ff04956a6cbdda015cb6c5239d7d6007976fd2a4.tar.bz2
Basic alignment with async branch (#115) (#137)
* Basic alignment with async branch - trivial changes to reduce clutter in overall diff. * Update minor error code to reflect change within library * Update the error output to match library
-rw-r--r--MANIFEST62
-rw-r--r--c++/src/H5PredType.h2
-rw-r--r--c++/test/tfilter.cpp2
-rw-r--r--doxygen/examples/H5Fclose.c17
-rw-r--r--doxygen/examples/H5Fcreate.c17
-rw-r--r--doxygen/examples/hello_hdf5.c15
-rw-r--r--examples/ph5example.c2
-rw-r--r--fortran/src/H5Pf.c2
-rw-r--r--java/src/jni/h5sImp.c4
-rw-r--r--src/H5.c1
-rw-r--r--src/H5AC.c18
-rw-r--r--src/H5ACmpio.c8
-rw-r--r--src/H5ACproxy_entry.c8
-rw-r--r--src/H5Adense.c2
-rw-r--r--src/H5Aint.c2
-rw-r--r--src/H5B2.c4
-rw-r--r--src/H5B2cache.c12
-rw-r--r--src/H5C.c53
-rw-r--r--src/H5CX.c28
-rw-r--r--src/H5Cdbg.c6
-rw-r--r--src/H5Cimage.c16
-rw-r--r--src/H5Clog.c3
-rw-r--r--src/H5Ctag.c2
-rw-r--r--src/H5D.c8
-rw-r--r--src/H5Dchunk.c6
-rw-r--r--src/H5Defl.c6
-rw-r--r--src/H5Dint.c13
-rw-r--r--src/H5Dmpio.c4
-rw-r--r--src/H5Dpublic.h4
-rw-r--r--src/H5Dvirtual.c4
-rw-r--r--src/H5E.c5
-rw-r--r--src/H5EAcache.c20
-rw-r--r--src/H5EAtest.c2
-rw-r--r--src/H5ESpublic.h4
-rw-r--r--src/H5Eint.c14
-rw-r--r--src/H5Epkg.h4
-rw-r--r--src/H5F.c58
-rw-r--r--src/H5FAcache.c12
-rw-r--r--src/H5FAtest.c2
-rw-r--r--src/H5FDcore.c14
-rw-r--r--src/H5FDdirect.c14
-rw-r--r--src/H5FDhdfs.c17
-rw-r--r--src/H5FDlog.c16
-rw-r--r--src/H5FDmirror.c24
-rw-r--r--src/H5FDmpio.c4
-rw-r--r--src/H5FDros3.c16
-rw-r--r--src/H5FDsec2.c8
-rw-r--r--src/H5FDspace.c2
-rw-r--r--src/H5FDsplitter.c32
-rw-r--r--src/H5FDstdio.c12
-rw-r--r--src/H5FS.c4
-rw-r--r--src/H5FScache.c11
-rw-r--r--src/H5Fint.c2
-rw-r--r--src/H5Fprivate.h7
-rw-r--r--src/H5Fpublic.h104
-rw-r--r--src/H5Fsuper.c14
-rw-r--r--src/H5G.c26
-rw-r--r--src/H5Gent.c5
-rw-r--r--src/H5Gname.c47
-rw-r--r--src/H5Gprivate.h4
-rw-r--r--src/H5Groot.c4
-rw-r--r--src/H5Gtraverse.c2
-rw-r--r--src/H5HFcache.c4
-rw-r--r--src/H5HG.c2
-rw-r--r--src/H5I.c26
-rw-r--r--src/H5Idbg.c12
-rw-r--r--src/H5Iint.c128
-rw-r--r--src/H5Ipkg.h12
-rw-r--r--src/H5Ipublic.h76
-rw-r--r--src/H5Itest.c2
-rw-r--r--src/H5Lpublic.h135
-rw-r--r--src/H5M.c3
-rw-r--r--src/H5MF.c10
-rw-r--r--src/H5MFsection.c4
-rw-r--r--src/H5MM.c27
-rw-r--r--src/H5MMprivate.h2
-rw-r--r--src/H5Ocache.c6
-rw-r--r--src/H5Odtype.c2
-rw-r--r--src/H5Oint.c40
-rw-r--r--src/H5Opkg.h4
-rw-r--r--src/H5Oprivate.h18
-rw-r--r--src/H5Oshared.h10
-rw-r--r--src/H5PLpath.c2
-rw-r--r--src/H5PLpublic.h16
-rw-r--r--src/H5Pdcpl.c2
-rw-r--r--src/H5Pfapl.c83
-rw-r--r--src/H5Pfcpl.c4
-rw-r--r--src/H5Pint.c4
-rw-r--r--src/H5Ppkg.h3
-rw-r--r--src/H5RS.c41
-rw-r--r--src/H5SM.c6
-rw-r--r--src/H5Shyper.c6
-rw-r--r--src/H5Spkg.h36
-rw-r--r--src/H5TS.c207
-rw-r--r--src/H5TSprivate.h48
-rw-r--r--src/H5Tpkg.h3
-rw-r--r--src/H5Tprivate.h2
-rw-r--r--src/H5Tpublic.h323
-rw-r--r--src/H5Tvlen.c4
-rw-r--r--src/H5UCprivate.h2
-rw-r--r--src/H5VLcallback.c2
-rw-r--r--src/H5VLint.c3
-rw-r--r--src/H5VLpassthru.c7
-rw-r--r--src/H5VLpublic.h26
-rw-r--r--src/H5VM.c21
-rw-r--r--src/H5Z.c16
-rw-r--r--src/H5Zpublic.h102
-rw-r--r--src/H5Zshuffle.c10
-rw-r--r--src/H5Ztrans.c2
-rw-r--r--src/H5detect.c2
-rw-r--r--src/H5make_libsettings.c2
-rw-r--r--src/H5module.h6
-rw-r--r--src/H5private.h76
-rw-r--r--src/H5public.h20
-rw-r--r--src/H5system.c2
-rw-r--r--src/H5timer.c6
-rw-r--r--src/H5trace.c4
-rw-r--r--test/Makefile.am3
-rw-r--r--test/accum.c2
-rw-r--r--test/btree2.c4
-rw-r--r--test/cache.c10
-rw-r--r--test/cache_common.h3
-rw-r--r--test/cache_tagging.c52
-rw-r--r--test/chunk_info.c2
-rw-r--r--test/cross_read.c8
-rw-r--r--test/dsets.c30
-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.c4
-rw-r--r--test/farray.c2
-rw-r--r--test/fheap.c55
-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.c18
-rw-r--r--test/mount.c2
-rw-r--r--test/objcopy.c6
-rw-r--r--test/s3comms.c6
-rw-r--r--test/set_extent.c4
-rw-r--r--test/stab.c2
-rw-r--r--test/swmr.c4
-rw-r--r--test/swmr_remove_reader.c2
-rw-r--r--test/swmr_sparse_writer.c2
-rw-r--r--test/tattr.c8
-rw-r--r--test/tfile.c2
-rw-r--r--test/th5o.c2
-rw-r--r--test/thread_id.c2
-rw-r--r--test/tmisc.c26
-rw-r--r--test/tsohm.c10
-rw-r--r--test/ttsafe.c2
-rw-r--r--test/ttsafe_error.c16
-rw-r--r--test/vds.c2
-rw-r--r--test/vfd.c4
-rw-r--r--test/vol.c3
-rw-r--r--testpar/t_2Gio.c12
-rw-r--r--testpar/t_cache.c4
-rw-r--r--testpar/t_cache_image.c20
-rw-r--r--testpar/t_dset.c6
-rw-r--r--testpar/t_filter_read.c2
-rw-r--r--testpar/t_shapesame.c2
-rw-r--r--tools/lib/h5diff.c10
-rw-r--r--tools/lib/h5diff_array.c2
-rw-r--r--tools/lib/h5tools_str.c4
-rw-r--r--tools/libtest/h5tools_test_utils.c6
-rw-r--r--tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst2
-rw-r--r--tools/test/perform/perf.c2
-rw-r--r--tools/test/perform/pio_standalone.h18
-rw-r--r--tools/test/perform/sio_standalone.h18
170 files changed, 1443 insertions, 1452 deletions
diff --git a/MANIFEST b/MANIFEST
index c78280d..87a7150 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -949,8 +949,6 @@
./src/H5Rpkg.h
./src/H5Rprivate.h
./src/H5Rpublic.h
-./src/H5UC.c
-./src/H5UCprivate.h
./src/H5RS.c
./src/H5RSprivate.h
./src/H5S.c
@@ -1010,6 +1008,8 @@
./src/H5Tvlen.c
./src/H5TS.c
./src/H5TSprivate.h
+./src/H5UC.c
+./src/H5UCprivate.h
./src/H5VL.c
./src/H5VLcallback.c
./src/H5VLconnector.h
@@ -1077,9 +1077,9 @@
./test/be_extlink2.h5
./test/big.c
./test/bittests.c
+./test/btree2.c
./test/btree_idx_1_6.h5
./test/btree_idx_1_8.h5
-./test/btree2.c
./test/cache.c
./test/cache_api.c
./test/cache_common.c
@@ -1098,13 +1098,15 @@
./test/direct_chunk.c
./test/dsets.c
./test/dt_arith.c
-./test/dtypes.c
./test/dtransform.c
+./test/dtypes.c
./test/earray.c
./test/efc.c
./test/enc_dec_plist.c
./test/enc_dec_plist_cross_platform.c
./test/enum.c
+./test/err_compat.c
+./test/error_test.c
./test/evict_on_close.c
./test/extend.c
./test/external.c
@@ -1112,25 +1114,21 @@
./test/external_common.h
./test/external_env.c
./test/external_fname.h
-./test/error_test.c
-./test/err_compat.c
-./test/filter_error.h5
-./test/links_env.c
./test/family_v16_00000.h5
./test/family_v16_00001.h5
./test/family_v16_00002.h5
./test/family_v16_00003.h5
./test/farray.c
./test/fheap.c
-./test/filespace_1_8.h5
-./test/filespace_1_6.h5
-./test/freespace.c
-./test/filenotclosed.c
./test/file_image.c
./test/file_image_core_test.h5
-./test/fill_old.h5
+./test/filenotclosed.c
+./test/filespace_1_6.h5
+./test/filespace_1_8.h5
./test/fill18.h5
+./test/fill_old.h5
./test/fillval.c
+./test/filter_error.h5
./test/filter_fail.c
./test/filter_plugin.c
./test/filter_plugin1_dsets.c
@@ -1140,13 +1138,12 @@
./test/flush1.c
./test/flush2.c
./test/flushrefresh.c
+./test/freespace.c
./test/fsm_aggr_nopersist.h5
./test/fsm_aggr_persist.h5
-./test/genall5.c
-./test/genall5.h
+./test/gen_bad_compound.c
./test/gen_bad_offset.c
./test/gen_bad_ohdr.c
-./test/gen_bad_compound.c
./test/gen_bogus.c
./test/gen_bounds.c
./test/gen_cross.c
@@ -1170,6 +1167,8 @@
./test/gen_sizes_lheap.c
./test/gen_specmetaread.c
./test/gen_udlinks.c
+./test/genall5.c
+./test/genall5.h
./test/getname.c
./test/gheap.c
./test/group_old.h5
@@ -1189,6 +1188,7 @@
./test/le_extlink2.h5
./test/lheap.c
./test/links.c
+./test/links_env.c
./test/memleak_H5O_dtype_decode_helper_H5Odtype.h5
./test/mergemsg.h5
./test/mf.c
@@ -1202,15 +1202,15 @@
./test/ntypes.c
./test/null_vol_connector.c
./test/null_vol_connector.h
-./test/ohdr.c
./test/objcopy.c
./test/objcopy_ref.c
+./test/ohdr.c
./test/page_buffer.c
./test/paged_nopersist.h5
./test/paged_persist.h5
+./test/pool.c
./test/reserved.c
./test/ros3.c
-./test/pool.c
./test/s3comms.c
./test/set_extent.c
# ====distribute this for now. See HDFFV-8236====
@@ -1236,30 +1236,30 @@
./test/tattr.c
./test/tbad_msg_count.h5
./test/tbogus.h5
-./test/tchecksum.c
./test/tcheck_version.c
+./test/tchecksum.c
./test/tconfig.c
./test/tcoords.c
+./test/test_filter_plugin.sh.in
+./test/test_filters_be.h5
+./test/test_filters_le.h5
+./test/test_usecases.sh.in
+./test/test_vol_plugin.sh.in
./test/testabort_fail.sh.in
./test/testcheck_version.sh.in
-./test/testexternal_env.sh.in
./test/testerror.sh.in
-./test/testlinks_env.sh.in
-./test/test_filter_plugin.sh.in
-./test/test_filters_le.h5
-./test/test_filters_be.h5
+./test/testexternal_env.sh.in
./test/testflushrefresh.sh.in
./test/testframe.c
./test/testhdf5.c
./test/testhdf5.h
./test/testlibinfo.sh.in
-./test/test_mirror.sh.in
-./test/test_usecases.sh.in
-./test/test_vol_plugin.sh.in
+./test/testlinks_env.sh.in
./test/testmeta.c
+./test/test_mirror.sh.in
./test/testswmr.sh.in
-./test/testvdsswmr.sh.in
./test/testvds_env.sh.in
+./test/testvdsswmr.sh.in
./test/tfile.c
./test/tgenprop.c
./test/th5o.c
@@ -1275,7 +1275,6 @@
./test/tmisc.c
./test/tmtimen.h5
./test/tmtimeo.h5
-./test/ttime.c
./test/trefer.c
./test/trefer_deprec.c
./test/trefer_shutdown.c
@@ -1284,7 +1283,7 @@
./test/tsizeslheap.h5
./test/tskiplist.c
./test/tsohm.c
-./test/ttst.c
+./test/ttime.c
./test/ttsafe.c
./test/ttsafe.h
./test/ttsafe_acreate.c
@@ -1292,18 +1291,19 @@
./test/ttsafe_cancel.c
./test/ttsafe_dcreate.c
./test/ttsafe_error.c
+./test/ttst.c
./test/tunicode.c
./test/tvlstr.c
./test/tvltypes.c
./test/twriteorder.c
./test/unlink.c
./test/unregister.c
+./test/use.h
./test/use_append_chunk.c
./test/use_append_chunk_mirror.c
./test/use_append_mchunks.c
./test/use_common.c
./test/use_disable_mdc_flushes.c
-./test/use.h
./test/vds.c
./test/vds_env.c
./test/vds_swmr.h
diff --git a/c++/src/H5PredType.h b/c++/src/H5PredType.h
index 2d1185b..02f0cbc 100644
--- a/c++/src/H5PredType.h
+++ b/c++/src/H5PredType.h
@@ -435,7 +435,7 @@ class H5_DLLCPP PredType : public AtomType {
#if H5_SIZEOF_UINT_FAST64_T != 0
static PredType *NATIVE_UINT_FAST64_;
#endif /* H5_SIZEOF_UINT_FAST64_T */
- // End of Declaration of pointers
+ // End of Declaration of pointers
#endif // DOXYGEN_SHOULD_SKIP_THIS
diff --git a/c++/test/tfilter.cpp b/c++/test/tfilter.cpp
index e7788e5..e583c3b 100644
--- a/c++/test/tfilter.cpp
+++ b/c++/test/tfilter.cpp
@@ -222,7 +222,7 @@ test_szip_filter(H5File &file1)
SKIPPED();
}
-#else /* H5_HAVE_FILTER_SZIP */
+#else /* H5_HAVE_FILTER_SZIP */
SUBTEST("szip filter");
SKIPPED();
H5std_string fname = file1.getFileName();
diff --git a/doxygen/examples/H5Fclose.c b/doxygen/examples/H5Fclose.c
index 6bb1d9f..525bad3 100644
--- a/doxygen/examples/H5Fclose.c
+++ b/doxygen/examples/H5Fclose.c
@@ -1,12 +1,13 @@
#include "hdf5.h"
-int main()
+int
+main()
{
- hid_t file;
- if ((file = H5Fcreate("foo.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
- return -1;
- /* Do something good with this file. */
- if(H5Fclose(file) < 0)
- return -2;
- return 0;
+ hid_t file;
+ if ((file = H5Fcreate("foo.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+ return -1;
+ /* Do something good with this file. */
+ if (H5Fclose(file) < 0)
+ return -2;
+ return 0;
}
diff --git a/doxygen/examples/H5Fcreate.c b/doxygen/examples/H5Fcreate.c
index 6bb1d9f..525bad3 100644
--- a/doxygen/examples/H5Fcreate.c
+++ b/doxygen/examples/H5Fcreate.c
@@ -1,12 +1,13 @@
#include "hdf5.h"
-int main()
+int
+main()
{
- hid_t file;
- if ((file = H5Fcreate("foo.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
- return -1;
- /* Do something good with this file. */
- if(H5Fclose(file) < 0)
- return -2;
- return 0;
+ hid_t file;
+ if ((file = H5Fcreate("foo.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+ return -1;
+ /* Do something good with this file. */
+ if (H5Fclose(file) < 0)
+ return -2;
+ return 0;
}
diff --git a/doxygen/examples/hello_hdf5.c b/doxygen/examples/hello_hdf5.c
index 56a179c..a37d39f 100644
--- a/doxygen/examples/hello_hdf5.c
+++ b/doxygen/examples/hello_hdf5.c
@@ -1,12 +1,13 @@
#include "hdf5.h"
-int main()
+int
+main()
{
- herr_t retval;
- unsigned majnum, minnum, relnum;
+ herr_t retval;
+ unsigned majnum, minnum, relnum;
- if ((retval = H5get_libversion(&majnum, &minnum, &relnum)) >= 0) {
- printf("Hello, HDF5 %d.%d.%d!\n", majnum, minnum, relnum);
- }
- return retval;
+ if ((retval = H5get_libversion(&majnum, &minnum, &relnum)) >= 0) {
+ printf("Hello, HDF5 %d.%d.%d!\n", majnum, minnum, relnum);
+ }
+ return retval;
}
diff --git a/examples/ph5example.c b/examples/ph5example.c
index 06c8919..da777a9 100644
--- a/examples/ph5example.c
+++ b/examples/ph5example.c
@@ -1087,7 +1087,7 @@ finish:
return (nerrors);
}
-#else /* H5_HAVE_PARALLEL */
+#else /* H5_HAVE_PARALLEL */
/* dummy program since H5_HAVE_PARALLE is not configured in */
int
main(void)
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index d52f537..441af59 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -505,7 +505,7 @@ h5pget_version_c(hid_t_f H5_ATTR_UNUSED *prp_id, int_f *boot, int_f *freelist, i
return 0;
}
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+#else /* H5_NO_DEPRECATED_SYMBOLS */
int_f
h5pget_version_c(hid_t_f *prp_id, int_f *boot, int_f *freelist, int_f *stab, int_f *shhdr)
/******/
diff --git a/java/src/jni/h5sImp.c b/java/src/jni/h5sImp.c
index f7b65d9..18255a8 100644
--- a/java/src/jni/h5sImp.c
+++ b/java/src/jni/h5sImp.c
@@ -1348,7 +1348,7 @@ done:
JNIEXPORT void JNICALL
Java_hdf_hdf5lib_H5_H5Sselect_1copy(JNIEnv *env, jclass clss, jlong dst_id, jlong src_id)
{
- herr_t status = FAIL;
+ herr_t status = FAIL;
UNUSED(clss);
@@ -1692,7 +1692,7 @@ done:
JNIEXPORT void JNICALL
Java_hdf_hdf5lib_H5_H5Smodify_1select(JNIEnv *env, jclass clss, jlong space1_id, jint op, jlong space2_id)
{
- herr_t status = FAIL;
+ herr_t status = FAIL;
UNUSED(clss);
diff --git a/src/H5.c b/src/H5.c
index 7efd4f0..d315950 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -372,6 +372,7 @@ H5_term_library(void)
*/
if (pending == 0) {
pending += DOWN(AC);
+ /* Shut down the "pluggable" interfaces, before the plugin framework */
pending += DOWN(Z);
pending += DOWN(FD);
pending += DOWN(VL);
diff --git a/src/H5AC.c b/src/H5AC.c
index 7e39f09..aab99e5 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -374,7 +374,7 @@ H5AC_create(const H5F_t *f, H5AC_cache_config_t *config_ptr, H5AC_cache_image_co
H5C_create(H5AC__DEFAULT_MAX_CACHE_SIZE, H5AC__DEFAULT_MIN_CLEAN_SIZE, (H5AC_NTYPES - 1),
H5AC_class_s, H5AC__check_if_write_permitted, TRUE, NULL, NULL);
#ifdef H5_HAVE_PARALLEL
- } /* end else */
+ } /* end else */
#endif /* H5_HAVE_PARALLEL */
if (NULL == f->shared->cache)
@@ -432,7 +432,7 @@ done:
aux_ptr = H5FL_FREE(H5AC_aux_t, aux_ptr);
} /* end if */
} /* end if */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
FUNC_LEAVE_NOAPI(ret_value)
} /* H5AC_create() */
@@ -466,7 +466,7 @@ H5AC_dest(H5F_t *f)
hbool_t curr_logging; /* TRUE if currently logging */
#ifdef H5_HAVE_PARALLEL
H5AC_aux_t *aux_ptr = NULL;
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
@@ -585,7 +585,7 @@ H5AC_dest(H5F_t *f)
aux_ptr->magic = 0;
aux_ptr = H5FL_FREE(H5AC_aux_t, aux_ptr);
- } /* end if */
+ } /* end if */
#endif /* H5_HAVE_PARALLEL */
done:
@@ -1104,7 +1104,7 @@ H5AC_move_entry(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t ne
{
#ifdef H5_HAVE_PARALLEL
H5AC_aux_t *aux_ptr;
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
@@ -1414,7 +1414,7 @@ H5AC_protect(H5F_t *f, const H5AC_class_t *type, haddr_t addr, void *udata, unsi
#ifdef H5_HAVE_PARALLEL
HDassert(0 == (flags &
(unsigned)(~(H5C__READ_ONLY_FLAG | H5C__FLUSH_LAST_FLAG | H5C__FLUSH_COLLECTIVELY_FLAG))));
-#else /* H5_HAVE_PARALLEL */
+#else /* H5_HAVE_PARALLEL */
HDassert(0 == (flags & (unsigned)(~(H5C__READ_ONLY_FLAG | H5C__FLUSH_LAST_FLAG))));
#endif /* H5_HAVE_PARALLEL */
@@ -1631,7 +1631,7 @@ H5AC_unprotect(H5F_t *f, const H5AC_class_t *type, haddr_t addr, void *thing, un
hbool_t deleted;
#ifdef H5_HAVE_PARALLEL
H5AC_aux_t *aux_ptr = NULL;
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
@@ -1674,7 +1674,7 @@ H5AC_unprotect(H5F_t *f, const H5AC_class_t *type, haddr_t addr, void *thing, un
if (deleted && aux_ptr->mpi_rank == 0)
if (H5AC__log_deleted_entry((H5AC_info_t *)thing) < 0)
HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "H5AC__log_deleted_entry() failed")
- } /* end if */
+ } /* end if */
#endif /* H5_HAVE_PARALLEL */
if (H5C_unprotect(f, addr, thing, flags) < 0)
@@ -2163,7 +2163,7 @@ H5AC__check_if_write_permitted(const H5F_t
write_permitted = aux_ptr->write_permitted;
else
write_permitted = FALSE;
- } /* end if */
+ } /* end if */
#endif /* H5_HAVE_PARALLEL */
*write_permitted_ptr = write_permitted;
diff --git a/src/H5ACmpio.c b/src/H5ACmpio.c
index a806b35..1d24441 100644
--- a/src/H5ACmpio.c
+++ b/src/H5ACmpio.c
@@ -760,7 +760,7 @@ H5AC__log_dirtied_entry(const H5AC_info_t *entry_ptr)
#if H5AC_DEBUG_DIRTY_BYTES_CREATION
aux_ptr->unprotect_dirty_bytes += entry_ptr->size;
aux_ptr->unprotect_dirty_bytes_updates += 1;
-#endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
+#endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
} /* end if */
/* the entry is dirty. If it exists on the cleaned entries list,
@@ -776,7 +776,7 @@ H5AC__log_dirtied_entry(const H5AC_info_t *entry_ptr)
aux_ptr->unprotect_dirty_bytes += entry_ptr->size;
aux_ptr->unprotect_dirty_bytes_updates += 1;
#endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
- } /* end else */
+ } /* end else */
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -1090,7 +1090,7 @@ H5AC__log_moved_entry(const H5F_t *f, haddr_t old_addr, haddr_t new_addr)
#if H5AC_DEBUG_DIRTY_BYTES_CREATION
aux_ptr->move_dirty_bytes += entry_size;
aux_ptr->move_dirty_bytes_updates += 1;
-#endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
+#endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
} /* end else */
/* insert / reinsert the entry in the dirty slist */
@@ -1104,7 +1104,7 @@ H5AC__log_moved_entry(const H5F_t *f, haddr_t old_addr, haddr_t new_addr)
aux_ptr->move_dirty_bytes += entry_size;
aux_ptr->move_dirty_bytes_updates += 1;
#endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
- } /* end else-if */
+ } /* end else-if */
done:
FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5ACproxy_entry.c b/src/H5ACproxy_entry.c
index 76e885f..4426189 100644
--- a/src/H5ACproxy_entry.c
+++ b/src/H5ACproxy_entry.c
@@ -521,7 +521,7 @@ H5AC__proxy_entry_notify(H5AC_notify_action_t action, void *_thing)
case H5AC_NOTIFY_ACTION_AFTER_LOAD:
#ifdef NDEBUG
HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, "invalid notify action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Invalid action?!?");
#endif /* NDEBUG */
break;
@@ -529,7 +529,7 @@ H5AC__proxy_entry_notify(H5AC_notify_action_t action, void *_thing)
case H5AC_NOTIFY_ACTION_AFTER_FLUSH:
#ifdef NDEBUG
HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, "invalid notify action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Invalid action?!?");
#endif /* NDEBUG */
break;
@@ -605,10 +605,10 @@ H5AC__proxy_entry_notify(H5AC_notify_action_t action, void *_thing)
default:
#ifdef NDEBUG
HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, "unknown notify action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
#endif /* NDEBUG */
- } /* end switch */
+ } /* end switch */
done:
FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Adense.c b/src/H5Adense.c
index 3d99202..1efe45d 100644
--- a/src/H5Adense.c
+++ b/src/H5Adense.c
@@ -1100,7 +1100,7 @@ H5A__dense_iterate_bt2_cb(const void *_record, void *_bt2_udata)
HDassert("unknown attribute op type" && 0);
#ifdef NDEBUG
HGOTO_ERROR(H5E_ATTR, H5E_UNSUPPORTED, FAIL, "unsupported attribute op type")
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */
/* Release the space allocated for the attribute */
diff --git a/src/H5Aint.c b/src/H5Aint.c
index addd70e..e940d05 100644
--- a/src/H5Aint.c
+++ b/src/H5Aint.c
@@ -1812,7 +1812,7 @@ H5A__attr_iterate_table(const H5A_attr_table_t *atable, hsize_t skip, hsize_t *l
HDassert("unknown attribute op type" && 0);
#ifdef NDEBUG
HGOTO_ERROR(H5E_ATTR, H5E_UNSUPPORTED, FAIL, "unsupported attribute op type")
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */
/* Increment the number of entries passed through */
diff --git a/src/H5B2.c b/src/H5B2.c
index 2b889dc..ecf95cb 100644
--- a/src/H5B2.c
+++ b/src/H5B2.c
@@ -1313,9 +1313,9 @@ H5B2_modify(H5B2_t *bt2, void *udata, H5B2_modify_t op, void *op_data)
*/
#ifdef OLD_WAY
HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "key not found in leaf node")
-#else /* OLD_WAY */
+#else /* OLD_WAY */
HGOTO_DONE(FAIL)
-#endif /* OLD_WAY */
+#endif /* OLD_WAY */
} /* end if */
else {
/* Make callback for current record */
diff --git a/src/H5B2cache.c b/src/H5B2cache.c
index ce91085..106542e 100644
--- a/src/H5B2cache.c
+++ b/src/H5B2cache.c
@@ -486,9 +486,9 @@ H5B2__cache_hdr_notify(H5AC_notify_action_t action, void *_thing)
default:
#ifdef NDEBUG
HGOTO_ERROR(H5E_BTREE, H5E_BADVALUE, FAIL, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */
} /* end if */
else
@@ -904,9 +904,9 @@ H5B2__cache_int_notify(H5AC_notify_action_t action, void *_thing)
default:
#ifdef NDEBUG
HGOTO_ERROR(H5E_BTREE, H5E_BADVALUE, FAIL, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */
} /* end if */
else
@@ -1283,9 +1283,9 @@ H5B2__cache_leaf_notify(H5AC_notify_action_t action, void *_thing)
default:
#ifdef NDEBUG
HGOTO_ERROR(H5E_BTREE, H5E_BADVALUE, FAIL, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */
} /* end if */
else
diff --git a/src/H5C.c b/src/H5C.c
index 04365cb..fa4a8bf 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -576,7 +576,7 @@ void
H5C_def_auto_resize_rpt_fcn(H5C_t *cache_ptr,
#ifndef NDEBUG
int32_t version,
-#else /* NDEBUG */
+#else /* NDEBUG */
int32_t H5_ATTR_UNUSED version,
#endif /* NDEBUG */
double hit_rate, enum H5C_resize_status status, size_t old_max_cache_size,
@@ -806,7 +806,7 @@ H5C_prep_for_file_close(H5F_t *f)
*/
if (H5C__serialize_cache(f) < 0)
HGOTO_ERROR(H5E_CACHE, H5E_CANTSERIALIZE, FAIL, "serialization of the cache failed")
- } /* end if */
+ } /* end if */
#endif /* H5_HAVE_PARALLEL */
done:
@@ -1310,7 +1310,7 @@ H5C_insert_entry(H5F_t *f, const H5C_class_t *type, haddr_t addr, void *thing, u
hbool_t flush_last;
#ifdef H5_HAVE_PARALLEL
hbool_t coll_access = FALSE; /* whether access to the cache entry is done collectively */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
hbool_t set_flush_marker;
hbool_t write_permitted = TRUE;
size_t empty_space;
@@ -2092,7 +2092,7 @@ H5C_resize_entry(void *thing, size_t new_size)
H5C__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr->coll_list_len), (cache_ptr->coll_list_size),
(entry_ptr->size), (new_size))
} /* end if */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
/* update statistics just before changing the entry size */
H5C__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE(cache_ptr, entry_ptr, new_size);
@@ -2228,7 +2228,7 @@ H5C_protect(H5F_t *f, const H5C_class_t *type, haddr_t addr, void *udata, unsign
hbool_t flush_last;
#ifdef H5_HAVE_PARALLEL
hbool_t coll_access = FALSE; /* whether access to the cache entry is done collectively */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
hbool_t write_permitted;
hbool_t was_loaded = FALSE; /* Whether the entry was loaded as a result of the protect */
size_t empty_space;
@@ -2348,7 +2348,7 @@ H5C_protect(H5F_t *f, const H5C_class_t *type, haddr_t addr, void *udata, unsign
H5C__MOVE_TO_TOP_IN_COLL_LIST(cache_ptr, entry_ptr, NULL)
} /* end else-if */
} /* end if */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
#if H5C_DO_TAGGING_SANITY_CHECKS
{
@@ -3359,7 +3359,7 @@ H5C_unprotect(H5F_t *f, haddr_t addr, void *thing, unsigned flags)
if (!dirtied)
clear_entry = TRUE;
} /* end if */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
if (!entry_ptr->is_protected)
@@ -3538,7 +3538,7 @@ H5C_unprotect(H5F_t *f, haddr_t addr, void *thing, unsigned flags)
HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "Can't clear entry")
} /* end else if */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
}
H5C__UPDATE_STATS_FOR_UNPROTECT(cache_ptr)
@@ -3899,7 +3899,7 @@ H5C_create_flush_dependency(void *parent_thing, void *child_thing)
for (u = 0; u < child_entry->flush_dep_nparents; u++)
HDassert(child_entry->flush_dep_parent[u] != parent_entry);
- } /* end block */
+ } /* end block */
#endif /* NDEBUG */
/* More sanity checks */
@@ -5823,7 +5823,7 @@ H5C__flush_invalidate_ring(H5F_t *f, H5C_ring_t ring, unsigned flags)
HDassert(cache_ptr->slist_size ==
(size_t)((ssize_t)initial_slist_size + cache_ptr->slist_size_increase));
} /* end if */
-#endif /* H5C_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
/* Since we are doing a destroy, we must make a pass through
* the hash table and try to flush - destroy all entries that
@@ -6321,7 +6321,7 @@ H5C__flush_ring(H5F_t *f, H5C_ring_t ring, unsigned flags)
HDassert(cache_ptr->slist_ring_len[ring] == 0);
HDassert(cache_ptr->slist_ring_size[ring] == 0);
- } /* end if */
+ } /* end if */
#endif /* H5C_DO_SANITY_CHECKS */
done:
@@ -6763,7 +6763,7 @@ H5C__flush_single_entry(H5F_t *f, H5C_cache_entry_t *entry_ptr, unsigned flags)
H5C__REMOVE_FROM_COLL_LIST(cache_ptr, entry_ptr, FAIL)
} /* end if */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
H5C__UPDATE_RP_FOR_EVICTION(cache_ptr, entry_ptr, FAIL)
@@ -7130,7 +7130,7 @@ H5C__load_entry(H5F_t *f,
int mpi_rank = 0; /* MPI process rank */
MPI_Comm comm = MPI_COMM_NULL; /* File MPI Communicator */
int mpi_code; /* MPI error code */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
void *ret_value = NULL; /* Return value */
FUNC_ENTER_STATIC
@@ -7176,7 +7176,7 @@ H5C__load_entry(H5F_t *f,
HGOTO_ERROR(H5E_FILE, H5E_CANTGET, NULL, "Can't get MPI rank")
if ((comm = H5F_mpi_get_comm(f)) == MPI_COMM_NULL)
HGOTO_ERROR(H5E_FILE, H5E_CANTGET, NULL, "get_comm request failed")
- } /* end if */
+ } /* end if */
#endif /* H5_HAVE_PARALLEL */
/* Get the on-disk entry image */
@@ -7206,7 +7206,7 @@ H5C__load_entry(H5F_t *f,
image = (uint8_t *)new_image;
#if H5C_DO_MEMORY_SANITY_CHECKS
H5MM_memcpy(image + len, H5C_IMAGE_SANITY_VALUE, H5C_IMAGE_EXTRA_SPACE);
-#endif /* H5C_DO_MEMORY_SANITY_CHECKS */
+#endif /* H5C_DO_MEMORY_SANITY_CHECKS */
} /* end if */
#ifdef H5_HAVE_PARALLEL
@@ -7227,7 +7227,7 @@ H5C__load_entry(H5F_t *f,
if (MPI_SUCCESS != (mpi_code = MPI_Bcast(image, buf_size, MPI_BYTE, 0, comm)))
HMPI_GOTO_ERROR(NULL, "MPI_Bcast failed", mpi_code)
} /* end if */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
/* If the entry could be read speculatively and the length is still
* changing, check for updating the actual size
@@ -7275,9 +7275,9 @@ H5C__load_entry(H5F_t *f,
(mpi_code = MPI_Bcast(image + len, buf_size, MPI_BYTE, 0, comm)))
HMPI_GOTO_ERROR(NULL, "MPI_Bcast failed", mpi_code)
} /* end if */
-#endif /* H5_HAVE_PARALLEL */
- } /* end if */
- } /* end if (actual_len != len) */
+#endif /* H5_HAVE_PARALLEL */
+ } /* end if */
+ } /* end if (actual_len != len) */
else {
/* The length has stabilized */
len_changed = FALSE;
@@ -7306,8 +7306,7 @@ H5C__load_entry(H5F_t *f,
/* Check for too many tries */
if (tries == 0)
- HGOTO_ERROR(H5E_CACHE, H5E_READERROR, NULL,
- "incorrect metadata checksum after all read attempts")
+ HGOTO_ERROR(H5E_CACHE, H5E_READERROR, NULL, "incorrect metadata checksum after all read attempts")
/* Calculate and track the # of retries */
retries = max_tries - tries;
@@ -8534,7 +8533,7 @@ H5C__serialize_cache(H5F_t *f)
scan_ptr = scan_ptr->il_next;
} /* end while */
} /* end block */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
/* set cache_ptr->serialization_in_progress to TRUE, and back
* to FALSE at the end of the function. Must maintain this flag
@@ -8600,7 +8599,7 @@ H5C__serialize_cache(H5F_t *f)
scan_ptr = scan_ptr->il_next;
} /* end while */
} /* end block */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
done:
cache_ptr->serialization_in_progress = FALSE;
@@ -8777,7 +8776,7 @@ H5C__serialize_ring(H5F_t *f, H5C_ring_t ring)
#ifndef NDEBUG
/* Increment serialization counter (to detect multiple serializations) */
entry_ptr->serialization_count++;
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end if */
} /* end if */
@@ -8846,7 +8845,7 @@ H5C__serialize_ring(H5F_t *f, H5C_ring_t ring)
#ifndef NDEBUG
/* Increment serialization counter (to detect multiple serializations) */
entry_ptr->serialization_count++;
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end if */
} /* end if */
else {
@@ -8911,7 +8910,7 @@ H5C__serialize_single_entry(H5F_t *f, H5C_t *cache_ptr, H5C_cache_entry_t *entry
H5MM_memcpy(((uint8_t *)entry_ptr->image_ptr) + image_size, H5C_IMAGE_SANITY_VALUE,
H5C_IMAGE_EXTRA_SPACE);
#endif /* H5C_DO_MEMORY_SANITY_CHECKS */
- } /* end if */
+ } /* end if */
/* Generate image for entry */
if (H5C__generate_image(f, cache_ptr, entry_ptr) < 0)
@@ -9218,7 +9217,7 @@ H5C_remove_entry(void *_entry)
if (entry->coll_access) {
entry->coll_access = FALSE;
H5C__REMOVE_FROM_COLL_LIST(cache, entry, FAIL)
- } /* end if */
+ } /* end if */
#endif /* H5_HAVE_PARALLEL */
H5C__UPDATE_RP_FOR_EVICTION(cache, entry, FAIL)
diff --git a/src/H5CX.c b/src/H5CX.c
index d276b94..62a7283 100644
--- a/src/H5CX.c
+++ b/src/H5CX.c
@@ -213,7 +213,7 @@ typedef struct H5CX_t {
MPI_Datatype ftype; /* MPI datatype for file, when using collective I/O */
hbool_t mpi_file_flushing; /* Whether an MPI-opened file is being flushed */
hbool_t rank0_bcast; /* Whether a dataset meets read-with-rank0-and-bcast requirements */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
/* Cached DXPL properties */
size_t max_temp_buf; /* Maximum temporary buffer size */
@@ -241,8 +241,8 @@ typedef struct H5CX_t {
hbool_t mpio_chunk_opt_num_valid; /* Whether collective chunk threshold is valid */
unsigned mpio_chunk_opt_ratio; /* Collective chunk ratio (H5D_XFER_MPIO_CHUNK_OPT_RATIO_NAME) */
hbool_t mpio_chunk_opt_ratio_valid; /* Whether collective chunk ratio is valid */
-#endif /* H5_HAVE_PARALLEL */
- H5Z_EDC_t err_detect; /* Error detection info (H5D_XFER_EDC_NAME) */
+#endif /* H5_HAVE_PARALLEL */
+ H5Z_EDC_t err_detect; /* Error detection info (H5D_XFER_EDC_NAME) */
hbool_t err_detect_valid; /* Whether error detection info is valid */
H5Z_cb_t filter_cb; /* Filter callback function (H5D_XFER_FILTER_CB_NAME) */
hbool_t filter_cb_valid; /* Whether filter callback function is valid */
@@ -298,8 +298,8 @@ typedef struct H5CX_t {
(H5D_XFER_COLL_CHUNK_MULTI_RATIO_IND_NAME) */
hbool_t
mpio_coll_rank0_bcast_set; /* Whether instrumented "collective chunk multi ratio ind" value is set */
-#endif /* H5_HAVE_INSTRUMENTED_LIBRARY */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_INSTRUMENTED_LIBRARY */
+#endif /* H5_HAVE_PARALLEL */
/* Cached LCPL properties */
H5T_cset_t encoding; /* Link name character encoding */
@@ -373,7 +373,7 @@ typedef struct H5CX_dxpl_cache_t {
mpio_chunk_opt_mode; /* Collective chunk option (H5D_XFER_MPIO_CHUNK_OPT_HARD_NAME) */
unsigned mpio_chunk_opt_num; /* Collective chunk thrreshold (H5D_XFER_MPIO_CHUNK_OPT_NUM_NAME) */
unsigned mpio_chunk_opt_ratio; /* Collective chunk ratio (H5D_XFER_MPIO_CHUNK_OPT_RATIO_NAME) */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
H5Z_EDC_t err_detect; /* Error detection info (H5D_XFER_EDC_NAME) */
H5Z_cb_t filter_cb; /* Filter callback function (H5D_XFER_FILTER_CB_NAME) */
H5Z_data_xform_t * data_transform; /* Data transform info (H5D_XFER_XFORM_NAME) */
@@ -437,7 +437,7 @@ hbool_t H5_PKG_INIT_VAR = FALSE;
#ifndef H5_HAVE_THREADSAFE
static H5CX_node_t *H5CX_head_g = NULL; /* Pointer to head of context stack */
-#endif /* H5_HAVE_THREADSAFE */
+#endif /* H5_HAVE_THREADSAFE */
/* Define a "default" dataset transfer property list cache structure to use for default DXPLs */
static H5CX_dxpl_cache_t H5CX_def_dxpl_cache;
@@ -932,9 +932,11 @@ H5CX_retrieve_state(H5CX_state_t **api_state)
/* Keep a reference to the current VOL wrapping context */
(*api_state)->vol_wrap_ctx = (*head)->ctx.vol_wrap_ctx;
- if (NULL != (*api_state)->vol_wrap_ctx)
+ if (NULL != (*api_state)->vol_wrap_ctx) {
+ HDassert((*head)->ctx.vol_wrap_ctx_valid);
if (H5VL_inc_vol_wrapper((*api_state)->vol_wrap_ctx) < 0)
HGOTO_ERROR(H5E_CONTEXT, H5E_CANTINC, FAIL, "can't increment refcount on VOL wrapping context")
+ } /* end if */
/* Keep a copy of the VOL connector property, if there is one */
if ((*head)->ctx.vol_connector_prop_valid && (*head)->ctx.vol_connector_prop.connector_id > 0) {
@@ -1023,6 +1025,8 @@ H5CX_restore_state(const H5CX_state_t *api_state)
/* Restore the VOL wrapper context */
(*head)->ctx.vol_wrap_ctx = api_state->vol_wrap_ctx;
+ if (NULL != (*head)->ctx.vol_wrap_ctx)
+ (*head)->ctx.vol_wrap_ctx_valid = TRUE;
/* Restore the VOL connector info */
if (api_state->vol_connector_prop.connector_id) {
@@ -1377,8 +1381,8 @@ H5CX_set_apl(hid_t *acspl_id, const H5P_libclass_t *libclass,
if (H5P_USER_TRUE == md_coll_read)
is_collective = TRUE;
} /* end if */
-#endif /* H5_HAVE_PARALLEL */
- } /* end else */
+#endif /* H5_HAVE_PARALLEL */
+ } /* end else */
#ifdef H5_HAVE_PARALLEL
/* Check for collective operation */
@@ -1404,7 +1408,7 @@ H5CX_set_apl(hid_t *acspl_id, const H5P_libclass_t *libclass,
MPI_Barrier(mpi_comm);
} /* end if */
} /* end if */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -1465,7 +1469,7 @@ H5CX_set_loc(hid_t
done:
FUNC_LEAVE_NOAPI(ret_value)
-#else /* H5_HAVE_PARALLEL */
+#else /* H5_HAVE_PARALLEL */
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(SUCCEED)
diff --git a/src/H5Cdbg.c b/src/H5Cdbg.c
index a8917ea..3cd6e6c 100644
--- a/src/H5Cdbg.c
+++ b/src/H5Cdbg.c
@@ -434,7 +434,7 @@ H5C_stats(H5C_t *cache_ptr, const char *cache_name,
double average_entries_skipped_per_calls_to_msic = 0.0f;
double average_dirty_pf_entries_skipped_per_call_to_msic = 0.0f;
double average_entries_scanned_per_calls_to_msic = 0.0f;
-#endif /* H5C_COLLECT_CACHE_STATS */
+#endif /* H5C_COLLECT_CACHE_STATS */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
@@ -489,7 +489,7 @@ H5C_stats(H5C_t *cache_ptr, const char *cache_name,
if (aggregate_max_pins < cache_ptr->max_pins[i])
aggregate_max_pins = cache_ptr->max_pins[i];
#endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
- } /* end for */
+ } /* end for */
if ((total_hits > 0) || (total_misses > 0))
hit_rate = (double)100.0f * ((double)(total_hits)) / ((double)(total_hits + total_misses));
@@ -738,7 +738,7 @@ H5C_stats__reset(H5C_t *cache_ptr)
#else /* NDEBUG */
#if H5C_COLLECT_CACHE_STATS
H5C_stats__reset(H5C_t *cache_ptr)
-#else /* H5C_COLLECT_CACHE_STATS */
+#else /* H5C_COLLECT_CACHE_STATS */
H5C_stats__reset(H5C_t H5_ATTR_UNUSED *cache_ptr)
#endif /* H5C_COLLECT_CACHE_STATS */
#endif /* NDEBUG */
diff --git a/src/H5Cimage.c b/src/H5Cimage.c
index b3f6c12..3135969 100644
--- a/src/H5Cimage.c
+++ b/src/H5Cimage.c
@@ -361,7 +361,7 @@ H5C__construct_cache_image_buffer(H5F_t *f, H5C_t *cache_ptr)
fake_cache_ptr->image_entries = (H5C_image_entry_t *)H5MM_xfree(fake_cache_ptr->image_entries);
fake_cache_ptr = (H5C_t *)H5MM_xfree(fake_cache_ptr);
- } /* end block */
+ } /* end block */
#endif /* NDEBUG */
done:
@@ -908,7 +908,7 @@ done:
herr_t
#if H5C_COLLECT_CACHE_STATS
H5C_image_stats(H5C_t *cache_ptr, hbool_t print_header)
-#else /* H5C_COLLECT_CACHE_STATS */
+#else /* H5C_COLLECT_CACHE_STATS */
H5C_image_stats(H5C_t *cache_ptr, hbool_t H5_ATTR_UNUSED print_header)
#endif /* H5C_COLLECT_CACHE_STATS */
{
@@ -918,7 +918,7 @@ H5C_image_stats(H5C_t *cache_ptr, hbool_t H5_ATTR_UNUSED print_header)
int64_t total_misses = 0;
double hit_rate;
double prefetch_use_rate;
-#endif /* H5C_COLLECT_CACHE_STATS */
+#endif /* H5C_COLLECT_CACHE_STATS */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
@@ -1024,7 +1024,7 @@ H5C__read_cache_image(H5F_t *f, H5C_t *cache_ptr)
HMPI_GOTO_ERROR(FAIL, "can't receive cache image MPI_Bcast", mpi_result)
} /* end else-if */
} /* end block */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -1607,7 +1607,7 @@ H5C_set_cache_image_config(const H5F_t *f, H5C_t *cache_ptr, H5C_cache_image_ctl
HDassert(!(cache_ptr->image_ctl.generate_image));
} /* end else */
#ifdef H5_HAVE_PARALLEL
- } /* end else */
+ } /* end else */
#endif /* H5_HAVE_PARALLEL */
done:
@@ -2088,7 +2088,7 @@ H5C__destroy_pf_entry_child_flush_deps(H5C_t *cache_ptr, H5C_cache_entry_t *pf_e
u++;
} /* end while */
HDassert(found);
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end if */
} /* end if */
@@ -3172,7 +3172,7 @@ H5C__reconstruct_cache_contents(H5F_t *f, H5C_t *cache_ptr)
* we add code to store and restore adaptive resize status.
*/
HDassert(lru_rank_holes <= H5C__MAX_EPOCH_MARKERS);
- } /* end block */
+ } /* end block */
#endif /* NDEBUG */
/* Check to see if the cache is oversize, and evict entries as
@@ -3480,7 +3480,7 @@ H5C__write_cache_image(H5F_t *f, const H5C_t *cache_ptr)
#ifdef H5_HAVE_PARALLEL
} /* end if */
} /* end block */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
done:
FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Clog.c b/src/H5Clog.c
index d48b7b1..3e7d6da 100644
--- a/src/H5Clog.c
+++ b/src/H5Clog.c
@@ -269,8 +269,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5C_get_logging_status(const H5C_t *cache, /*OUT*/ hbool_t *is_enabled,
- /*OUT*/ hbool_t *is_currently_logging)
+H5C_get_logging_status(const H5C_t *cache, hbool_t *is_enabled, hbool_t *is_currently_logging)
{
FUNC_ENTER_NOAPI_NOERR
diff --git a/src/H5Ctag.c b/src/H5Ctag.c
index a3eb173..47df69f 100644
--- a/src/H5Ctag.c
+++ b/src/H5Ctag.c
@@ -883,7 +883,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5C_get_tag(const void *thing, haddr_t *tag /*OUT*/)
+H5C_get_tag(const void *thing, haddr_t *tag)
{
const H5C_cache_entry_t *entry = (const H5C_cache_entry_t *)thing; /* Pointer to cache entry */
diff --git a/src/H5D.c b/src/H5D.c
index b8b6f65..6b4e2f3 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -138,7 +138,7 @@ H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t
/* Create the dataset */
if (NULL == (dset = H5VL_dataset_create(vol_obj, &loc_params, name, lcpl_id, type_id, space_id, dcpl_id,
dapl_id, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL)))
- HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, H5I_INVALID_HID, "unable to create dataset")
+ HGOTO_ERROR(H5E_DATASET, H5E_CANTCREATE, H5I_INVALID_HID, "unable to create dataset")
/* Get an ID for the dataset */
if ((ret_value = H5VL_register(H5I_DATASET, dset, vol_obj->connector, TRUE)) < 0)
@@ -187,9 +187,9 @@ done:
hid_t
H5Dcreate_anon(hid_t loc_id, hid_t type_id, hid_t space_id, hid_t dcpl_id, hid_t dapl_id)
{
- void * dset = NULL; /* dset object from VOL connector */
- H5VL_object_t * vol_obj = NULL; /* object of loc_id */
- H5VL_loc_params_t loc_params;
+ void * dset = NULL; /* dset object from VOL connector */
+ H5VL_object_t * vol_obj = NULL; /* Object for loc_id */
+ H5VL_loc_params_t loc_params; /* Location parameters for object access */
hid_t ret_value = H5I_INVALID_HID; /* Return value */
FUNC_ENTER_API(H5I_INVALID_HID)
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index 60bf57e..081206e 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -2429,7 +2429,7 @@ H5D__chunk_cacheable(const H5D_io_info_t *io_info, haddr_t caddr, hbool_t write_
#ifdef H5_HAVE_PARALLEL
} /* end else */
#endif /* H5_HAVE_PARALLEL */
- } /* end else */
+ } /* end else */
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -4427,7 +4427,7 @@ H5D__chunk_allocate(const H5D_io_info_t *io_info, hbool_t full_overwrite, hsize_
/* Check for the chunk expanding too much to encode in a 32-bit value */
if (orig_chunk_size > ((size_t)0xffffffff))
HGOTO_ERROR(H5E_DATASET, H5E_BADRANGE, FAIL, "chunk too large for 32-bit length")
-#endif /* H5_SIZEOF_SIZE_T > 4 */
+#endif /* H5_SIZEOF_SIZE_T > 4 */
} /* end if */
} /* end if */
@@ -4629,7 +4629,7 @@ H5D__chunk_allocate(const H5D_io_info_t *io_info, hbool_t full_overwrite, hsize_
#ifdef H5_HAVE_PARALLEL
} /* end else */
#endif /* H5_HAVE_PARALLEL */
- } /* end if */
+ } /* end if */
/* Insert the chunk record into the index */
if (need_insert && ops->insert)
diff --git a/src/H5Defl.c b/src/H5Defl.c
index 1ab677a..77ea056 100644
--- a/src/H5Defl.c
+++ b/src/H5Defl.c
@@ -272,8 +272,8 @@ H5D__efl_read(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t size
tempto_read = MIN((size_t)(efl->slot[u].size - skip), (hsize_t)size);
H5_CHECK_OVERFLOW(tempto_read, hsize_t, size_t);
to_read = (size_t)tempto_read;
-#else /* NDEBUG */
- to_read = MIN((size_t)(efl->slot[u].size - skip), (hsize_t)size);
+#else /* NDEBUG */
+ to_read = MIN((size_t)(efl->slot[u].size - skip), (hsize_t)size);
#endif /* NDEBUG */
if ((n = HDread(fd, buf, to_read)) < 0)
HGOTO_ERROR(H5E_EFL, H5E_READERROR, FAIL, "read error in external raw data file")
@@ -364,7 +364,7 @@ H5D__efl_write(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t siz
tempto_write = MIN(efl->slot[u].size - skip, (hsize_t)size);
H5_CHECK_OVERFLOW(tempto_write, hsize_t, size_t);
to_write = (size_t)tempto_write;
-#else /* NDEBUG */
+#else /* NDEBUG */
to_write = MIN((size_t)(efl->slot[u].size - skip), size);
#endif /* NDEBUG */
if ((size_t)HDwrite(fd, buf, to_write) != to_write)
diff --git a/src/H5Dint.c b/src/H5Dint.c
index 7a2b93b..813a7c7 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -344,11 +344,6 @@ H5D__close_cb(H5VL_object_t *dset_vol_obj)
HGOTO_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to close dataset");
done:
- /* XXX: (MSC) Weird thing for datasets and filters:
- * Always decrement the ref count on the VOL for datasets, since
- * the ID is removed even if the close fails.
- */
-
/* Free the VOL object */
if (H5VL_free_object(dset_vol_obj) < 0)
HGOTO_ERROR(H5E_DATASET, H5E_CANTDEC, FAIL, "unable to free VOL object");
@@ -2006,7 +2001,7 @@ H5D_close(H5D_t *dataset)
HDassert("not implemented yet" && 0);
#ifdef NDEBUG
HGOTO_ERROR(H5E_IO, H5E_UNSUPPORTED, FAIL, "unsupported storage layout")
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */ /*lint !e788 All appropriate cases are covered */
/* Destroy any cached layout information for the dataset */
@@ -2170,7 +2165,7 @@ H5D_mult_refresh_close(hid_t dset_id)
HDassert("not implemented yet" && 0);
#ifdef NDEBUG
HGOTO_ERROR(H5E_IO, H5E_UNSUPPORTED, FAIL, "unsupported storage layout")
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */ /*lint !e788 All appropriate cases are covered */
/* Destroy any cached layout information for the dataset */
@@ -2380,7 +2375,7 @@ H5D__alloc_storage(const H5D_io_info_t *io_info, H5D_time_alloc_t time_alloc, hb
HDassert("not implemented yet" && 0);
#ifdef NDEBUG
HGOTO_ERROR(H5E_IO, H5E_UNSUPPORTED, FAIL, "unsupported storage layout")
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */ /*lint !e788 All appropriate cases are covered */
/* Check if we need to initialize the space */
@@ -2502,7 +2497,7 @@ H5D__init_storage(const H5D_io_info_t *io_info, hbool_t full_overwrite, hsize_t
HDassert("not implemented yet" && 0);
#ifdef NDEBUG
HGOTO_ERROR(H5E_IO, H5E_UNSUPPORTED, FAIL, "unsupported storage layout")
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */ /*lint !e788 All appropriate cases are covered */
done:
diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c
index df7c829..4bca0cb 100644
--- a/src/H5Dmpio.c
+++ b/src/H5Dmpio.c
@@ -424,7 +424,7 @@ H5D__mpio_opt_possible(const H5D_io_info_t *io_info, const H5S_t *file_space, co
#ifdef H5_HAVE_INSTRUMENTED_LIBRARY
H5CX_test_set_mpio_coll_rank0_bcast(TRUE);
#endif /* H5_HAVE_INSTRUMENTED_LIBRARY */
- } /* end if */
+ } /* end if */
/* Set the return value, based on the global cause */
ret_value = global_cause[0] > 0 ? FALSE : TRUE;
@@ -843,7 +843,7 @@ H5D__chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_inf
else
temp_not_link_io = TRUE;
#endif /* H5_HAVE_INSTRUMENTED_LIBRARY */
- } /* end else */
+ } /* end else */
#ifdef H5_HAVE_INSTRUMENTED_LIBRARY
{
diff --git a/src/H5Dpublic.h b/src/H5Dpublic.h
index 6a85a95..4e40d27 100644
--- a/src/H5Dpublic.h
+++ b/src/H5Dpublic.h
@@ -131,7 +131,6 @@ H5_DLL hid_t H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t s
hid_t dcpl_id, hid_t dapl_id);
H5_DLL hid_t H5Dcreate_anon(hid_t file_id, hid_t type_id, hid_t space_id, hid_t plist_id, hid_t dapl_id);
H5_DLL hid_t H5Dopen2(hid_t file_id, const char *name, hid_t dapl_id);
-H5_DLL herr_t H5Dclose(hid_t dset_id);
H5_DLL hid_t H5Dget_space(hid_t dset_id);
H5_DLL herr_t H5Dget_space_status(hid_t dset_id, H5D_space_status_t *allocation);
H5_DLL hid_t H5Dget_type(hid_t dset_id);
@@ -163,9 +162,10 @@ H5_DLL herr_t H5Dscatter(H5D_scatter_func_t op, void *op_data, hid_t type_id, h
void *dst_buf);
H5_DLL herr_t H5Dgather(hid_t src_space_id, const void *src_buf, hid_t type_id, size_t dst_buf_size,
void *dst_buf, H5D_gather_func_t op, void *op_data);
-H5_DLL herr_t H5Ddebug(hid_t dset_id);
+H5_DLL herr_t H5Dclose(hid_t dset_id);
/* Internal API routines */
+H5_DLL herr_t H5Ddebug(hid_t dset_id);
H5_DLL herr_t H5Dformat_convert(hid_t dset_id);
H5_DLL herr_t H5Dget_chunk_index_type(hid_t did, H5D_chunk_index_t *idx_type);
diff --git a/src/H5Dvirtual.c b/src/H5Dvirtual.c
index 2588d1c..f61522f 100644
--- a/src/H5Dvirtual.c
+++ b/src/H5Dvirtual.c
@@ -2821,8 +2821,8 @@ H5D__virtual_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsiz
HDassert((tot_nelmts + (hsize_t)select_nelmts) >= nelmts);
} /* end block */
#endif /* NDEBUG */
- } /* end if */
- } /* end if */
+ } /* end if */
+ } /* end if */
done:
/* Cleanup I/O operation */
diff --git a/src/H5E.c b/src/H5E.c
index 731d263..7be3d34 100644
--- a/src/H5E.c
+++ b/src/H5E.c
@@ -306,14 +306,14 @@ H5E__set_default_auto(H5E_t *stk)
#ifndef H5_NO_DEPRECATED_SYMBOLS
#ifdef H5_USE_16_API_DEFAULT
stk->auto_op.vers = 1;
-#else /* H5_USE_16_API */
+#else /* H5_USE_16_API */
stk->auto_op.vers = 2;
#endif /* H5_USE_16_API_DEFAULT */
stk->auto_op.func1 = stk->auto_op.func1_default = (H5E_auto1_t)H5Eprint1;
stk->auto_op.func2 = stk->auto_op.func2_default = (H5E_auto2_t)H5Eprint2;
stk->auto_op.is_default = TRUE;
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+#else /* H5_NO_DEPRECATED_SYMBOLS */
stk->auto_op.func2 = (H5E_auto2_t)H5Eprint2;
#endif /* H5_NO_DEPRECATED_SYMBOLS */
@@ -1318,6 +1318,7 @@ done:
*
*-------------------------------------------------------------------------
*/
+H5_ATTR_FORMAT(printf, 8, 9)
herr_t
H5Epush2(hid_t err_stack, const char *file, const char *func, unsigned line, hid_t cls_id, hid_t maj_id,
hid_t min_id, const char *fmt, ...)
diff --git a/src/H5EAcache.c b/src/H5EAcache.c
index 6316ded..a41c25c 100644
--- a/src/H5EAcache.c
+++ b/src/H5EAcache.c
@@ -555,9 +555,9 @@ BEGIN_FUNC(STATIC, ERR, herr_t, SUCCEED, FAIL,
default:
#ifdef NDEBUG
H5E_THROW(H5E_BADVALUE, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */
} /* end if */
else
@@ -939,10 +939,10 @@ BEGIN_FUNC(STATIC, ERR, herr_t, SUCCEED, FAIL,
default:
#ifdef NDEBUG
H5E_THROW(H5E_BADVALUE, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
#endif /* NDEBUG */
- } /* end switch */
+ } /* end switch */
CATCH
@@ -1346,10 +1346,10 @@ BEGIN_FUNC(STATIC, ERR, herr_t, SUCCEED, FAIL,
default:
#ifdef NDEBUG
H5E_THROW(H5E_BADVALUE, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
#endif /* NDEBUG */
- } /* end switch */
+ } /* end switch */
CATCH
@@ -1750,10 +1750,10 @@ BEGIN_FUNC(STATIC, ERR, herr_t, SUCCEED, FAIL,
default:
#ifdef NDEBUG
H5E_THROW(H5E_BADVALUE, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
#endif /* NDEBUG */
- } /* end switch */
+ } /* end switch */
CATCH
@@ -2125,10 +2125,10 @@ BEGIN_FUNC(STATIC, ERR, herr_t, SUCCEED, FAIL,
default:
#ifdef NDEBUG
H5E_THROW(H5E_BADVALUE, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
#endif /* NDEBUG */
- } /* end switch */
+ } /* end switch */
CATCH
diff --git a/src/H5EAtest.c b/src/H5EAtest.c
index 0a85729..bbd436e 100644
--- a/src/H5EAtest.c
+++ b/src/H5EAtest.c
@@ -262,7 +262,7 @@ BEGIN_FUNC(STATIC, NOERR, herr_t, SUCCEED, -,
/* Local variables */
#ifndef NDEBUG
H5EA__test_ctx_t *ctx = (H5EA__test_ctx_t *)_ctx; /* Callback context to destroy */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
uint64_t * elmt = (uint64_t *)_elmt; /* Convenience pointer to native elements */
const uint8_t *raw = (const uint8_t *)_raw; /* Convenience pointer to raw elements */
diff --git a/src/H5ESpublic.h b/src/H5ESpublic.h
index 63f2379..dad929e 100644
--- a/src/H5ESpublic.h
+++ b/src/H5ESpublic.h
@@ -10,6 +10,10 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/*
+ * This file contains public declarations for the H5ES (event set) module.
+ */
+
#ifndef _H5ESpublic_H
#define _H5ESpublic_H
diff --git a/src/H5Eint.c b/src/H5Eint.c
index c743ddb..2580fa4 100644
--- a/src/H5Eint.c
+++ b/src/H5Eint.c
@@ -440,10 +440,10 @@ H5E__print(const H5E_t *estack, FILE *stream, hbool_t bk_compatible)
walk_op.u.func1 = H5E__walk1_cb;
if (H5E__walk(estack, H5E_WALK_DOWNWARD, &walk_op, (void *)&eprint) < 0)
HGOTO_ERROR(H5E_ERROR, H5E_CANTLIST, FAIL, "can't walk error stack")
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+#else /* H5_NO_DEPRECATED_SYMBOLS */
HDassert(0 && "version 1 error stack print without deprecated symbols!");
#endif /* H5_NO_DEPRECATED_SYMBOLS */
- } /* end if */
+ } /* end if */
else {
walk_op.vers = 2;
walk_op.u.func2 = H5E__walk2_cb;
@@ -539,10 +539,10 @@ H5E__walk(const H5E_t *estack, H5E_direction_t direction, const H5E_walk_op_t *o
if (ret_value < 0)
HERROR(H5E_ERROR, H5E_CANTLIST, "can't walk error stack");
} /* end if */
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+#else /* H5_NO_DEPRECATED_SYMBOLS */
HDassert(0 && "version 1 error stack walk without deprecated symbols!");
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
- } /* end if */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
+ } /* end if */
else {
HDassert(op->vers == 2);
if (op->u.func2) {
@@ -939,7 +939,7 @@ H5E_dump_api_stack(hbool_t is_api)
#ifdef H5_NO_DEPRECATED_SYMBOLS
if (estack->auto_op.func2)
(void)((estack->auto_op.func2)(H5E_DEFAULT, estack->auto_data));
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+#else /* H5_NO_DEPRECATED_SYMBOLS */
if (estack->auto_op.vers == 1) {
if (estack->auto_op.func1)
(void)((estack->auto_op.func1)(estack->auto_data));
@@ -949,7 +949,7 @@ H5E_dump_api_stack(hbool_t is_api)
(void)((estack->auto_op.func2)(H5E_DEFAULT, estack->auto_data));
} /* end else */
#endif /* H5_NO_DEPRECATED_SYMBOLS */
- } /* end if */
+ } /* end if */
done:
FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Epkg.h b/src/H5Epkg.h
index a1db885..fe5e127 100644
--- a/src/H5Epkg.h
+++ b/src/H5Epkg.h
@@ -73,7 +73,7 @@ typedef struct {
H5E_auto1_t func1_default; /* The saved library's default function - old style. */
H5E_auto2_t func2_default; /* The saved library's default function - new style. */
} H5E_auto_op_t;
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+#else /* H5_NO_DEPRECATED_SYMBOLS */
typedef struct {
H5E_auto2_t func2; /* Only the new style callback function is available. */
} H5E_auto_op_t;
@@ -85,7 +85,7 @@ typedef struct {
union {
#ifndef H5_NO_DEPRECATED_SYMBOLS
H5E_walk1_t func1; /* Old-style callback, NO error stack param. */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
H5E_walk2_t func2; /* New-style callback, with error stack param. */
} u;
} H5E_walk_op_t;
diff --git a/src/H5F.c b/src/H5F.c
index 3c6df2b..d9d8308 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -21,20 +21,13 @@
/* Headers */
/***********/
#include "H5private.h" /* Generic Functions */
-#include "H5Aprivate.h" /* Attributes */
#include "H5ACprivate.h" /* Metadata cache */
#include "H5CXprivate.h" /* API Contexts */
-#include "H5Dprivate.h" /* Datasets */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fpkg.h" /* File access */
-#include "H5FDprivate.h" /* File drivers */
#include "H5FLprivate.h" /* Free lists */
-#include "H5Gprivate.h" /* Groups */
#include "H5Iprivate.h" /* IDs */
-#include "H5MFprivate.h" /* File memory management */
-#include "H5MMprivate.h" /* Memory management */
#include "H5Pprivate.h" /* Property lists */
-#include "H5Tprivate.h" /* Datatypes */
#include "H5VLprivate.h" /* Virtual Object Layer */
#include "H5VLnative_private.h" /* Native VOL connector */
@@ -479,7 +472,7 @@ done:
hid_t
H5Fcreate(const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id)
{
- H5F_t * new_file = NULL; /* File struct for new file */
+ void * new_file = NULL; /* File struct for new file */
H5P_genplist_t * plist; /* Property list pointer */
H5VL_connector_prop_t connector_prop; /* Property for VOL connector ID & info */
H5VL_object_t * vol_obj = NULL; /* VOL object for file */
@@ -534,8 +527,8 @@ H5Fcreate(const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id)
flags |= H5F_ACC_RDWR | H5F_ACC_CREAT;
/* Create a new file or truncate an existing file through the VOL */
- if (NULL == (new_file = (H5F_t *)H5VL_file_create(&connector_prop, filename, flags, fcpl_id, fapl_id,
- H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL)))
+ if (NULL == (new_file = H5VL_file_create(&connector_prop, filename, flags, fcpl_id, fapl_id,
+ H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL)))
HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, H5I_INVALID_HID, "unable to create file")
/* Get an atom for the file */
@@ -579,7 +572,7 @@ done:
hid_t
H5Fopen(const char *filename, unsigned flags, hid_t fapl_id)
{
- H5F_t * new_file = NULL; /* File struct for new file */
+ void * new_file = NULL; /* File struct for new file */
H5P_genplist_t * plist; /* Property list pointer */
H5VL_connector_prop_t connector_prop; /* Property for VOL connector ID & info */
H5VL_object_t * vol_obj = NULL; /* VOL object for file */
@@ -622,8 +615,8 @@ H5Fopen(const char *filename, unsigned flags, hid_t fapl_id)
HGOTO_ERROR(H5E_FILE, H5E_CANTSET, H5I_INVALID_HID, "can't set VOL connector info in API context")
/* Open the file through the VOL layer */
- if (NULL == (new_file = (H5F_t *)H5VL_file_open(&connector_prop, filename, flags, fapl_id,
- H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL)))
+ if (NULL == (new_file = H5VL_file_open(&connector_prop, filename, flags, fapl_id,
+ H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL)))
HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, H5I_INVALID_HID, "unable to open file")
/* Get an ID for the file */
@@ -674,7 +667,7 @@ H5Fflush(hid_t object_id, H5F_scope_t scope)
H5I_DATASET != obj_type && H5I_ATTR != obj_type)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file or file object")
- /* get the file object */
+ /* Get the file object */
if (NULL == (vol_obj = H5VL_vol_object(object_id)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid object identifier")
@@ -704,7 +697,7 @@ done:
herr_t
H5Fclose(hid_t file_id)
{
- herr_t ret_value = SUCCEED;
+ herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", file_id);
@@ -715,7 +708,7 @@ H5Fclose(hid_t file_id)
/* Close the file */
if (H5I_dec_app_ref(file_id) < 0)
- HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "closing file ID failed")
+ HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "decrementing file ID failed")
done:
FUNC_LEAVE_API(ret_value)
@@ -833,7 +826,6 @@ H5Freopen(hid_t file_id)
HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, H5I_INVALID_HID, "unable to make file 'post open' callback")
done:
- /* XXX (VOL MERGE): If registration fails, file will not be closed */
FUNC_LEAVE_API(ret_value)
} /* end H5Freopen() */
@@ -1013,13 +1005,13 @@ done:
*-------------------------------------------------------------------------
*/
ssize_t
-H5Fget_file_image(hid_t file_id, void *buf_ptr, size_t buf_len)
+H5Fget_file_image(hid_t file_id, void *buf, size_t buf_len)
{
H5VL_object_t *vol_obj; /* File object for file ID */
ssize_t ret_value; /* Return value */
FUNC_ENTER_API((-1))
- H5TRACE3("Zs", "i*xz", file_id, buf_ptr, buf_len);
+ H5TRACE3("Zs", "i*xz", file_id, buf, buf_len);
/* Check args */
if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(file_id, H5I_FILE)))
@@ -1027,7 +1019,7 @@ H5Fget_file_image(hid_t file_id, void *buf_ptr, size_t buf_len)
/* Get the file image */
if (H5VL_file_optional(vol_obj, H5VL_NATIVE_FILE_GET_FILE_IMAGE, H5P_DATASET_XFER_DEFAULT,
- H5_REQUEST_NULL, buf_ptr, &ret_value, buf_len) < 0)
+ H5_REQUEST_NULL, buf, &ret_value, buf_len) < 0)
HGOTO_ERROR(H5E_FILE, H5E_CANTGET, (-1), "unable to get file image")
done:
@@ -1049,17 +1041,17 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5Fget_mdc_config(hid_t file_id, H5AC_cache_config_t *config_ptr)
+H5Fget_mdc_config(hid_t file_id, H5AC_cache_config_t *config)
{
H5VL_object_t *vol_obj = NULL;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(FAIL)
- H5TRACE2("e", "i*x", file_id, config_ptr);
+ H5TRACE2("e", "i*x", file_id, config);
/* Check args */
- if ((NULL == config_ptr) || (config_ptr->version != H5AC__CURR_CACHE_CONFIG_VERSION))
- HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Bad config_ptr")
+ if ((NULL == config) || (config->version != H5AC__CURR_CACHE_CONFIG_VERSION))
+ HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Bad configptr")
/* Get the file object */
if (NULL == (vol_obj = (H5VL_object_t *)H5I_object(file_id)))
@@ -1067,7 +1059,7 @@ H5Fget_mdc_config(hid_t file_id, H5AC_cache_config_t *config_ptr)
/* Get the metadata cache configuration */
if (H5VL_file_optional(vol_obj, H5VL_NATIVE_FILE_GET_MDC_CONF, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL,
- config_ptr) < 0)
+ config) < 0)
HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "unable to get metadata cache configuration")
done:
@@ -1120,23 +1112,23 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5Fget_mdc_hit_rate(hid_t file_id, double *hit_rate_ptr)
+H5Fget_mdc_hit_rate(hid_t file_id, double *hit_rate)
{
H5VL_object_t *vol_obj;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(FAIL)
- H5TRACE2("e", "i*d", file_id, hit_rate_ptr);
+ H5TRACE2("e", "i*d", file_id, hit_rate);
/* Check args */
- if (NULL == hit_rate_ptr)
+ if (NULL == hit_rate)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL hit rate pointer")
if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(file_id, H5I_FILE)))
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID")
/* Get the current hit rate */
if (H5VL_file_optional(vol_obj, H5VL_NATIVE_FILE_GET_MDC_HR, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL,
- hit_rate_ptr) < 0)
+ hit_rate) < 0)
HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "unable to get MDC hit rate")
done:
@@ -1157,14 +1149,14 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5Fget_mdc_size(hid_t file_id, size_t *max_size_ptr, size_t *min_clean_size_ptr, size_t *cur_size_ptr,
- int *cur_num_entries_ptr)
+H5Fget_mdc_size(hid_t file_id, size_t *max_size, size_t *min_clean_size, size_t *cur_size,
+ int *cur_num_entries)
{
H5VL_object_t *vol_obj;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(FAIL)
- H5TRACE5("e", "i*z*z*z*Is", file_id, max_size_ptr, min_clean_size_ptr, cur_size_ptr, cur_num_entries_ptr);
+ H5TRACE5("e", "i*z*z*z*Is", file_id, max_size, min_clean_size, cur_size, cur_num_entries);
/* Check args */
if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(file_id, H5I_FILE)))
@@ -1172,7 +1164,7 @@ H5Fget_mdc_size(hid_t file_id, size_t *max_size_ptr, size_t *min_clean_size_ptr,
/* Get the size data */
if (H5VL_file_optional(vol_obj, H5VL_NATIVE_FILE_GET_MDC_SIZE, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL,
- max_size_ptr, min_clean_size_ptr, cur_size_ptr, cur_num_entries_ptr) < 0)
+ max_size, min_clean_size, cur_size, cur_num_entries) < 0)
HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "unable to get MDC size")
done:
diff --git a/src/H5FAcache.c b/src/H5FAcache.c
index 3772399..b9c2f93 100644
--- a/src/H5FAcache.c
+++ b/src/H5FAcache.c
@@ -478,9 +478,9 @@ BEGIN_FUNC(STATIC, ERR, herr_t, SUCCEED, FAIL,
default:
#ifdef NDEBUG
H5E_THROW(H5E_BADVALUE, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */
} /* end if */
else
@@ -862,9 +862,9 @@ BEGIN_FUNC(STATIC, ERR, herr_t, SUCCEED, FAIL,
default:
#ifdef NDEBUG
H5E_THROW(H5E_BADVALUE, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */
} /* end if */
@@ -1205,10 +1205,10 @@ BEGIN_FUNC(STATIC, ERR, herr_t, SUCCEED, FAIL,
default:
#ifdef NDEBUG
H5E_THROW(H5E_BADVALUE, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
#endif /* NDEBUG */
- } /* end switch */
+ } /* end switch */
CATCH
diff --git a/src/H5FAtest.c b/src/H5FAtest.c
index 4da7d6f..350530a 100644
--- a/src/H5FAtest.c
+++ b/src/H5FAtest.c
@@ -241,7 +241,7 @@ BEGIN_FUNC(STATIC, NOERR, herr_t, SUCCEED, -,
/* Local variables */
#ifndef NDEBUG
H5FA__test_ctx_t *ctx = (H5FA__test_ctx_t *)_ctx; /* Callback context to destroy */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
uint64_t * elmt = (uint64_t *)_elmt; /* Convenience pointer to native elements */
const uint8_t *raw = (const uint8_t *)_raw; /* Convenience pointer to raw elements */
diff --git a/src/H5FDcore.c b/src/H5FDcore.c
index 61f46c7..512dc1e 100644
--- a/src/H5FDcore.c
+++ b/src/H5FDcore.c
@@ -88,7 +88,7 @@ typedef struct H5FD_core_t {
DWORD dwVolumeSerialNumber;
HANDLE hFile; /* Native windows file handle */
-#endif /* H5_HAVE_WIN32_API */
+#endif /* H5_HAVE_WIN32_API */
hbool_t dirty; /* changes not saved? */
H5FD_file_image_callbacks_t fi_callbacks; /* file image callbacks */
H5SL_t * dirty_list; /* dirty parts of the file */
@@ -831,11 +831,11 @@ H5FD__core_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
file->nFileIndexHigh = fileinfo.nFileIndexHigh;
file->nFileIndexLow = fileinfo.nFileIndexLow;
file->dwVolumeSerialNumber = fileinfo.dwVolumeSerialNumber;
-#else /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
file->device = sb.st_dev;
file->inode = sb.st_ino;
#endif /* H5_HAVE_WIN32_API */
- } /* end if */
+ } /* end if */
/* If an existing file is opened, load the whole file into memory. */
if (!(H5F_ACC_CREAT & flags)) {
@@ -1071,7 +1071,7 @@ H5FD__core_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
HGOTO_DONE(-1)
if (f1->device > f2->device)
HGOTO_DONE(1)
-#else /* H5_DEV_T_IS_SCALAR */
+#else /* H5_DEV_T_IS_SCALAR */
/* If dev_t isn't a scalar value on this system, just use memcmp to
* determine if the values are the same or not. The actual return value
* shouldn't really matter...
@@ -1088,7 +1088,7 @@ H5FD__core_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
HGOTO_DONE(1)
#endif /*H5_HAVE_WIN32_API*/
- } /* end if */
+ } /* end if */
else {
if (NULL == f1->name && NULL == f2->name) {
if (f1 < f2)
@@ -1335,7 +1335,7 @@ H5FD__core_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU
temp_nbytes = file->eof - addr;
H5_CHECK_OVERFLOW(temp_nbytes, hsize_t, size_t);
nbytes = MIN(size, (size_t)temp_nbytes);
-#else /* NDEBUG */
+#else /* NDEBUG */
nbytes = MIN(size, (size_t)(file->eof - addr));
#endif /* NDEBUG */
@@ -1607,7 +1607,7 @@ H5FD__core_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t closing
bError = SetEndOfFile(file->hFile);
if (0 == bError)
HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
-#else /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
if (-1 == HDftruncate(file->fd, (HDoff_t)new_eof))
HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
#endif /* H5_HAVE_WIN32_API */
diff --git a/src/H5FDdirect.c b/src/H5FDdirect.c
index 4c2d251..eb2590f 100644
--- a/src/H5FDdirect.c
+++ b/src/H5FDdirect.c
@@ -383,8 +383,8 @@ done:
static void *
H5FD__direct_fapl_get(H5FD_t *_file)
{
- H5FD_direct_t *file = (H5FD_direct_t *)_file;
- void *ret_value = NULL; /* Return value */
+ H5FD_direct_t *file = (H5FD_direct_t *)_file;
+ void * ret_value = NULL; /* Return value */
FUNC_ENTER_STATIC_NOERR
@@ -443,9 +443,9 @@ H5FD__direct_fapl_copy(const void *_old_fa)
static H5FD_t *
H5FD__direct_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
{
- int o_flags;
- int fd = (-1);
- H5FD_direct_t * file = NULL;
+ int o_flags;
+ int fd = (-1);
+ H5FD_direct_t * file = NULL;
const H5FD_direct_fapl_t *fa;
#ifdef H5_HAVE_WIN32_API
HFILE filehandle;
@@ -660,7 +660,7 @@ H5FD__direct_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
HGOTO_DONE(-1)
if (f1->device > f2->device)
HGOTO_DONE(1)
-#else /* H5_DEV_T_IS_SCALAR */
+#else /* H5_DEV_T_IS_SCALAR */
/* If dev_t isn't a scalar value on this system, just use memcmp to
* determine if the values are the same or not. The actual return value
* shouldn't really matter...
@@ -1276,7 +1276,7 @@ H5FD__direct_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_AT
(void)SetFilePointer((HANDLE)filehandle, li.LowPart, &li.HighPart, FILE_BEGIN);
if (SetEndOfFile((HANDLE)filehandle) == 0)
HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
-#else /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
if (-1 == HDftruncate(file->fd, (HDoff_t)file->eoa))
HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
#endif /* H5_HAVE_WIN32_API */
diff --git a/src/H5FDhdfs.c b/src/H5FDhdfs.c
index 286a8e6..9369955 100644
--- a/src/H5FDhdfs.c
+++ b/src/H5FDhdfs.c
@@ -662,22 +662,21 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5Pget_fapl_hdfs(hid_t fapl_id, H5FD_hdfs_fapl_t *fa_out)
+H5Pget_fapl_hdfs(hid_t fapl_id, H5FD_hdfs_fapl_t *fa_dst)
{
- const H5FD_hdfs_fapl_t *fa = NULL;
+ const H5FD_hdfs_fapl_t *fa_src = NULL;
H5P_genplist_t * plist = NULL;
herr_t ret_value = SUCCEED;
FUNC_ENTER_API(FAIL)
- H5TRACE2("e", "i*x", fapl_id, fa_out);
+ H5TRACE2("e", "i*x", fapl_id, fa_dst);
#if HDFS_DEBUG
HDfprintf(stdout, "called %s.\n", FUNC);
#endif
- if (fa_out == NULL)
- HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "fa_out is NULL")
-
+ if (fa_dst == NULL)
+ HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "fa_dst ptr is NULL")
plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS);
if (plist == NULL)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access list")
@@ -685,12 +684,12 @@ H5Pget_fapl_hdfs(hid_t fapl_id, H5FD_hdfs_fapl_t *fa_out)
if (H5FD_HDFS != H5P_peek_driver(plist))
HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "incorrect VFL driver")
- fa = (const H5FD_hdfs_fapl_t *)H5P_peek_driver_info(plist);
- if (fa == NULL)
+ fa_src = (const H5FD_hdfs_fapl_t *)H5P_peek_driver_info(plist);
+ if (fa_src == NULL)
HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "bad VFL driver info")
/* Copy the hdfs fapl data out */
- H5MM_memcpy(fa_out, fa, sizeof(H5FD_hdfs_fapl_t));
+ H5MM_memcpy(fs_dst, fa_src, sizeof(H5FD_hdfs_fapl_t));
done:
FUNC_LEAVE_API(ret_value)
diff --git a/src/H5FDlog.c b/src/H5FDlog.c
index fc2cb12..99b0b8d 100644
--- a/src/H5FDlog.c
+++ b/src/H5FDlog.c
@@ -570,7 +570,7 @@ H5FD__log_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
file->nFileIndexHigh = fileinfo.nFileIndexHigh;
file->nFileIndexLow = fileinfo.nFileIndexLow;
file->dwVolumeSerialNumber = fileinfo.dwVolumeSerialNumber;
-#else /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
file->device = sb.st_dev;
file->inode = sb.st_ino;
#endif /* H5_HAVE_WIN32_API */
@@ -861,7 +861,7 @@ H5FD__log_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
HGOTO_DONE(-1)
if (f1->device > f2->device)
HGOTO_DONE(1)
-#else /* H5_DEV_T_IS_SCALAR */
+#else /* H5_DEV_T_IS_SCALAR */
/* If dev_t isn't a scalar value on this system, just use memcmp to
* determine if the values are the same or not. The actual return value
* shouldn't really matter...
@@ -1182,7 +1182,7 @@ H5FD__log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had
#ifndef H5_HAVE_PREADWRITE
H5_timer_t seek_timer; /* Timer for seek operation */
H5_timevals_t seek_times; /* Elapsed time for seek operation */
-#endif /* H5_HAVE_PREADWRITE */
+#endif /* H5_HAVE_PREADWRITE */
HDoff_t offset = (HDoff_t)addr;
herr_t ret_value = SUCCEED; /* Return value */
@@ -1250,7 +1250,7 @@ H5FD__log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had
HDfprintf(file->logfp, "\n");
} /* end if */
} /* end if */
-#endif /* H5_HAVE_PREADWRITE */
+#endif /* H5_HAVE_PREADWRITE */
/* Start timer for read operation */
if (file->fa.flags & H5FD_LOG_TIME_READ) {
@@ -1280,7 +1280,7 @@ H5FD__log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had
if (bytes_read > 0)
offset += bytes_read;
#else
- bytes_read = HDread(file->fd, buf, bytes_in);
+ bytes_read = HDread(file->fd, buf, bytes_in);
#endif /* H5_HAVE_PREADWRITE */
} while (-1 == bytes_read && EINTR == errno);
@@ -1396,7 +1396,7 @@ H5FD__log_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, ha
#ifndef H5_HAVE_PREADWRITE
H5_timer_t seek_timer; /* Timer for seek operation */
H5_timevals_t seek_times; /* Elapsed time for seek operation */
-#endif /* H5_HAVE_PREADWRITE */
+#endif /* H5_HAVE_PREADWRITE */
HDoff_t offset = (HDoff_t)addr;
herr_t ret_value = SUCCEED; /* Return value */
@@ -1472,7 +1472,7 @@ H5FD__log_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, ha
HDfprintf(file->logfp, "\n");
} /* end if */
} /* end if */
-#endif /* H5_HAVE_PREADWRITE */
+#endif /* H5_HAVE_PREADWRITE */
/* Start timer for write operation */
if (file->fa.flags & H5FD_LOG_TIME_WRITE) {
@@ -1648,7 +1648,7 @@ H5FD__log_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR_
if (0 == SetEndOfFile(file->hFile))
HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
}
-#else /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
/* Truncate/extend the file */
if (-1 == HDftruncate(file->fd, (HDoff_t)file->eoa))
HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
diff --git a/src/H5FDmirror.c b/src/H5FDmirror.c
index 7ea9609..c79ce85 100644
--- a/src/H5FDmirror.c
+++ b/src/H5FDmirror.c
@@ -126,7 +126,7 @@ typedef struct H5FD_mirror_t {
} while (0)
#else
#define LOG_XMIT_BYTES(label, buf, len) /* no-op */
-#endif /* MIRROR_DEBUG_XMIT_BYTE */
+#endif /* MIRROR_DEBUG_XMIT_BYTE */
#if MIRROR_DEBUG_OP_CALLS
#define LOG_OP_CALL(name) \
@@ -136,7 +136,7 @@ typedef struct H5FD_mirror_t {
} while (0)
#else
#define LOG_OP_CALL(name) /* no-op */
-#endif /* MIRROR_DEBUG_OP_CALLS */
+#endif /* MIRROR_DEBUG_OP_CALLS */
/* Prototypes */
static herr_t H5FD__mirror_term(void);
@@ -1266,25 +1266,25 @@ H5FD__mirror_fapl_free(void *_fa)
* Function: H5Pget_fapl_mirror
*
* Purpose: Get the configuration information for this fapl.
- * Data is memcopied into the fa_out pointer.
+ * Data is memcopied into the fa_dst pointer.
*
* Return: SUCCEED/FAIL
* -------------------------------------------------------------------------
*/
herr_t
-H5Pget_fapl_mirror(hid_t fapl_id, H5FD_mirror_fapl_t *fa_out)
+H5Pget_fapl_mirror(hid_t fapl_id, H5FD_mirror_fapl_t *fa_dst)
{
- const H5FD_mirror_fapl_t *fa = NULL;
+ const H5FD_mirror_fapl_t *fa_src = NULL;
H5P_genplist_t * plist = NULL;
herr_t ret_value = SUCCEED;
FUNC_ENTER_API(FAIL)
- H5TRACE2("e", "i*x", fapl_id, fa_out);
+ H5TRACE2("e", "i*x", fapl_id, fa_dst);
LOG_OP_CALL(FUNC);
- if (NULL == fa_out)
- HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "fa_out is NULL");
+ if (NULL == fa_dst)
+ HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "fa_dst is NULL");
plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS);
if (NULL == plist)
@@ -1292,13 +1292,13 @@ H5Pget_fapl_mirror(hid_t fapl_id, H5FD_mirror_fapl_t *fa_out)
if (H5P_peek_driver(plist) != H5FD_MIRROR)
HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "incorrect VFL driver");
- fa = (const H5FD_mirror_fapl_t *)H5P_peek_driver_info(plist);
- if (NULL == fa)
+ fa_src = (const H5FD_mirror_fapl_t *)H5P_peek_driver_info(plist);
+ if (NULL == fa_src)
HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "bad VFL driver info");
- HDassert(fa->magic == H5FD_MIRROR_FAPL_MAGIC); /* sanity check */
+ HDassert(fa_src->magic == H5FD_MIRROR_FAPL_MAGIC); /* sanity check */
- H5MM_memcpy(fa_out, fa, sizeof(H5FD_mirror_fapl_t));
+ H5MM_memcpy(fa_dst, fa_src, sizeof(H5FD_mirror_fapl_t));
done:
FUNC_LEAVE_API(ret_value);
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index c16e01e..a4e0baf 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -200,7 +200,7 @@ H5FD_mpio_init(void)
{
#ifdef H5FDmpio_DEBUG
static int H5FD_mpio_Debug_inited = 0;
-#endif /* H5FDmpio_DEBUG */
+#endif /* H5FDmpio_DEBUG */
const char *s; /* String for environment variables */
hid_t ret_value = H5I_INVALID_HID; /* Return value */
@@ -229,7 +229,7 @@ H5FD_mpio_init(void)
} /* end while */
} /* end if */
H5FD_mpio_Debug_inited++;
- } /* end if */
+ } /* end if */
#endif /* H5FDmpio_DEBUG */
/* Set return value */
diff --git a/src/H5FDros3.c b/src/H5FDros3.c
index a557f1d..06072b1 100644
--- a/src/H5FDros3.c
+++ b/src/H5FDros3.c
@@ -472,21 +472,21 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5Pget_fapl_ros3(hid_t fapl_id, H5FD_ros3_fapl_t *fa_out)
+H5Pget_fapl_ros3(hid_t fapl_id, H5FD_ros3_fapl_t *fa_dst)
{
- const H5FD_ros3_fapl_t *fa = NULL;
+ const H5FD_ros3_fapl_t *fa_src = NULL;
H5P_genplist_t * plist = NULL;
herr_t ret_value = SUCCEED;
FUNC_ENTER_API(FAIL)
- H5TRACE2("e", "i*x", fapl_id, fa_out);
+ H5TRACE2("e", "i*x", fapl_id, fa_dst);
#if ROS3_DEBUG
HDfprintf(stdout, "H5Pget_fapl_ros3() called.\n");
#endif
- if (fa_out == NULL)
- HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "fa_out is NULL")
+ if (fa_dst == NULL)
+ HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "fa_dst is NULL")
plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS);
if (plist == NULL)
@@ -495,12 +495,12 @@ H5Pget_fapl_ros3(hid_t fapl_id, H5FD_ros3_fapl_t *fa_out)
if (H5FD_ROS3 != H5P_peek_driver(plist))
HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "incorrect VFL driver")
- fa = (const H5FD_ros3_fapl_t *)H5P_peek_driver_info(plist);
- if (fa == NULL)
+ fa_src = (const H5FD_ros3_fapl_t *)H5P_peek_driver_info(plist);
+ if (fa_src == NULL)
HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "bad VFL driver info")
/* Copy the ros3 fapl data out */
- H5MM_memcpy(fa_out, fa, sizeof(H5FD_ros3_fapl_t));
+ H5MM_memcpy(fa_dst, fa_src, sizeof(H5FD_ros3_fapl_t));
done:
FUNC_LEAVE_API(ret_value)
diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c
index 7789d39..02323c6 100644
--- a/src/H5FDsec2.c
+++ b/src/H5FDsec2.c
@@ -377,7 +377,7 @@ H5FD__sec2_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
file->nFileIndexHigh = fileinfo.nFileIndexHigh;
file->nFileIndexLow = fileinfo.nFileIndexLow;
file->dwVolumeSerialNumber = fileinfo.dwVolumeSerialNumber;
-#else /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
file->device = sb.st_dev;
file->inode = sb.st_ino;
#endif /* H5_HAVE_WIN32_API */
@@ -507,7 +507,7 @@ H5FD__sec2_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
HGOTO_DONE(-1)
if (f1->device > f2->device)
HGOTO_DONE(1)
-#else /* H5_DEV_T_IS_SCALAR */
+#else /* H5_DEV_T_IS_SCALAR */
/* If dev_t isn't a scalar value on this system, just use memcmp to
* determine if the values are the same or not. The actual return value
* shouldn't really matter...
@@ -742,7 +742,7 @@ H5FD__sec2_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU
if (bytes_read > 0)
offset += bytes_read;
#else
- bytes_read = HDread(file->fd, buf, bytes_in);
+ bytes_read = HDread(file->fd, buf, bytes_in);
#endif /* H5_HAVE_PREADWRITE */
} while (-1 == bytes_read && EINTR == errno);
@@ -945,7 +945,7 @@ H5FD__sec2_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR
bError = SetEndOfFile(file->hFile);
if (0 == bError)
HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
-#else /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
if (-1 == HDftruncate(file->fd, (HDoff_t)file->eoa))
HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
#endif /* H5_HAVE_WIN32_API */
diff --git a/src/H5FDspace.c b/src/H5FDspace.c
index 38a96fb..98210a4 100644
--- a/src/H5FDspace.c
+++ b/src/H5FDspace.c
@@ -333,7 +333,7 @@ H5FD__free_real(H5FD_t *file, H5FD_mem_t type, haddr_t addr, hsize_t size)
HDfprintf(stderr, "%s: LEAKED MEMORY!!! type = %u, addr = %a, size = %Hu\n", FUNC, (unsigned)type,
addr, size);
#endif /* H5FD_ALLOC_DEBUG */
- } /* end else */
+ } /* end else */
done:
FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5FDsplitter.c b/src/H5FDsplitter.c
index 6ecafe0..4d6554c 100644
--- a/src/H5FDsplitter.c
+++ b/src/H5FDsplitter.c
@@ -94,7 +94,7 @@ typedef struct H5FD_splitter_t {
} while (0)
#else
#define H5FD_SPLITTER_LOG_CALL(name) /* no-op */
-#endif /* H5FD_SPLITTER_DEBUG_OP_CALLS */
+#endif /* H5FD_SPLITTER_DEBUG_OP_CALLS */
/* Private functions */
@@ -369,39 +369,39 @@ done:
* Function: H5Pget_fapl_splitter
*
* Purpose: Returns information about the splitter file access property
- * list through the structure config_out.
+ * list through the structure config.
*
- * Will fail if config_out is received without pre-set valid
+ * Will fail if config is received without pre-set valid
* magic and version information.
*
* Return: SUCCEED/FAIL
*-------------------------------------------------------------------------
*/
herr_t
-H5Pget_fapl_splitter(hid_t fapl_id, H5FD_splitter_vfd_config_t *config_out)
+H5Pget_fapl_splitter(hid_t fapl_id, H5FD_splitter_vfd_config_t *config)
{
const H5FD_splitter_fapl_t *fapl_ptr = NULL;
H5P_genplist_t * plist_ptr = NULL;
herr_t ret_value = SUCCEED;
FUNC_ENTER_API(FAIL)
- H5TRACE2("e", "i*Dr", fapl_id, config_out);
+ H5TRACE2("e", "i*Dr", fapl_id, config);
H5FD_SPLITTER_LOG_CALL(FUNC);
/* Check arguments */
if (TRUE != H5P_isa_class(fapl_id, H5P_FILE_ACCESS))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
- if (config_out == NULL)
- HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "config_out pointer is null")
- if (H5FD_SPLITTER_MAGIC != config_out->magic)
+ if (config == NULL)
+ HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "config pointer is null")
+ if (H5FD_SPLITTER_MAGIC != config->magic)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "info-out pointer invalid (magic number mismatch)")
- if (H5FD_CURR_SPLITTER_VFD_CONFIG_VERSION != config_out->version)
+ if (H5FD_CURR_SPLITTER_VFD_CONFIG_VERSION != config->version)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "info-out pointer invalid (version unsafe)")
/* Pre-set out FAPL IDs with intent to replace these values */
- config_out->rw_fapl_id = H5I_INVALID_HID;
- config_out->wo_fapl_id = H5I_INVALID_HID;
+ config->rw_fapl_id = H5I_INVALID_HID;
+ config->wo_fapl_id = H5I_INVALID_HID;
/* Check and get the splitter fapl */
if (NULL == (plist_ptr = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
@@ -411,14 +411,14 @@ H5Pget_fapl_splitter(hid_t fapl_id, H5FD_splitter_vfd_config_t *config_out)
if (NULL == (fapl_ptr = (const H5FD_splitter_fapl_t *)H5P_peek_driver_info(plist_ptr)))
HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "unable to get specific-driver info")
- HDstrncpy(config_out->wo_path, fapl_ptr->wo_path, H5FD_SPLITTER_PATH_MAX);
- HDstrncpy(config_out->log_file_path, fapl_ptr->log_file_path, H5FD_SPLITTER_PATH_MAX);
- config_out->ignore_wo_errs = fapl_ptr->ignore_wo_errs;
+ HDstrncpy(config->wo_path, fapl_ptr->wo_path, H5FD_SPLITTER_PATH_MAX);
+ HDstrncpy(config->log_file_path, fapl_ptr->log_file_path, H5FD_SPLITTER_PATH_MAX);
+ config->ignore_wo_errs = fapl_ptr->ignore_wo_errs;
/* Copy R/W and W/O FAPLs */
- if (H5FD__copy_plist(fapl_ptr->rw_fapl_id, &(config_out->rw_fapl_id)) < 0)
+ if (H5FD__copy_plist(fapl_ptr->rw_fapl_id, &(config->rw_fapl_id)) < 0)
HGOTO_ERROR(H5E_VFL, H5E_BADVALUE, FAIL, "can't copy R/W FAPL");
- if (H5FD__copy_plist(fapl_ptr->wo_fapl_id, &(config_out->wo_fapl_id)) < 0)
+ if (H5FD__copy_plist(fapl_ptr->wo_fapl_id, &(config->wo_fapl_id)) < 0)
HGOTO_ERROR(H5E_VFL, H5E_BADVALUE, FAIL, "can't copy W/O FAPL");
done:
diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c
index 4650c39..c66765a 100644
--- a/src/H5FDstdio.c
+++ b/src/H5FDstdio.c
@@ -115,7 +115,7 @@ typedef struct H5FD_stdio_t {
DWORD nFileIndexHigh;
DWORD dwVolumeSerialNumber;
- HANDLE hFile; /* Native windows file handle */
+ HANDLE hFile; /* Native windows file handle */
#endif /* H5_HAVE_WIN32_API */
} H5FD_stdio_t;
@@ -338,7 +338,7 @@ H5FD_stdio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
static const char *func = "H5FD_stdio_open"; /* Function Name for error reporting */
#ifdef H5_HAVE_WIN32_API
struct _BY_HANDLE_FILE_INFORMATION fileinfo;
-#else /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
struct stat sb;
#endif /* H5_HAVE_WIN32_API */
@@ -431,7 +431,7 @@ H5FD_stdio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
/* Get the file descriptor (needed for truncate and some Windows information) */
#ifdef H5_HAVE_WIN32_API
file->fd = _fileno(file->fp);
-#else /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
file->fd = fileno(file->fp);
#endif /* H5_HAVE_WIN32_API */
if (file->fd < 0) {
@@ -458,7 +458,7 @@ H5FD_stdio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
file->nFileIndexHigh = fileinfo.nFileIndexHigh;
file->nFileIndexLow = fileinfo.nFileIndexLow;
file->dwVolumeSerialNumber = fileinfo.dwVolumeSerialNumber;
-#else /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
if (fstat(file->fd, &sb) < 0) {
free(file);
fclose(f);
@@ -549,7 +549,7 @@ H5FD_stdio_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
return -1;
if (f1->device > f2->device)
return 1;
-#else /* H5_DEV_T_IS_SCALAR */
+#else /* H5_DEV_T_IS_SCALAR */
/* If dev_t isn't a scalar value on this system, just use memcmp to
* determine if the values are the same or not. The actual return value
* shouldn't really matter...
@@ -1075,7 +1075,7 @@ H5FD_stdio_truncate(H5FD_t *_file, hid_t /*UNUSED*/ dxpl_id, hbool_t /*UNUSED*/
if (0 == bError)
H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_SEEKERROR,
"unable to truncate/extend file properly", -1)
-#else /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
/* Reset seek offset to beginning of file, so that file isn't re-extended later */
rewind(file->fp);
diff --git a/src/H5FS.c b/src/H5FS.c
index 4a050a6..d75711c 100644
--- a/src/H5FS.c
+++ b/src/H5FS.c
@@ -362,7 +362,7 @@ H5FS_delete(H5F_t *f, haddr_t fs_addr)
#ifdef H5FS_DEBUG
HDfprintf(stderr, "%s: Done expunging free space section info from cache\n", FUNC);
-#endif /* H5FS_DEBUG */
+#endif /* H5FS_DEBUG */
} /* end if */
else {
#ifdef H5FS_DEBUG
@@ -513,7 +513,7 @@ H5FS_close(H5F_t *f, H5FS_t *fspace)
*/
#ifdef H5FS_DEBUG
HDfprintf(stderr, "%s: Section info can't 'go away', header will own it\n", FUNC);
-#endif /* H5FS_DEBUG */
+#endif /* H5FS_DEBUG */
} /* end if */
else {
#ifdef H5FS_DEBUG
diff --git a/src/H5FScache.c b/src/H5FScache.c
index bf91e22..fc61edd 100644
--- a/src/H5FScache.c
+++ b/src/H5FScache.c
@@ -820,10 +820,10 @@ H5FS__cache_hdr_notify(H5AC_notify_action_t action, void *_thing)
default:
#ifdef NDEBUG
HGOTO_ERROR(H5E_FSPACE, H5E_BADVALUE, FAIL, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
#endif /* NDEBUG */
- } /* end switch */
+ } /* end switch */
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -1004,8 +1004,7 @@ H5FS__cache_sinfo_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED l
/* Check for any serialized sections */
if (fspace->serial_sect_count > 0) {
hsize_t old_tot_sect_count; /* Total section count from header */
- hsize_t H5_ATTR_NDEBUG_UNUSED
- old_serial_sect_count; /* Total serializable section count from header */
+ hsize_t H5_ATTR_NDEBUG_UNUSED old_serial_sect_count; /* Total serializable section count from header */
hsize_t H5_ATTR_NDEBUG_UNUSED old_ghost_sect_count; /* Total ghost section count from header */
hsize_t H5_ATTR_NDEBUG_UNUSED old_tot_space; /* Total space managed from header */
unsigned sect_cnt_size; /* The size of the section size counts */
@@ -1358,9 +1357,9 @@ H5FS__cache_sinfo_notify(H5AC_notify_action_t action, void *_thing)
default:
#ifdef NDEBUG
HGOTO_ERROR(H5E_FSPACE, H5E_BADVALUE, FAIL, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end switch */
} /* end if */
diff --git a/src/H5Fint.c b/src/H5Fint.c
index 1d7a86f..f7ec1c2 100644
--- a/src/H5Fint.c
+++ b/src/H5Fint.c
@@ -2624,7 +2624,7 @@ H5F__build_actual_name(const H5F_t *f, const H5P_genplist_t *fapl, const char *n
#ifdef H5_HAVE_SYMLINK
/* This has to be declared here to avoid unfreed resources on errors */
char *realname = NULL; /* Fully resolved path name of file */
-#endif /* H5_HAVE_SYMLINK */
+#endif /* H5_HAVE_SYMLINK */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_STATIC
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index ba6d67f..f4268e5 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -31,7 +31,7 @@ typedef struct H5F_t H5F_t;
#include "H5MMprivate.h" /* Memory management */
#ifdef H5_HAVE_PARALLEL
#include "H5Pprivate.h" /* Property lists */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
#include "H5VMprivate.h" /* Vectors and arrays */
#include "H5VLprivate.h" /* Virtual Object Layer */
@@ -618,7 +618,7 @@ typedef struct H5F_t H5F_t;
#ifdef H5_HAVE_PARALLEL
#define H5F_ACS_MPI_PARAMS_COMM_NAME "mpi_params_comm" /* the MPI communicator */
#define H5F_ACS_MPI_PARAMS_INFO_NAME "mpi_params_info" /* the MPI info struct */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
/* ======================== File Mount properties ====================*/
#define H5F_MNT_SYM_LOCAL_NAME "local" /* Whether absolute symlinks local to file. */
@@ -648,8 +648,7 @@ typedef struct H5F_t H5F_t;
/* B-tree internal 'K' values */
#define HDF5_BTREE_SNODE_IK_DEF 16
-#define HDF5_BTREE_CHUNK_IK_DEF \
- 32 /* Note! this value is assumed \
+#define HDF5_BTREE_CHUNK_IK_DEF 32 /* Note! this value is assumed \
to be 32 for version 0 \
of the superblock and \
if it is changed, the code \
diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h
index 10cfbbe..04a72ba 100644
--- a/src/H5Fpublic.h
+++ b/src/H5Fpublic.h
@@ -116,10 +116,10 @@ typedef enum H5F_scope_t {
* How does file close behave?
*/
typedef enum H5F_close_degree_t {
- H5F_CLOSE_DEFAULT = 0, /**< Use the degree pre-defined by underlining VFL */
- H5F_CLOSE_WEAK = 1, /**< File closes only after all opened objects are closed */
- H5F_CLOSE_SEMI = 2, /**< If no opened objects, file is close; otherwise, file close fails */
- H5F_CLOSE_STRONG = 3 /**< If there are opened objects, close them first, then close file */
+ H5F_CLOSE_DEFAULT = 0, /**< Use the degree pre-defined by underlining VFL */
+ H5F_CLOSE_WEAK = 1, /**< File closes only after all opened objects are closed */
+ H5F_CLOSE_SEMI = 2, /**< If no opened objects, file is close; otherwise, file close fails */
+ H5F_CLOSE_STRONG = 3 /**< If there are opened objects, close them first, then close file */
} H5F_close_degree_t;
/**
@@ -200,9 +200,8 @@ typedef enum H5F_libver_t {
* File space handling strategy
*/
typedef enum H5F_fspace_strategy_t {
- H5F_FSPACE_STRATEGY_FSM_AGGR =
- 0, /**< Mechanisms: free-space managers, aggregators, and virtual file drivers
- This is the library default when not set */
+ H5F_FSPACE_STRATEGY_FSM_AGGR = 0, /**< Mechanisms: free-space managers, aggregators, and virtual file
+ drivers This is the library default when not set */
H5F_FSPACE_STRATEGY_PAGE =
1, /**< Mechanisms: free-space managers with embedded paged aggregation and virtual file drivers */
H5F_FSPACE_STRATEGY_AGGR = 2, /**< Mechanisms: aggregators and virtual file drivers */
@@ -272,7 +271,7 @@ extern "C" {
* \since 1.12.0
*
*/
-H5_DLL htri_t H5Fis_accessible(const char *container_name, hid_t fapl_id);
+H5_DLL htri_t H5Fis_accessible(const char *container_name, hid_t fapl_id);
/**
* \example H5Fcreate.c
* After creating an HDF5 file with H5Fcreate(), we close it with
@@ -355,7 +354,7 @@ H5_DLL htri_t H5Fis_accessible(const char *container_name, hid_t fapl_id);
* \see H5Fopen(), H5Fclose()
*
*/
-H5_DLL hid_t H5Fcreate(const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id);
+H5_DLL hid_t H5Fcreate(const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id);
/**
* \ingroup H5F
*
@@ -445,7 +444,7 @@ H5_DLL hid_t H5Fcreate(const char *filename, unsigned flags, hid_t fcpl_id, h
* \see H5Fclose()
*
*/
-H5_DLL hid_t H5Fopen(const char *filename, unsigned flags, hid_t fapl_id);
+H5_DLL hid_t H5Fopen(const char *filename, unsigned flags, hid_t fapl_id);
/**
* \ingroup H5F
*
@@ -471,7 +470,7 @@ H5_DLL hid_t H5Fopen(const char *filename, unsigned flags, hid_t fapl_id);
* \p file_id then use H5Freopen() on \p file_id to reopen it.
*
*/
-H5_DLL hid_t H5Freopen(hid_t file_id);
+H5_DLL hid_t H5Freopen(hid_t file_id);
/**
* \ingroup H5F
*
@@ -501,7 +500,7 @@ H5_DLL hid_t H5Freopen(hid_t file_id);
* actually flushed to disk.
*
*/
-H5_DLL herr_t H5Fflush(hid_t object_id, H5F_scope_t scope);
+H5_DLL herr_t H5Fflush(hid_t object_id, H5F_scope_t scope);
/**
* \example H5Fclose.c
* After creating an HDF5 file with H5Fcreate(), we close it with
@@ -550,7 +549,7 @@ H5_DLL herr_t H5Fflush(hid_t object_id, H5F_scope_t scope);
* \see H5Fopen()
*
*/
-H5_DLL herr_t H5Fclose(hid_t file_id);
+H5_DLL herr_t H5Fclose(hid_t file_id);
/**
* \ingroup H5F
*
@@ -589,7 +588,7 @@ H5_DLL herr_t H5Fclose(hid_t file_id);
* \since 1.12.0
*
*/
-H5_DLL herr_t H5Fdelete(const char *filename, hid_t fapl_id);
+H5_DLL herr_t H5Fdelete(const char *filename, hid_t fapl_id);
/**
* \ingroup H5F
*
@@ -607,7 +606,7 @@ H5_DLL herr_t H5Fdelete(const char *filename, hid_t fapl_id);
* H5Pclose().
*
*/
-H5_DLL hid_t H5Fget_create_plist(hid_t file_id);
+H5_DLL hid_t H5Fget_create_plist(hid_t file_id);
/**
* \ingroup H5F
*
@@ -620,7 +619,7 @@ H5_DLL hid_t H5Fget_create_plist(hid_t file_id);
* identifier of the specified file.
*
*/
-H5_DLL hid_t H5Fget_access_plist(hid_t file_id);
+H5_DLL hid_t H5Fget_access_plist(hid_t file_id);
/**
* \ingroup H5F
*
@@ -647,7 +646,7 @@ H5_DLL hid_t H5Fget_access_plist(hid_t file_id);
* \since 1.8.0
*
*/
-H5_DLL herr_t H5Fget_intent(hid_t file_id, unsigned *intent);
+H5_DLL herr_t H5Fget_intent(hid_t file_id, unsigned *intent);
/**
* \ingroup H5F
*
@@ -665,7 +664,7 @@ H5_DLL herr_t H5Fget_intent(hid_t file_id, unsigned *intent);
* \since 1.12.0
*
*/
-H5_DLL herr_t H5Fget_fileno(hid_t file_id, unsigned long *fileno);
+H5_DLL herr_t H5Fget_fileno(hid_t file_id, unsigned long *fileno);
/**
* \ingroup H5F
*
@@ -700,7 +699,7 @@ H5_DLL herr_t H5Fget_fileno(hid_t file_id, unsigned long *fileno);
* search to objects opened through current file identifier.
*
*/
-H5_DLL ssize_t H5Fget_obj_count(hid_t file_id, unsigned types);
+H5_DLL ssize_t H5Fget_obj_count(hid_t file_id, unsigned types);
/**
*-------------------------------------------------------------------------
* \ingroup H5F
@@ -739,7 +738,7 @@ H5_DLL ssize_t H5Fget_obj_count(hid_t file_id, unsigned types);
* \since 1.6.0
*
*/
-H5_DLL ssize_t H5Fget_obj_ids(hid_t file_id, unsigned types, size_t max_objs, hid_t *obj_id_list);
+H5_DLL ssize_t H5Fget_obj_ids(hid_t file_id, unsigned types, size_t max_objs, hid_t *obj_id_list);
/**
* \ingroup H5F
*
@@ -765,7 +764,7 @@ H5_DLL ssize_t H5Fget_obj_ids(hid_t file_id, unsigned types, size_t max_objs, h
* \since 1.6.0
*
*/
-H5_DLL herr_t H5Fget_vfd_handle(hid_t file_id, hid_t fapl, void **file_handle);
+H5_DLL herr_t H5Fget_vfd_handle(hid_t file_id, hid_t fapl, void **file_handle);
/**
* \ingroup H5F
*
@@ -790,7 +789,7 @@ H5_DLL herr_t H5Fget_vfd_handle(hid_t file_id, hid_t fapl, void **file_handle)
* default file mount property list.
*
*/
-H5_DLL herr_t H5Fmount(hid_t loc, const char *name, hid_t child, hid_t plist);
+H5_DLL herr_t H5Fmount(hid_t loc, const char *name, hid_t child, hid_t plist);
/**
* \ingroup H5F
*
@@ -812,7 +811,7 @@ H5_DLL herr_t H5Fmount(hid_t loc, const char *name, hid_t child, hid_t plist);
* of the child.
*
*/
-H5_DLL herr_t H5Funmount(hid_t loc, const char *name);
+H5_DLL herr_t H5Funmount(hid_t loc, const char *name);
/**
* \ingroup H5F
*
@@ -860,7 +859,7 @@ H5_DLL hssize_t H5Fget_freespace(hid_t file_id);
* \since 1.6.3
*
*/
-H5_DLL herr_t H5Fget_filesize(hid_t file_id, hsize_t *size);
+H5_DLL herr_t H5Fget_filesize(hid_t file_id, hsize_t *size);
/**
* \ingroup H5F
*
@@ -877,7 +876,7 @@ H5_DLL herr_t H5Fget_filesize(hid_t file_id, hsize_t *size);
* \since 1.10.2
*
*/
-H5_DLL herr_t H5Fget_eoa(hid_t file_id, haddr_t *eoa);
+H5_DLL herr_t H5Fget_eoa(hid_t file_id, haddr_t *eoa);
/**
* \ingroup H5F
*
@@ -896,7 +895,7 @@ H5_DLL herr_t H5Fget_eoa(hid_t file_id, haddr_t *eoa);
* \since 1.10.2
*
*/
-H5_DLL herr_t H5Fincrement_filesize(hid_t file_id, hsize_t increment);
+H5_DLL herr_t H5Fincrement_filesize(hid_t file_id, hsize_t increment);
/**
* \ingroup H5F
*
@@ -950,7 +949,7 @@ H5_DLL herr_t H5Fincrement_filesize(hid_t file_id, hsize_t increment);
* \since 1.8.0
*
*/
-H5_DLL ssize_t H5Fget_file_image(hid_t file_id, void *buf_ptr, size_t buf_len);
+H5_DLL ssize_t H5Fget_file_image(hid_t file_id, void *buf_ptr, size_t buf_len);
/**
* \ingroup MDC
*
@@ -1153,7 +1152,7 @@ H5_DLL ssize_t H5Fget_file_image(hid_t file_id, void *buf_ptr, size_t buf_len);
* \todo Fix the reference!
*
*/
-H5_DLL herr_t H5Fget_mdc_config(hid_t file_id, H5AC_cache_config_t *config_ptr);
+H5_DLL herr_t H5Fget_mdc_config(hid_t file_id, H5AC_cache_config_t *config_ptr);
/**
* \ingroup MDC
*
@@ -1406,7 +1405,7 @@ H5_DLL herr_t H5Fget_mdc_config(hid_t file_id, H5AC_cache_config_t *config_ptr
*
* \todo Fix the MDC document reference!
*/
-H5_DLL herr_t H5Fset_mdc_config(hid_t file_id, H5AC_cache_config_t *config_ptr);
+H5_DLL herr_t H5Fset_mdc_config(hid_t file_id, H5AC_cache_config_t *config_ptr);
/**
* \ingroup MDC
*
@@ -1430,7 +1429,7 @@ H5_DLL herr_t H5Fset_mdc_config(hid_t file_id, H5AC_cache_config_t *config_ptr
* details on the metadata cache and its adaptive resize algorithms.
*
*/
-H5_DLL herr_t H5Fget_mdc_hit_rate(hid_t file_id, double *hit_rate_ptr);
+H5_DLL herr_t H5Fget_mdc_hit_rate(hid_t file_id, double *hit_rate_ptr);
/**
* \ingroup MDC
*
@@ -1461,8 +1460,8 @@ H5_DLL herr_t H5Fget_mdc_hit_rate(hid_t file_id, double *hit_rate_ptr);
* metadata cache in the special topics section of the user manual for a discussion of this.
*
*/
-H5_DLL herr_t H5Fget_mdc_size(hid_t file_id, size_t *max_size_ptr, size_t *min_clean_size_ptr,
- size_t *cur_size_ptr, int *cur_num_entries_ptr);
+H5_DLL herr_t H5Fget_mdc_size(hid_t file_id, size_t *max_size_ptr, size_t *min_clean_size_ptr,
+ size_t *cur_size_ptr, int *cur_num_entries_ptr);
/**
* \ingroup MDC
*
@@ -1491,7 +1490,7 @@ H5_DLL herr_t H5Fget_mdc_size(hid_t file_id, size_t *max_size_ptr, size_t *min
*
* \todo Fix the MDC document reference!
*/
-H5_DLL herr_t H5Freset_mdc_hit_rate_stats(hid_t file_id);
+H5_DLL herr_t H5Freset_mdc_hit_rate_stats(hid_t file_id);
/**
* \ingroup H5F
*
@@ -1530,7 +1529,7 @@ H5_DLL herr_t H5Freset_mdc_hit_rate_stats(hid_t file_id);
* \since 1.6.3
*
*/
-H5_DLL ssize_t H5Fget_name(hid_t obj_id, char *name, size_t size);
+H5_DLL ssize_t H5Fget_name(hid_t obj_id, char *name, size_t size);
/**
* \ingroup H5F
*
@@ -1575,7 +1574,7 @@ H5_DLL ssize_t H5Fget_name(hid_t obj_id, char *name, size_t size);
* \since 1.10.0
*
*/
-H5_DLL herr_t H5Fget_info2(hid_t obj_id, H5F_info2_t *file_info);
+H5_DLL herr_t H5Fget_info2(hid_t obj_id, H5F_info2_t *file_info);
/**
* \ingroup SWMR
*
@@ -1659,7 +1658,7 @@ H5_DLL herr_t H5Fget_info2(hid_t obj_id, H5F_info2_t *file_info);
* \since 1.10.0
*
*/
-H5_DLL herr_t H5Fget_metadata_read_retry_info(hid_t file_id, H5F_retry_info_t *info);
+H5_DLL herr_t H5Fget_metadata_read_retry_info(hid_t file_id, H5F_retry_info_t *info);
/**
* \ingroup SWMR
*
@@ -1692,7 +1691,7 @@ H5_DLL herr_t H5Fget_metadata_read_retry_info(hid_t file_id, H5F_retry_info_t
* \since 1.10.0
*
*/
-H5_DLL herr_t H5Fstart_swmr_write(hid_t file_id);
+H5_DLL herr_t H5Fstart_swmr_write(hid_t file_id);
/**
* \ingroup H5F
*
@@ -1740,8 +1739,8 @@ H5_DLL herr_t H5Fstart_swmr_write(hid_t file_id);
* \since 1.10.0
*
*/
-H5_DLL ssize_t H5Fget_free_sections(hid_t file_id, H5F_mem_t type, size_t nsects,
- H5F_sect_info_t *sect_info /*out*/);
+H5_DLL ssize_t H5Fget_free_sections(hid_t file_id, H5F_mem_t type, size_t nsects,
+ H5F_sect_info_t *sect_info /*out*/);
/**
* \ingroup H5F
*
@@ -1764,7 +1763,7 @@ H5_DLL ssize_t H5Fget_free_sections(hid_t file_id, H5F_mem_t type, size_t nsect
* \since 1.8.7
*
*/
-H5_DLL herr_t H5Fclear_elink_file_cache(hid_t file_id);
+H5_DLL herr_t H5Fclear_elink_file_cache(hid_t file_id);
/**
* \ingroup H5F
*
@@ -1787,7 +1786,7 @@ H5_DLL herr_t H5Fclear_elink_file_cache(hid_t file_id);
* \since 1.10.2
*
*/
-H5_DLL herr_t H5Fset_libver_bounds(hid_t file_id, H5F_libver_t low, H5F_libver_t high);
+H5_DLL herr_t H5Fset_libver_bounds(hid_t file_id, H5F_libver_t low, H5F_libver_t high);
/**
* \ingroup MDC
*
@@ -1839,7 +1838,7 @@ H5_DLL herr_t H5Fset_libver_bounds(hid_t file_id, H5F_libver_t low, H5F_libver
* \todo Fix the document reference!
*
*/
-H5_DLL herr_t H5Fstart_mdc_logging(hid_t file_id);
+H5_DLL herr_t H5Fstart_mdc_logging(hid_t file_id);
/**
* \ingroup MDC
*
@@ -1884,7 +1883,7 @@ H5_DLL herr_t H5Fstart_mdc_logging(hid_t file_id);
* \since 1.10.0
*
*/
-H5_DLL herr_t H5Fstop_mdc_logging(hid_t file_id);
+H5_DLL herr_t H5Fstop_mdc_logging(hid_t file_id);
/**
* \ingroup MDC
*
@@ -1927,15 +1926,14 @@ H5_DLL herr_t H5Fstop_mdc_logging(hid_t file_id);
*
* \since 1.10.0
*/
-H5_DLL herr_t H5Fget_mdc_logging_status(hid_t file_id,
- /*OUT*/ hbool_t *is_enabled,
- /*OUT*/ hbool_t *is_currently_logging);
+H5_DLL herr_t H5Fget_mdc_logging_status(hid_t file_id, hbool_t *is_enabled,
+ hbool_t *is_currently_logging);
/**
* \ingroup SWMR
*
* \todo Finish this!
*/
-H5_DLL herr_t H5Fformat_convert(hid_t fid);
+H5_DLL herr_t H5Fformat_convert(hid_t fid);
/**
* \ingroup H5F
*
@@ -1951,7 +1949,7 @@ H5_DLL herr_t H5Fformat_convert(hid_t fid);
* \since 1.10.1
*
*/
-H5_DLL herr_t H5Freset_page_buffering_stats(hid_t file_id);
+H5_DLL herr_t H5Freset_page_buffering_stats(hid_t file_id);
/**
* \ingroup H5F
*
@@ -1979,8 +1977,8 @@ H5_DLL herr_t H5Freset_page_buffering_stats(hid_t file_id);
* \since 1.10.1
*
*/
-H5_DLL herr_t H5Fget_page_buffering_stats(hid_t file_id, unsigned accesses[2], unsigned hits[2],
- unsigned misses[2], unsigned evictions[2], unsigned bypasses[2]);
+H5_DLL herr_t H5Fget_page_buffering_stats(hid_t file_id, unsigned accesses[2], unsigned hits[2],
+ unsigned misses[2], unsigned evictions[2], unsigned bypasses[2]);
/**
* \ingroup MDC
*
@@ -2011,7 +2009,7 @@ H5_DLL herr_t H5Fget_page_buffering_stats(hid_t file_id, unsigned accesses[2],
*
* \since 1.10.1
*/
-H5_DLL herr_t H5Fget_mdc_image_info(hid_t file_id, haddr_t *image_addr, hsize_t *image_size);
+H5_DLL herr_t H5Fget_mdc_image_info(hid_t file_id, haddr_t *image_addr, hsize_t *image_size);
/**
* \ingroup H5F
*
@@ -2034,7 +2032,7 @@ H5_DLL herr_t H5Fget_mdc_image_info(hid_t file_id, haddr_t *image_addr, hsize_
* \since 1.10.5
*
*/
-H5_DLL herr_t H5Fget_dset_no_attrs_hint(hid_t file_id, hbool_t *minimize);
+H5_DLL herr_t H5Fget_dset_no_attrs_hint(hid_t file_id, hbool_t *minimize);
/**
* \ingroup H5F
*
@@ -2065,7 +2063,7 @@ H5_DLL herr_t H5Fget_dset_no_attrs_hint(hid_t file_id, hbool_t *minimize);
* \since 1.10.5
*
*/
-H5_DLL herr_t H5Fset_dset_no_attrs_hint(hid_t file_id, hbool_t minimize);
+H5_DLL herr_t H5Fset_dset_no_attrs_hint(hid_t file_id, hbool_t minimize);
#ifdef H5_HAVE_PARALLEL
/**
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index 93a4642..48346c5 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -328,7 +328,7 @@ H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, hbool_t initial_read)
hbool_t skip_eof_check = FALSE; /* Whether to skip checking the EOF value */
#ifdef H5_HAVE_PARALLEL
int mpi_size = 1;
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_PACKAGE_TAG(H5AC__SUPERBLOCK_TAG)
@@ -878,12 +878,12 @@ H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, hbool_t initial_read)
/* Do the same kluge until we know for sure. VC */
#if 1 /* bug fix test code -- tidy this up if all goes well */ /* JRM */
- /* KLUGE ALERT!!
- *
- * H5F__super_ext_write_msg() expects f->shared->sblock to
- * be set -- verify that it is NULL, and then set it.
- * Set it back to NULL when we are done.
- */
+ /* KLUGE ALERT!!
+ *
+ * H5F__super_ext_write_msg() expects f->shared->sblock to
+ * be set -- verify that it is NULL, and then set it.
+ * Set it back to NULL when we are done.
+ */
HDassert(f->shared->sblock == NULL);
f->shared->sblock = sblock;
#endif /* JRM */
diff --git a/src/H5G.c b/src/H5G.c
index a15e500..c307a2a 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -181,7 +181,7 @@ H5G__init_package(void)
FUNC_ENTER_PACKAGE
- /* Initialize the atom group for the group IDs */
+ /* Initialize the ID group for the group IDs */
if (H5I_register_type(H5I_GROUP_CLS) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to initialize interface")
@@ -370,9 +370,9 @@ H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t g
H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL)))
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, H5I_INVALID_HID, "unable to create group")
- /* Get an atom for the group */
+ /* Get an ID for the group */
if ((ret_value = H5VL_register(H5I_GROUP, grp, vol_obj->connector, TRUE)) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to atomize group handle")
+ HGOTO_ERROR(H5E_SYM, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to get ID for group handle")
done:
if (H5I_INVALID_HID == ret_value)
@@ -417,9 +417,9 @@ done:
hid_t
H5Gcreate_anon(hid_t loc_id, hid_t gcpl_id, hid_t gapl_id)
{
- void * grp = NULL; /* Structure for new group */
- H5VL_object_t * vol_obj = NULL; /* Object for loc_id */
- H5VL_loc_params_t loc_params;
+ void * grp = NULL; /* Structure for new group */
+ H5VL_object_t * vol_obj = NULL; /* Object for loc_id */
+ H5VL_loc_params_t loc_params; /* Location parameters for object access */
hid_t ret_value = H5I_INVALID_HID; /* Return value */
FUNC_ENTER_API(H5I_INVALID_HID)
@@ -448,9 +448,9 @@ H5Gcreate_anon(hid_t loc_id, hid_t gcpl_id, hid_t gapl_id)
gapl_id, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL)))
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, H5I_INVALID_HID, "unable to create group")
- /* Get an atom for the group */
+ /* Get an ID for the group */
if ((ret_value = H5VL_register(H5I_GROUP, grp, vol_obj->connector, TRUE)) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to atomize group handle")
+ HGOTO_ERROR(H5E_SYM, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to get ID for group handle")
done:
/* Cleanup on failure */
@@ -726,15 +726,15 @@ H5Gclose(hid_t group_id)
FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", group_id);
- /* Check args */
- if (NULL == H5I_object_verify(group_id, H5I_GROUP))
- HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
+ /* Check arguments */
+ if (H5I_GROUP != H5I_get_type(group_id))
+ HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group ID")
- /* Decrement the counter on the group atom. It will be freed if the count
+ /* Decrement the counter on the group ID. It will be freed if the count
* reaches zero.
*/
if (H5I_dec_app_ref(group_id) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close group")
+ HGOTO_ERROR(H5E_SYM, H5E_CANTDEC, FAIL, "decrementing group ID failed")
done:
FUNC_LEAVE_API(ret_value)
diff --git a/src/H5Gent.c b/src/H5Gent.c
index 12a2caf..fb59d97 100644
--- a/src/H5Gent.c
+++ b/src/H5Gent.c
@@ -53,9 +53,6 @@
/* Package Variables */
/*********************/
-/* Declare extern the PQ free list for the wrapped strings */
-H5FL_BLK_EXTERN(str_buf);
-
/*****************************/
/* Library Private Variables */
/*****************************/
@@ -424,7 +421,7 @@ H5G__ent_convert(H5F_t *f, H5HL_t *heap, const char *name, const H5O_link_t *lnk
HDassert(!stab_exists);
} /* end else */
#endif /* NDEBUG */
- } /* end if */
+ } /* end if */
else if (obj_type == H5O_TYPE_UNKNOWN) {
/* Try to retrieve symbol table information for caching */
H5O_loc_t targ_oloc; /* Location of link target */
diff --git a/src/H5Gname.c b/src/H5Gname.c
index d27428d..5fb1888 100644
--- a/src/H5Gname.c
+++ b/src/H5Gname.c
@@ -79,12 +79,9 @@ typedef struct H5G_gnba_iter_t {
static htri_t H5G__common_path(const H5RS_str_t *fullpath_r, const H5RS_str_t *prefix_r);
static H5RS_str_t *H5G__build_fullpath(const char *prefix, const char *name);
-#ifdef NOT_YET
-static H5RS_str_t *H5G__build_fullpath_refstr_refstr(const H5RS_str_t *prefix_r, const H5RS_str_t *name_r);
-#endif /* NOT_YET */
-static herr_t H5G__name_move_path(H5RS_str_t **path_r_ptr, const char *full_suffix, const char *src_path,
- const char *dst_path);
-static int H5G__name_replace_cb(void *obj_ptr, hid_t obj_id, void *key);
+static herr_t H5G__name_move_path(H5RS_str_t **path_r_ptr, const char *full_suffix, const char *src_path,
+ const char *dst_path);
+static int H5G__name_replace_cb(void *obj_ptr, hid_t obj_id, void *key);
/*********************/
/* Package Variables */
@@ -355,44 +352,6 @@ H5G_build_fullpath_refstr_str(H5RS_str_t *prefix_r, const char *name)
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5G_build_fullpath_refstr_str() */
-#ifdef NOT_YET
-
-/*-------------------------------------------------------------------------
- * Function: H5G_name_build_refstr_refstr
- *
- * Purpose: Build a full path from a prefix & base pair of reference counted
- * strings
- *
- * Return: Pointer to reference counted string on success, NULL on error
- *
- * Programmer: Quincey Koziol
- *
- * Date: August 19, 2005
- *
- *-------------------------------------------------------------------------
- */
-static H5RS_str_t *
-H5G__build_fullpath_refstr_refstr(const H5RS_str_t *prefix_r, const H5RS_str_t *name_r)
-{
- const char *prefix; /* Pointer to raw string of prefix */
- const char *name; /* Pointer to raw string of name */
- H5RS_str_t *ret_value; /* Return value */
-
- FUNC_ENTER_STATIC_NOERR
-
- /* Get the pointer to the prefix */
- prefix = H5RS_get_str(prefix_r);
-
- /* Get the pointer to the raw src user path */
- name = H5RS_get_str(name_r);
-
- /* Create reference counted string for path */
- ret_value = H5G__build_fullpath(prefix, name);
-
- FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G__build_fullpath_refstr_refstr() */
-#endif /* NOT_YET */
-
/*-------------------------------------------------------------------------
* Function: H5G__name_init
*
diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h
index 14b7ae7..a9a2903 100644
--- a/src/H5Gprivate.h
+++ b/src/H5Gprivate.h
@@ -167,7 +167,7 @@ typedef herr_t (*H5G_traverse_t)(H5G_loc_t *grp_loc /*in*/, const char *name,
typedef enum H5G_link_iterate_op_type_t {
#ifndef H5_NO_DEPRECATED_SYMBOLS
H5G_LINK_OP_OLD, /* "Old" application callback */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
H5G_LINK_OP_NEW /* "New" application callback */
} H5G_link_iterate_op_type_t;
@@ -176,7 +176,7 @@ typedef struct {
union {
#ifndef H5_NO_DEPRECATED_SYMBOLS
H5G_iterate_t op_old; /* "Old" application callback for each link */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
H5L_iterate2_t op_new; /* "New" application callback for each link */
} op_func;
} H5G_link_iterate_t;
diff --git a/src/H5Groot.c b/src/H5Groot.c
index d7fbb49..29cb46e 100644
--- a/src/H5Groot.c
+++ b/src/H5Groot.c
@@ -246,8 +246,8 @@ H5G_mkroot(H5F_t *f, hbool_t create_root)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to verify symbol table")
} /* end if */
#endif /* H5_STRICT_FORMAT_CHECKS */
- } /* end if */
- } /* end else */
+ } /* end if */
+ } /* end else */
/* Cache the root group's symbol table information in the root group symbol
* table entry. It will have been allocated by now if it needs to be
diff --git a/src/H5Gtraverse.c b/src/H5Gtraverse.c
index 505718a..13be47a 100644
--- a/src/H5Gtraverse.c
+++ b/src/H5Gtraverse.c
@@ -198,7 +198,7 @@ H5G__traverse_ud(const H5G_loc_t *grp_loc /*in,out*/, const H5O_link_t *lnk, H5G
else
cb_return = (link_class->trav_func)(lnk->name, cur_grp, lnk->u.ud.udata, lnk->u.ud.size,
H5CX_get_lapl(), H5CX_get_dxpl());
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+#else /* H5_NO_DEPRECATED_SYMBOLS */
cb_return = (link_class->trav_func)(lnk->name, cur_grp, lnk->u.ud.udata, lnk->u.ud.size, H5CX_get_lapl(),
H5CX_get_dxpl());
#endif /* H5_NO_DEPRECATED_SYMBOLS */
diff --git a/src/H5HFcache.c b/src/H5HFcache.c
index 0e1304f..a9f89e0 100644
--- a/src/H5HFcache.c
+++ b/src/H5HFcache.c
@@ -1304,7 +1304,7 @@ H5HF__cache_iblock_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_NDEBUG
#ifndef NDEBUG
unsigned nchildren = 0; /* Track # of children */
size_t max_child = 0; /* Track max. child entry used */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
uint32_t metadata_chksum; /* Computed metadata checksum value */
size_t u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
@@ -1378,7 +1378,7 @@ H5HF__cache_iblock_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_NDEBUG
max_child = u;
} /* end if */
#endif /* NDEBUG */
- } /* end for */
+ } /* end for */
/* Compute checksum */
metadata_chksum = H5_checksum_metadata((uint8_t *)_image, (size_t)(image - (uint8_t *)_image), 0);
diff --git a/src/H5HG.c b/src/H5HG.c
index a50d29f..0a6955e 100644
--- a/src/H5HG.c
+++ b/src/H5HG.c
@@ -548,7 +548,7 @@ H5HG_insert(H5F_t *f, size_t size, const void *obj, H5HG_t *hobj /*out*/)
HDmemset(heap->obj[idx].begin + H5HG_SIZEOF_OBJHDR(f) + size, 0,
need - (H5HG_SIZEOF_OBJHDR(f) + size));
#endif /* OLD_WAY */
- } /* end if */
+ } /* end if */
heap_flags |= H5AC__DIRTIED_FLAG;
/* Return value */
diff --git a/src/H5I.c b/src/H5I.c
index 055b08e..0dcad8e 100644
--- a/src/H5I.c
+++ b/src/H5I.c
@@ -11,7 +11,7 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/*
+/*
* H5I.c - Public routines for handling IDs
*/
@@ -93,8 +93,8 @@ static int H5I__iterate_pub_cb(void *obj, hid_t id, void *udata);
H5I_type_t
H5Iregister_type(size_t H5_ATTR_DEBUG_API_USED hash_size, unsigned reserved, H5I_free_t free_func)
{
- H5I_class_t *cls = NULL; /* New ID class */
- H5I_type_t new_type = H5I_BADID; /* New ID type value */
+ H5I_class_t *cls = NULL; /* New ID class */
+ H5I_type_t new_type = H5I_BADID; /* New ID type value */
H5I_type_t ret_value = H5I_BADID; /* Return value */
FUNC_ENTER_API(H5I_BADID)
@@ -109,7 +109,7 @@ H5Iregister_type(size_t H5_ATTR_DEBUG_API_USED hash_size, unsigned reserved, H5I
}
else {
hbool_t done; /* Indicate that search was successful */
- int i;
+ int i;
/* Look for a free type to give out */
done = FALSE;
@@ -637,8 +637,8 @@ done:
htri_t
H5Iis_valid(hid_t id)
{
- H5I_id_info_t *info = NULL; /* Pointer to the ID info */
- htri_t ret_value = TRUE; /* Return value */
+ H5I_id_info_t *info = NULL; /* Pointer to the ID info */
+ htri_t ret_value = TRUE; /* Return value */
FUNC_ENTER_API(FAIL)
H5TRACE1("t", "i", id);
@@ -710,8 +710,8 @@ H5I__search_cb(void *obj, hid_t id, void *_udata)
void *
H5Isearch(H5I_type_t type, H5I_search_func_t func, void *key)
{
- H5I_search_ud_t udata; /* Context for iteration */
- void * ret_value = NULL; /* Return value */
+ H5I_search_ud_t udata; /* Context for iteration */
+ void * ret_value = NULL; /* Return value */
FUNC_ENTER_API(NULL)
H5TRACE3("*x", "Itx*x", type, func, key);
@@ -756,9 +756,9 @@ done:
static int
H5I__iterate_pub_cb(void H5_ATTR_UNUSED *obj, hid_t id, void *_udata)
{
- H5I_iterate_pub_ud_t *udata = (H5I_iterate_pub_ud_t *)_udata; /* User data for callback */
- herr_t cb_ret_val = FAIL; /* User callback return value */
- int ret_value = H5_ITER_ERROR; /* Callback return value */
+ H5I_iterate_pub_ud_t *udata = (H5I_iterate_pub_ud_t *)_udata; /* User data for callback */
+ herr_t cb_ret_val = FAIL; /* User callback return value */
+ int ret_value = H5_ITER_ERROR; /* Callback return value */
FUNC_ENTER_STATIC_NOERR
@@ -802,7 +802,7 @@ H5I__iterate_pub_cb(void H5_ATTR_UNUSED *obj, hid_t id, void *_udata)
herr_t
H5Iiterate(H5I_type_t type, H5I_iterate_func_t op, void *op_data)
{
- H5I_iterate_pub_ud_t int_udata; /* Internal user data */
+ H5I_iterate_pub_ud_t int_udata; /* Internal user data */
herr_t ret_value = FAIL; /* Return value */
FUNC_ENTER_API(FAIL)
@@ -913,5 +913,3 @@ H5Iget_name(hid_t id, char *name /*out*/, size_t size)
done:
FUNC_LEAVE_API(ret_value)
} /* end H5Iget_name() */
-
-
diff --git a/src/H5Idbg.c b/src/H5Idbg.c
index 3d6d401..80be9d0 100644
--- a/src/H5Idbg.c
+++ b/src/H5Idbg.c
@@ -11,7 +11,7 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/*
+/*
* H5Idbg.c - Debugging routines for handling IDs
*/
@@ -76,10 +76,10 @@ static int H5I__id_dump_cb(void *_item, void *_key, void *_udata);
static int
H5I__id_dump_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata)
{
- H5I_id_info_t *info = (H5I_id_info_t *)_item; /* Pointer to the ID node */
- H5I_type_t type = *(H5I_type_t *)_udata; /* User data */
- H5G_name_t * path = NULL; /* Path to file object */
- const void * object = NULL; /* Pointer to VOL connector object */
+ H5I_id_info_t *info = (H5I_id_info_t *)_item; /* Pointer to the ID node */
+ H5I_type_t type = *(H5I_type_t *)_udata; /* User data */
+ H5G_name_t * path = NULL; /* Path to file object */
+ const void * object = NULL; /* Pointer to VOL connector object */
FUNC_ENTER_STATIC_NOERR
@@ -114,7 +114,7 @@ H5I__id_dump_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata)
object = (void *)H5T_get_actual_type((H5T_t *)dt); /* Casting away const OK - QAK */
H5_GCC_DIAG_ON("cast-qual")
- path = H5T_nameof((const H5T_t *)object);
+ path = H5T_nameof((const H5T_t *)object);
break;
}
diff --git a/src/H5Iint.c b/src/H5Iint.c
index fa08253..2e1145d 100644
--- a/src/H5Iint.c
+++ b/src/H5Iint.c
@@ -11,7 +11,7 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/*
+/*
* H5Iint.c - Private routines for handling IDs
*/
@@ -62,8 +62,8 @@ typedef struct {
/* User data for H5I__clear_type_cb */
typedef struct {
H5I_type_info_t *type_info; /* Pointer to the type's info to be cleared */
- hbool_t force; /* Whether to always remove the ID */
- hbool_t app_ref; /* Whether this is an appl. ref. call */
+ hbool_t force; /* Whether to always remove the ID */
+ hbool_t app_ref; /* Whether this is an appl. ref. call */
} H5I_clear_type_ud_t;
/********************/
@@ -74,10 +74,10 @@ typedef struct {
/* Local Prototypes */
/********************/
-static void * H5I__unwrap(void *object, H5I_type_t type);
-static htri_t H5I__clear_type_cb(void *_id, void *key, void *udata);
-static void * H5I__remove_common(H5I_type_info_t *type_info, hid_t id);
-static int H5I__find_id_cb(void *_item, void *_key, void *_udata);
+static void * H5I__unwrap(void *object, H5I_type_t type);
+static htri_t H5I__clear_type_cb(void *_id, void *key, void *udata);
+static void * H5I__remove_common(H5I_type_info_t *type_info, hid_t id);
+static int H5I__find_id_cb(void *_item, void *_key, void *_udata);
/*********************/
/* Package Variables */
@@ -88,7 +88,7 @@ hbool_t H5_PKG_INIT_VAR = FALSE;
/* Declared extern in H5Ipkg.h and documented there */
H5I_type_info_t *H5I_type_info_array_g[H5I_MAX_NUM_TYPES];
-int H5I_next_type_g = (int)H5I_NTYPES;
+int H5I_next_type_g = (int)H5I_NTYPES;
/* Declare a free list to manage the H5I_id_info_t struct */
H5FL_DEFINE_STATIC(H5I_id_info_t);
@@ -101,7 +101,6 @@ H5FL_DEFINE_STATIC(H5I_id_info_t);
/* Local Variables */
/*******************/
-
/*-------------------------------------------------------------------------
* Function: H5I_term_package
*
@@ -125,7 +124,7 @@ H5I_term_package(void)
if (H5_PKG_INIT_VAR) {
H5I_type_info_t *type_info = NULL; /* Pointer to ID type */
- int i;
+ int i;
/* Count the number of types still in use */
for (i = 0; i < H5I_next_type_g; i++)
@@ -138,7 +137,7 @@ H5I_term_package(void)
type_info = H5I_type_info_array_g[i];
if (type_info) {
HDassert(NULL == type_info->ids);
- type_info = H5MM_xfree(type_info);
+ type_info = H5MM_xfree(type_info);
H5I_type_info_array_g[i] = NULL;
in_use++;
}
@@ -167,8 +166,8 @@ H5I_term_package(void)
herr_t
H5I_register_type(const H5I_class_t *cls)
{
- H5I_type_info_t *type_info = NULL; /* Pointer to the ID type*/
- herr_t ret_value = SUCCEED; /* Return value */
+ H5I_type_info_t *type_info = NULL; /* Pointer to the ID type*/
+ herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
@@ -190,9 +189,9 @@ H5I_register_type(const H5I_class_t *cls)
/* Initialize the ID type structure for new types */
if (type_info->init_count == 0) {
- type_info->cls = cls;
- type_info->id_count = 0;
- type_info->nextid = cls->reserved;
+ type_info->cls = cls;
+ type_info->id_count = 0;
+ type_info->nextid = cls->reserved;
type_info->last_id_info = NULL;
if (NULL == (type_info->ids = H5SL_create(H5SL_TYPE_HID, NULL)))
HGOTO_ERROR(H5E_ATOM, H5E_CANTCREATE, FAIL, "skip list creation failed")
@@ -233,7 +232,7 @@ int64_t
H5I_nmembers(H5I_type_t type)
{
H5I_type_info_t *type_info = NULL; /* Pointer to the ID type */
- int64_t ret_value = 0; /* Return value */
+ int64_t ret_value = 0; /* Return value */
FUNC_ENTER_NOAPI((-1))
@@ -309,8 +308,8 @@ H5I__unwrap(void *object, H5I_type_t type)
herr_t
H5I_clear_type(H5I_type_t type, hbool_t force, hbool_t app_ref)
{
- H5I_clear_type_ud_t udata; /* udata struct for callback */
- herr_t ret_value = SUCCEED; /* Return value */
+ H5I_clear_type_ud_t udata; /* udata struct for callback */
+ herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
@@ -350,7 +349,7 @@ done:
static htri_t
H5I__clear_type_cb(void *_info, void H5_ATTR_UNUSED *key, void *_udata)
{
- H5I_id_info_t * info = (H5I_id_info_t *)_info; /* Current ID info being worked with */
+ H5I_id_info_t * info = (H5I_id_info_t *)_info; /* Current ID info being worked with */
H5I_clear_type_ud_t *udata = (H5I_clear_type_ud_t *)_udata; /* udata struct */
htri_t ret_value = FALSE; /* Return value */
@@ -420,8 +419,8 @@ H5I__clear_type_cb(void *_info, void H5_ATTR_UNUSED *key, void *_udata)
herr_t
H5I__destroy_type(H5I_type_t type)
{
- H5I_type_info_t *type_info = NULL; /* Pointer to the ID type */
- herr_t ret_value = SUCCEED; /* Return value */
+ H5I_type_info_t *type_info = NULL; /* Pointer to the ID type */
+ herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_PACKAGE
@@ -473,10 +472,10 @@ done:
hid_t
H5I_register(H5I_type_t type, const void *object, hbool_t app_ref)
{
- H5I_type_info_t *type_info = NULL; /* Pointer to the type */
- H5I_id_info_t *info = NULL; /* Pointer to the new ID information */
- hid_t new_id = H5I_INVALID_HID; /* New ID */
- hid_t ret_value = H5I_INVALID_HID; /* Return value */
+ H5I_type_info_t *type_info = NULL; /* Pointer to the type */
+ H5I_id_info_t * info = NULL; /* Pointer to the new ID information */
+ hid_t new_id = H5I_INVALID_HID; /* New ID */
+ hid_t ret_value = H5I_INVALID_HID; /* Return value */
FUNC_ENTER_NOAPI(H5I_INVALID_HID)
@@ -536,9 +535,9 @@ done:
herr_t
H5I_register_using_existing_id(H5I_type_t type, void *object, hbool_t app_ref, hid_t existing_id)
{
- H5I_type_info_t *type_info = NULL; /* Pointer to the type */
- H5I_id_info_t *info = NULL; /* Pointer to the new ID information */
- herr_t ret_value = SUCCEED; /* Return value */
+ H5I_type_info_t *type_info = NULL; /* Pointer to the type */
+ H5I_id_info_t * info = NULL; /* Pointer to the new ID information */
+ herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
@@ -602,7 +601,7 @@ done:
void *
H5I_subst(hid_t id, const void *new_object)
{
- H5I_id_info_t *info = NULL; /* Pointer to the ID's info */
+ H5I_id_info_t *info = NULL; /* Pointer to the ID's info */
void * ret_value = NULL; /* Return value */
FUNC_ENTER_NOAPI(NULL)
@@ -638,7 +637,7 @@ done:
void *
H5I_object(hid_t id)
{
- H5I_id_info_t *info = NULL; /* Pointer to the ID info */
+ H5I_id_info_t *info = NULL; /* Pointer to the ID info */
void * ret_value = NULL; /* Return value */
FUNC_ENTER_NOAPI_NOERR
@@ -821,7 +820,7 @@ H5I__remove_verify(hid_t id, H5I_type_t type)
static void *
H5I__remove_common(H5I_type_info_t *type_info, hid_t id)
{
- H5I_id_info_t *info = NULL; /* Pointer to the current ID */
+ H5I_id_info_t *info = NULL; /* Pointer to the current ID */
void * ret_value = NULL; /* Return value */
FUNC_ENTER_STATIC
@@ -841,7 +840,7 @@ H5I__remove_common(H5I_type_info_t *type_info, hid_t id)
ret_value = (void *)info->object; /* (Casting away const OK -QAK) */
H5_GCC_DIAG_ON("cast-qual")
- info = H5FL_FREE(H5I_id_info_t, info);
+ info = H5FL_FREE(H5I_id_info_t, info);
/* Decrement the number of IDs in the type */
(type_info->id_count)--;
@@ -865,9 +864,9 @@ done:
void *
H5I_remove(hid_t id)
{
- H5I_type_info_t *type_info = NULL; /* Pointer to the ID type */
- H5I_type_t type = H5I_BADID; /* ID's type */
- void * ret_value = NULL; /* Return value */
+ H5I_type_info_t *type_info = NULL; /* Pointer to the ID type */
+ H5I_type_t type = H5I_BADID; /* ID's type */
+ void * ret_value = NULL; /* Return value */
FUNC_ENTER_NOAPI(NULL)
@@ -897,7 +896,6 @@ done:
* function has been defined at type creation time.
*
* Return: Success: New reference count
- *
* Failure: -1
*
*-------------------------------------------------------------------------
@@ -905,8 +903,8 @@ done:
int
H5I_dec_ref(hid_t id)
{
- H5I_id_info_t *info = NULL; /* Pointer to the ID */
- int ret_value = 0; /* Return value */
+ H5I_id_info_t *info = NULL; /* Pointer to the ID */
+ int ret_value = 0; /* Return value */
FUNC_ENTER_NOAPI((-1))
@@ -944,15 +942,15 @@ H5I_dec_ref(hid_t id)
if (NULL == H5I__remove_common(type_info, id))
HGOTO_ERROR(H5E_ATOM, H5E_CANTDELETE, (-1), "can't remove ID node")
ret_value = 0;
- }
+ } /* end if */
else
ret_value = -1;
H5_GCC_DIAG_ON("cast-qual")
- }
+ } /* end if */
else {
--(info->count);
ret_value = (int)info->count;
- }
+ } /* end else */
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -961,7 +959,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5I_dec_app_ref
*
- * Purpose: H5I_dec_ref wrapper for case of modifying the application ref.
+ * Purpose: Wrapper for case of modifying the application ref.
* count for an ID as well as normal reference count.
*
* Return: Success: New app. reference count
@@ -975,8 +973,7 @@ done:
int
H5I_dec_app_ref(hid_t id)
{
- H5I_id_info_t *info = NULL; /* Pointer to the ID info */
- int ret_value = 0; /* Return value */
+ int ret_value = 0; /* Return value */
FUNC_ENTER_NOAPI((-1))
@@ -989,6 +986,8 @@ H5I_dec_app_ref(hid_t id)
/* Check if the ID still exists */
if (ret_value > 0) {
+ H5I_id_info_t *info = NULL; /* Pointer to the ID info */
+
/* General lookup of the ID */
if (NULL == (info = H5I__find_id(id)))
HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, (-1), "can't locate ID")
@@ -999,7 +998,7 @@ H5I_dec_app_ref(hid_t id)
/* Set return value */
ret_value = (int)info->app_count;
- }
+ } /* end if */
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -1008,8 +1007,8 @@ done:
/*-------------------------------------------------------------------------
* Function: H5I_dec_app_ref_always_close
*
- * Purpose: H5I_dec_app_ref wrapper for case of always closing the ID,
- * even when the free routine fails
+ * Purpose: Wrapper for case of always closing the ID, even when the free
+ * routine fails
*
* Return: Success: New app. reference count
* Failure: -1
@@ -1059,8 +1058,8 @@ done:
int
H5I_inc_ref(hid_t id, hbool_t app_ref)
{
- H5I_id_info_t *info = NULL; /* Pointer to the ID info */
- int ret_value = 0; /* Return value */
+ H5I_id_info_t *info = NULL; /* Pointer to the ID info */
+ int ret_value = 0; /* Return value */
FUNC_ENTER_NOAPI((-1))
@@ -1096,8 +1095,8 @@ done:
int
H5I_get_ref(hid_t id, hbool_t app_ref)
{
- H5I_id_info_t *info = NULL; /* Pointer to the ID */
- int ret_value = 0; /* Return value */
+ H5I_id_info_t *info = NULL; /* Pointer to the ID */
+ int ret_value = 0; /* Return value */
FUNC_ENTER_NOAPI((-1))
@@ -1129,7 +1128,7 @@ int
H5I__inc_type_ref(H5I_type_t type)
{
H5I_type_info_t *type_info = NULL; /* Pointer to the type */
- int ret_value = -1; /* Return value */
+ int ret_value = -1; /* Return value */
FUNC_ENTER_STATIC
@@ -1171,7 +1170,7 @@ int
H5I_dec_type_ref(H5I_type_t type)
{
H5I_type_info_t *type_info = NULL; /* Pointer to the ID type */
- herr_t ret_value = 0; /* Return value */
+ herr_t ret_value = 0; /* Return value */
FUNC_ENTER_NOAPI((-1))
@@ -1215,7 +1214,7 @@ int
H5I__get_type_ref(H5I_type_t type)
{
H5I_type_info_t *type_info = NULL; /* Pointer to the type */
- int ret_value = -1; /* Return value */
+ int ret_value = -1; /* Return value */
FUNC_ENTER_STATIC
@@ -1271,8 +1270,7 @@ H5I__iterate_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata)
H5_GCC_DIAG_ON("cast-qual")
/* Invoke callback function */
- cb_ret_val =
- (*udata->user_func)((void *)object, info->id, udata->user_udata);
+ cb_ret_val = (*udata->user_func)((void *)object, info->id, udata->user_udata);
/* Set the return value based on the callback's return value */
if (cb_ret_val > 0)
@@ -1312,8 +1310,8 @@ H5I__iterate_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata)
herr_t
H5I_iterate(H5I_type_t type, H5I_search_func_t func, void *udata, hbool_t app_ref)
{
- H5I_type_info_t *type_info = NULL; /* Pointer to the type */
- herr_t ret_value = SUCCEED; /* Return value */
+ H5I_type_info_t *type_info = NULL; /* Pointer to the type */
+ herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
@@ -1357,9 +1355,9 @@ done:
H5I_id_info_t *
H5I__find_id(hid_t id)
{
- H5I_type_t type; /* ID's type */
- H5I_type_info_t *type_info = NULL; /* Pointer to the type */
- H5I_id_info_t *ret_value = NULL; /* Return value */
+ H5I_type_t type; /* ID's type */
+ H5I_type_info_t *type_info = NULL; /* Pointer to the type */
+ H5I_id_info_t * ret_value = NULL; /* Return value */
FUNC_ENTER_PACKAGE_NOERR
@@ -1439,8 +1437,8 @@ H5I__find_id_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata)
herr_t
H5I_find_id(const void *object, H5I_type_t type, hid_t *id)
{
- H5I_type_info_t *type_info = NULL; /* Pointer to the type */
- herr_t ret_value = SUCCEED; /* Return value */
+ H5I_type_info_t *type_info = NULL; /* Pointer to the type */
+ herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
@@ -1472,5 +1470,3 @@ H5I_find_id(const void *object, H5I_type_t type, hid_t *id)
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5I_find_id() */
-
-
diff --git a/src/H5Ipkg.h b/src/H5Ipkg.h
index 7fc2668..5d9af13 100644
--- a/src/H5Ipkg.h
+++ b/src/H5Ipkg.h
@@ -71,12 +71,12 @@ typedef struct H5I_id_info_t {
/* Type information structure used */
typedef struct H5I_type_info_t {
- const H5I_class_t *cls; /* Pointer to ID class */
- unsigned init_count; /* # of times this type has been initialized */
- uint64_t id_count; /* Current number of IDs held */
- uint64_t nextid; /* ID to use for the next object */
- H5I_id_info_t * last_id_info; /* Info for most recent ID looked up */
- H5SL_t * ids; /* Pointer to skip list that stores IDs */
+ const H5I_class_t *cls; /* Pointer to ID class */
+ unsigned init_count; /* # of times this type has been initialized */
+ uint64_t id_count; /* Current number of IDs held */
+ uint64_t nextid; /* ID to use for the next object */
+ H5I_id_info_t * last_id_info; /* Info for most recent ID looked up */
+ H5SL_t * ids; /* Pointer to skip list that stores IDs */
} H5I_type_info_t;
/*****************************/
diff --git a/src/H5Ipublic.h b/src/H5Ipublic.h
index f981d2e2..ba5eed0 100644
--- a/src/H5Ipublic.h
+++ b/src/H5Ipublic.h
@@ -33,24 +33,24 @@
* work correctly with it. \endinternal
*/
typedef enum H5I_type_t {
- H5I_UNINIT = (-2), /**< uninitialized type */
- H5I_BADID = (-1), /**< invalid Type */
- H5I_FILE = 1, /**< type ID for File objects */
- H5I_GROUP, /**< type ID for Group objects */
- H5I_DATATYPE, /**< type ID for Datatype objects */
- H5I_DATASPACE, /**< type ID for Dataspace objects */
- H5I_DATASET, /**< type ID for Dataset objects */
- H5I_MAP, /**< type ID for Map objects */
- H5I_ATTR, /**< type ID for Attribute objects */
- H5I_VFL, /**< type ID for virtual file layer */
- H5I_VOL, /**< type ID for virtual object layer */
- H5I_GENPROP_CLS, /**< type ID for generic property list classes */
- H5I_GENPROP_LST, /**< type ID for generic property lists */
- H5I_ERROR_CLASS, /**< type ID for error classes */
- H5I_ERROR_MSG, /**< type ID for error messages */
- H5I_ERROR_STACK, /**< type ID for error stacks */
- H5I_SPACE_SEL_ITER, /**< type ID for dataspace selection iterator */
- H5I_NTYPES /**< number of library types, MUST BE LAST! */
+ H5I_UNINIT = (-2), /**< uninitialized type */
+ H5I_BADID = (-1), /**< invalid Type */
+ H5I_FILE = 1, /**< type ID for File objects */
+ H5I_GROUP, /**< type ID for Group objects */
+ H5I_DATATYPE, /**< type ID for Datatype objects */
+ H5I_DATASPACE, /**< type ID for Dataspace objects */
+ H5I_DATASET, /**< type ID for Dataset objects */
+ H5I_MAP, /**< type ID for Map objects */
+ H5I_ATTR, /**< type ID for Attribute objects */
+ H5I_VFL, /**< type ID for virtual file layer */
+ H5I_VOL, /**< type ID for virtual object layer */
+ H5I_GENPROP_CLS, /**< type ID for generic property list classes */
+ H5I_GENPROP_LST, /**< type ID for generic property lists */
+ H5I_ERROR_CLASS, /**< type ID for error classes */
+ H5I_ERROR_MSG, /**< type ID for error messages */
+ H5I_ERROR_STACK, /**< type ID for error stacks */
+ H5I_SPACE_SEL_ITER, /**< type ID for dataspace selection iterator */
+ H5I_NTYPES /**< number of library types, MUST BE LAST! */
} H5I_type_t;
/* Type of IDs to return to users */
@@ -64,12 +64,12 @@ typedef int64_t hid_t;
/**
* The size of identifiers
*/
-#define H5_SIZEOF_HID_T H5_SIZEOF_INT64_T
+#define H5_SIZEOF_HID_T H5_SIZEOF_INT64_T
/**
* An invalid object ID. This is also negative for error return.
*/
-#define H5I_INVALID_HID (-1)
+#define H5I_INVALID_HID (-1)
/**
* A function for freeing objects. This function will be called with an object
@@ -121,7 +121,7 @@ extern "C" {
* and returned via a call to H5Iobject_verify().
*
*/
-H5_DLL hid_t H5Iregister(H5I_type_t type, const void *object);
+H5_DLL hid_t H5Iregister(H5I_type_t type, const void *object);
/**
* \ingroup H5I
*
@@ -144,7 +144,7 @@ H5_DLL hid_t H5Iregister(H5I_type_t type, const void *object);
* \see H5Iregister()
*
*/
-H5_DLL void * H5Iobject_verify(hid_t id, H5I_type_t id_type);
+H5_DLL void *H5Iobject_verify(hid_t id, H5I_type_t type);
/**
* \ingroup H5I
*
@@ -174,7 +174,7 @@ H5_DLL void * H5Iobject_verify(hid_t id, H5I_type_t id_type);
* to avoid memory leaks.
*
*/
-H5_DLL void * H5Iremove_verify(hid_t id, H5I_type_t id_type);
+H5_DLL void *H5Iremove_verify(hid_t id, H5I_type_t type);
/**
* \ingroup H5I
*
@@ -227,7 +227,7 @@ H5_DLL H5I_type_t H5Iget_type(hid_t id);
* \since 1.6.3
*
*/
-H5_DLL hid_t H5Iget_file_id(hid_t id);
+H5_DLL hid_t H5Iget_file_id(hid_t id);
/**
* \ingroup H5I
*
@@ -269,7 +269,7 @@ H5_DLL hid_t H5Iget_file_id(hid_t id);
* \since 1.6.0
*
*/
-H5_DLL ssize_t H5Iget_name(hid_t id, char *name /*out*/, size_t size);
+H5_DLL ssize_t H5Iget_name(hid_t id, char *name /*out*/, size_t size);
/**
* \ingroup H5I
*
@@ -314,7 +314,7 @@ H5_DLL ssize_t H5Iget_name(hid_t id, char *name /*out*/, size_t size);
* \since 1.6.2
*
*/
-H5_DLL int H5Iinc_ref(hid_t id);
+H5_DLL int H5Iinc_ref(hid_t id);
/**
* \ingroup H5I
*
@@ -360,7 +360,7 @@ H5_DLL int H5Iinc_ref(hid_t id);
* \since 1.6.2
*
*/
-H5_DLL int H5Idec_ref(hid_t id);
+H5_DLL int H5Idec_ref(hid_t id);
/**
* \ingroup H5I
*
@@ -384,7 +384,7 @@ H5_DLL int H5Idec_ref(hid_t id);
* \since 1.6.2
*
*/
-H5_DLL int H5Iget_ref(hid_t id);
+H5_DLL int H5Iget_ref(hid_t id);
/**
* \ingroup H5I
*
@@ -440,7 +440,7 @@ H5_DLL H5I_type_t H5Iregister_type(size_t hash_size, unsigned reserved, H5I_free
* all identifiers of this type will be deleted.
*
*/
-H5_DLL herr_t H5Iclear_type(H5I_type_t type, hbool_t force);
+H5_DLL herr_t H5Iclear_type(H5I_type_t type, hbool_t force);
/**
* \ingroup H5I
*
@@ -463,7 +463,7 @@ H5_DLL herr_t H5Iclear_type(H5I_type_t type, hbool_t force);
* variable holding the value of the destroyed type to #H5I_UNINIT.
*
*/
-H5_DLL herr_t H5Idestroy_type(H5I_type_t type);
+H5_DLL herr_t H5Idestroy_type(H5I_type_t type);
/**
* \ingroup H5I
*
@@ -482,7 +482,7 @@ H5_DLL herr_t H5Idestroy_type(H5I_type_t type);
* been created by a call to H5Iregister_type().
*
*/
-H5_DLL int H5Iinc_type_ref(H5I_type_t type);
+H5_DLL int H5Iinc_type_ref(H5I_type_t type);
/**
* \ingroup H5I
*
@@ -502,7 +502,7 @@ H5_DLL int H5Iinc_type_ref(H5I_type_t type);
* been created by a call to H5Iregister_type().
*
*/
-H5_DLL int H5Idec_type_ref(H5I_type_t type);
+H5_DLL int H5Idec_type_ref(H5I_type_t type);
/**
* \ingroup H5I
*
@@ -521,7 +521,7 @@ H5_DLL int H5Idec_type_ref(H5I_type_t type);
* created by a call to H5Iregister_type().
*
*/
-H5_DLL int H5Iget_type_ref(H5I_type_t type);
+H5_DLL int H5Iget_type_ref(H5I_type_t type);
/**
* \ingroup H5I
*
@@ -562,7 +562,7 @@ H5_DLL int H5Iget_type_ref(H5I_type_t type);
* parameter. It can be used to further define the search at run-time.
*
*/
-H5_DLL void * H5Isearch(H5I_type_t type, H5I_search_func_t func, void *key);
+H5_DLL void *H5Isearch(H5I_type_t type, H5I_search_func_t func, void *key);
/**
* \ingroup H5I
*
@@ -591,7 +591,7 @@ H5_DLL void * H5Isearch(H5I_type_t type, H5I_search_func_t func, void *key);
* \since 1.12.0
*
*/
-H5_DLL herr_t H5Iiterate(H5I_type_t type, H5I_iterate_func_t op, void *op_data);
+H5_DLL herr_t H5Iiterate(H5I_type_t type, H5I_iterate_func_t op, void *op_data);
/**
* \ingroup H5I
*
@@ -611,7 +611,7 @@ H5_DLL herr_t H5Iiterate(H5I_type_t type, H5I_iterate_func_t op, void *op_da
* the value 0.
*
*/
-H5_DLL herr_t H5Inmembers(H5I_type_t type, hsize_t *num_members);
+H5_DLL herr_t H5Inmembers(H5I_type_t type, hsize_t *num_members);
/**
* \ingroup H5I
*
@@ -627,7 +627,7 @@ H5_DLL herr_t H5Inmembers(H5I_type_t type, hsize_t *num_members);
* \since 1.8.0
*
*/
-H5_DLL htri_t H5Itype_exists(H5I_type_t type);
+H5_DLL htri_t H5Itype_exists(H5I_type_t type);
/**
* \ingroup H5I
*
@@ -655,7 +655,7 @@ H5_DLL htri_t H5Itype_exists(H5I_type_t type);
* \since 1.8.3
*
*/
-H5_DLL htri_t H5Iis_valid(hid_t id);
+H5_DLL htri_t H5Iis_valid(hid_t id);
#ifdef __cplusplus
}
diff --git a/src/H5Itest.c b/src/H5Itest.c
index 21c9dac..ea0de2a 100644
--- a/src/H5Itest.c
+++ b/src/H5Itest.c
@@ -11,7 +11,7 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/*
+/*
* H5Itest.c - ID testing functions
*/
diff --git a/src/H5Lpublic.h b/src/H5Lpublic.h
index 14975bc..e930a15 100644
--- a/src/H5Lpublic.h
+++ b/src/H5Lpublic.h
@@ -70,11 +70,11 @@ extern "C" {
* in HDF5 files.
*/
typedef enum {
- H5L_TYPE_ERROR = (-1), /**< Invalid link type id */
- H5L_TYPE_HARD = 0, /**< Hard link id */
- H5L_TYPE_SOFT = 1, /**< Soft link id */
- H5L_TYPE_EXTERNAL = 64, /**< External link id */
- H5L_TYPE_MAX = 255 /**< Maximum link type id */
+ H5L_TYPE_ERROR = (-1), /**< Invalid link type id */
+ H5L_TYPE_HARD = 0, /**< Hard link id */
+ H5L_TYPE_SOFT = 1, /**< Soft link id */
+ H5L_TYPE_EXTERNAL = 64, /**< External link id */
+ H5L_TYPE_MAX = 255 /**< Maximum link type id */
} H5L_type_t;
/**
* \brief Maximum value link value for "built-in" link types
@@ -83,24 +83,24 @@ typedef enum {
/**
* \brief Link ids at or above this value are "user-defined" link types.
*/
-#define H5L_TYPE_UD_MIN H5L_TYPE_EXTERNAL
+#define H5L_TYPE_UD_MIN H5L_TYPE_EXTERNAL
/**
* \brief Maximum link id value for "user-defined" link types.
*/
-#define H5L_TYPE_UD_MAX H5L_TYPE_MAX
+#define H5L_TYPE_UD_MAX H5L_TYPE_MAX
/**
* \brief Information struct for links
*/
//! [H5L_info2_t_snip]
typedef struct {
- H5L_type_t type; /**< Type of link */
- hbool_t corder_valid; /**< Indicate if creation order is valid */
- int64_t corder; /**< Creation order */
- H5T_cset_t cset; /**< Character set of link name */
+ H5L_type_t type; /**< Type of link */
+ hbool_t corder_valid; /**< Indicate if creation order is valid */
+ int64_t corder; /**< Creation order */
+ H5T_cset_t cset; /**< Character set of link name */
union {
- H5O_token_t token; /**< Token of location that hard link points to */
- size_t val_size; /**< Size of a soft link or user-defined link value */
+ H5O_token_t token; /**< Token of location that hard link points to */
+ size_t val_size; /**< Size of a soft link or user-defined link value */
} u;
} H5L_info2_t;
//! [H5L_info2_t_snip]
@@ -113,35 +113,35 @@ typedef struct {
/**
* \brief Link creation callback
*/
-typedef herr_t (*H5L_create_func_t)(const char *link_name, hid_t loc_group,
- const void *lnkdata, size_t lnkdata_size, hid_t lcpl_id);
+typedef herr_t (*H5L_create_func_t)(const char *link_name, hid_t loc_group, const void *lnkdata,
+ size_t lnkdata_size, hid_t lcpl_id);
/**
* \brief Callback for link move
*/
-typedef herr_t (*H5L_move_func_t)(const char *new_name, hid_t new_loc,
- const void *lnkdata, size_t lnkdata_size);
+typedef herr_t (*H5L_move_func_t)(const char *new_name, hid_t new_loc, const void *lnkdata,
+ size_t lnkdata_size);
/**
* \brief Callback for link copy
*/
-typedef herr_t (*H5L_copy_func_t)(const char *new_name, hid_t new_loc,
- const void *lnkdata, size_t lnkdata_size);
+typedef herr_t (*H5L_copy_func_t)(const char *new_name, hid_t new_loc, const void *lnkdata,
+ size_t lnkdata_size);
/**
* \brief Callback during link traversal
*/
-typedef hid_t (*H5L_traverse_func_t)(const char *link_name, hid_t cur_group,
- const void *lnkdata, size_t lnkdata_size, hid_t lapl_id, hid_t dxpl_id);
+typedef hid_t (*H5L_traverse_func_t)(const char *link_name, hid_t cur_group, const void *lnkdata,
+ size_t lnkdata_size, hid_t lapl_id, hid_t dxpl_id);
/**
* \brief Callback for link deletion
*/
-typedef herr_t (*H5L_delete_func_t)(const char *link_name, hid_t file,
- const void *lnkdata, size_t lnkdata_size);
+typedef herr_t (*H5L_delete_func_t)(const char *link_name, hid_t file, const void *lnkdata,
+ size_t lnkdata_size);
/**
* \brief Callback for querying the link.
*
* Returns the size of the buffer needed.
*/
-typedef ssize_t (*H5L_query_func_t)(const char *link_name, const void *lnkdata,
- size_t lnkdata_size, void *buf /*out*/, size_t buf_size);
+typedef ssize_t (*H5L_query_func_t)(const char *link_name, const void *lnkdata, size_t lnkdata_size,
+ void *buf /*out*/, size_t buf_size);
/**
* \brief Link prototype
@@ -152,15 +152,15 @@ typedef ssize_t (*H5L_query_func_t)(const char *link_name, const void *lnkdata,
*/
//! [H5L_class_t_snip]
typedef struct {
- int version; /**< Version number of this struct */
- H5L_type_t id; /**< Link type ID */
- const char *comment; /**< Comment for debugging */
- H5L_create_func_t create_func; /**< Callback during link creation */
- H5L_move_func_t move_func; /**< Callback after moving link */
- H5L_copy_func_t copy_func; /**< Callback after copying link */
- H5L_traverse_func_t trav_func; /**< Callback during link traversal */
- H5L_delete_func_t del_func; /**< Callback for link deletion */
- H5L_query_func_t query_func; /**< Callback for queries */
+ int version; /**< Version number of this struct */
+ H5L_type_t id; /**< Link type ID */
+ const char * comment; /**< Comment for debugging */
+ H5L_create_func_t create_func; /**< Callback during link creation */
+ H5L_move_func_t move_func; /**< Callback after moving link */
+ H5L_copy_func_t copy_func; /**< Callback after copying link */
+ H5L_traverse_func_t trav_func; /**< Callback during link traversal */
+ H5L_delete_func_t del_func; /**< Callback for link deletion */
+ H5L_query_func_t query_func; /**< Callback for queries */
} H5L_class_t;
//! [H5L_class_t_snip]
@@ -170,17 +170,15 @@ typedef struct {
* The H5O_token_t version is used in the VOL layer and future public API calls.
*/
//! [H5L_iterate2_t_snip]
-typedef herr_t (*H5L_iterate2_t)(hid_t group, const char *name, const H5L_info2_t *info,
- void *op_data);
+typedef herr_t (*H5L_iterate2_t)(hid_t group, const char *name, const H5L_info2_t *info, void *op_data);
//! [H5L_iterate2_t_snip]
/**
* \brief Callback for external link traversal
*/
-typedef herr_t (*H5L_elink_traverse_t)(const char *parent_file_name,
- const char *parent_group_name, const char *child_file_name,
- const char *child_object_name, unsigned *acc_flags, hid_t fapl_id,
- void *op_data);
+typedef herr_t (*H5L_elink_traverse_t)(const char *parent_file_name, const char *parent_group_name,
+ const char *child_file_name, const char *child_object_name,
+ unsigned *acc_flags, hid_t fapl_id, void *op_data);
/********************/
/* Public Variables */
@@ -768,7 +766,7 @@ H5_DLL htri_t H5Lexists(hid_t loc_id, const char *name, hid_t lapl_id);
* \since 1.12.0
*
*/
-H5_DLL herr_t H5Lget_info2(hid_t loc_id, const char *name, H5L_info2_t *linfo /*out*/, hid_t lapl_id);
+H5_DLL herr_t H5Lget_info2(hid_t loc_id, const char *name, H5L_info2_t *linfo, hid_t lapl_id);
/**
* \ingroup H5L
*
@@ -823,8 +821,7 @@ H5_DLL herr_t H5Lget_info2(hid_t loc_id, const char *name, H5L_info2_t *linfo /*
*
*/
H5_DLL herr_t H5Lget_info_by_idx2(hid_t loc_id, const char *group_name, H5_index_t idx_type,
- H5_iter_order_t order, hsize_t n, H5L_info2_t *linfo /*out*/,
- hid_t lapl_id);
+ H5_iter_order_t order, hsize_t n, H5L_info2_t *linfo, hid_t lapl_id);
/**
* \ingroup H5L
*
@@ -945,8 +942,8 @@ H5_DLL ssize_t H5Lget_name_by_idx(hid_t loc_id, const char *group_name, H5_index
* \see H5Literate_by_name2(), H5Lvisit2(), H5Lvisit_by_name2()
*
*/
-H5_DLL herr_t H5Literate2(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx,
- H5L_iterate2_t op, void *op_data);
+H5_DLL herr_t H5Literate2(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx,
+ H5L_iterate2_t op, void *op_data);
/**
* \ingroup TRAV
*
@@ -1011,9 +1008,9 @@ H5_DLL herr_t H5Literate2(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t or
* \see H5Literate(), H5Lvisit()
*
*/
-H5_DLL herr_t H5Literate_by_name2(hid_t loc_id, const char *group_name, H5_index_t idx_type,
- H5_iter_order_t order, hsize_t *idx, H5L_iterate2_t op, void *op_data,
- hid_t lapl_id);
+H5_DLL herr_t H5Literate_by_name2(hid_t loc_id, const char *group_name, H5_index_t idx_type,
+ H5_iter_order_t order, hsize_t *idx, H5L_iterate2_t op, void *op_data,
+ hid_t lapl_id);
/**
* \ingroup TRAV
*
@@ -1095,8 +1092,8 @@ H5_DLL herr_t H5Literate_by_name2(hid_t loc_id, const char *group_name, H5_inde
* \see H5Literate()
*
*/
-H5_DLL herr_t H5Lvisit2(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t order, H5L_iterate2_t op,
- void *op_data);
+H5_DLL herr_t H5Lvisit2(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t order, H5L_iterate2_t op,
+ void *op_data);
/**
* \ingroup TRAV
*
@@ -1178,9 +1175,8 @@ H5_DLL herr_t H5Lvisit2(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t orde
* \since 1.12.0
*
*/
-H5_DLL herr_t H5Lvisit_by_name2(hid_t loc_id, const char *group_name, H5_index_t idx_type,
- H5_iter_order_t order, H5L_iterate2_t op, void *op_data, hid_t lapl_id);
-
+H5_DLL herr_t H5Lvisit_by_name2(hid_t loc_id, const char *group_name, H5_index_t idx_type,
+ H5_iter_order_t order, H5L_iterate2_t op, void *op_data, hid_t lapl_id);
/* UD link functions */
/**
* \ingroup H5L
@@ -1611,13 +1607,13 @@ H5_DLL herr_t H5Lcreate_external(const char *file_name, const char *obj_name, hi
/* Information struct for link (for H5Lget_info1/H5Lget_info_by_idx1) */
//! [H5L_info1_t_snip]
typedef struct {
- H5L_type_t type; /**< Type of link */
- hbool_t corder_valid; /**< Indicate if creation order is valid */
- int64_t corder; /**< Creation order */
- H5T_cset_t cset; /**< Character set of link name */
+ H5L_type_t type; /**< Type of link */
+ hbool_t corder_valid; /**< Indicate if creation order is valid */
+ int64_t corder; /**< Creation order */
+ H5T_cset_t cset; /**< Character set of link name */
union {
- haddr_t address; /**< Address hard link points to */
- size_t val_size; /**< Size of a soft link or UD link value */
+ haddr_t address; /**< Address hard link points to */
+ size_t val_size; /**< Size of a soft link or UD link value */
} u;
} H5L_info1_t;
//! [H5L_info1_t_snip]
@@ -1628,21 +1624,20 @@ typedef hid_t (*H5L_traverse_0_func_t)(const char *link_name, hid_t cur_group, c
/** User-defined link types */
typedef struct {
- int version; /**< Version number of this struct */
- H5L_type_t id; /**< Link type ID */
- const char *comment; /**< Comment for debugging */
- H5L_create_func_t create_func; /**< Callback during link creation */
- H5L_move_func_t move_func; /**< Callback after moving link */
- H5L_copy_func_t copy_func; /**< Callback after copying link */
- H5L_traverse_0_func_t trav_func; /**< Callback during link traversal */
- H5L_delete_func_t del_func; /**< Callback for link deletion */
- H5L_query_func_t query_func; /**< Callback for queries */
+ int version; /**< Version number of this struct */
+ H5L_type_t id; /**< Link type ID */
+ const char * comment; /**< Comment for debugging */
+ H5L_create_func_t create_func; /**< Callback during link creation */
+ H5L_move_func_t move_func; /**< Callback after moving link */
+ H5L_copy_func_t copy_func; /**< Callback after copying link */
+ H5L_traverse_0_func_t trav_func; /**< Callback during link traversal */
+ H5L_delete_func_t del_func; /**< Callback for link deletion */
+ H5L_query_func_t query_func; /**< Callback for queries */
} H5L_class_0_t;
/** Prototype for H5Literate1() / H5Literate_by_name1() operator */
//! [H5L_iterate1_t_snip]
-typedef herr_t (*H5L_iterate1_t)(hid_t group, const char *name, const H5L_info1_t *info,
- void *op_data);
+typedef herr_t (*H5L_iterate1_t)(hid_t group, const char *name, const H5L_info1_t *info, void *op_data);
//! [H5L_iterate1_t_snip]
/* Function prototypes */
diff --git a/src/H5M.c b/src/H5M.c
index 34d0105..f804183 100644
--- a/src/H5M.c
+++ b/src/H5M.c
@@ -38,7 +38,6 @@
/********************/
/* Local Prototypes */
/********************/
-
static herr_t H5M__close_cb(H5VL_object_t *map_vol_obj);
/*********************/
@@ -873,7 +872,7 @@ H5Miterate(hid_t map_id, hsize_t *idx, hid_t key_mem_type_id, H5M_iterate_t op,
/* Iterate over keys */
if ((ret_value = H5VL_optional(vol_obj, H5VL_MAP_SPECIFIC, dxpl_id, H5_REQUEST_NULL, &loc_params,
H5VL_MAP_ITER, idx, key_mem_type_id, op, op_data)) < 0)
- HGOTO_ERROR(H5E_MAP, H5E_BADITER, ret_value, "unable to ierate over keys")
+ HGOTO_ERROR(H5E_MAP, H5E_BADITER, ret_value, "unable to iterate over keys")
done:
FUNC_LEAVE_API(ret_value)
diff --git a/src/H5MF.c b/src/H5MF.c
index 2fe78a3..d4c79df 100644
--- a/src/H5MF.c
+++ b/src/H5MF.c
@@ -1202,7 +1202,7 @@ H5MF_xfree(H5F_t *f, H5FD_mem_t alloc_type, haddr_t addr, hsize_t size)
#ifdef H5MF_ALLOC_DEBUG_MORE
HDfprintf(stderr, "%s: After H5FS_sect_add()\n", FUNC);
#endif /* H5MF_ALLOC_DEBUG_MORE */
- } /* end if */
+ } /* end if */
else {
htri_t merged; /* Whether node was merged */
H5MF_sect_ud_t udata; /* User data for callback */
@@ -1369,7 +1369,7 @@ H5MF_try_extend(H5F_t *f, H5FD_mem_t alloc_type, haddr_t addr, hsize_t size, hsi
#ifdef H5MF_ALLOC_DEBUG_MORE
HDfprintf(stderr, "%s: H5MF__aggr_try_extend = %t\n", FUNC, ret_value);
-#endif /* H5MF_ALLOC_DEBUG_MORE */
+#endif /* H5MF_ALLOC_DEBUG_MORE */
} /* end if */
/* If no extension so far, try to extend into a free-space section */
@@ -1395,7 +1395,7 @@ H5MF_try_extend(H5F_t *f, H5FD_mem_t alloc_type, haddr_t addr, hsize_t size, hsi
"error extending block in free space manager")
#ifdef H5MF_ALLOC_DEBUG_MORE
HDfprintf(stderr, "%s: Try to H5FS_sect_try_extend = %t\n", FUNC, ret_value);
-#endif /* H5MF_ALLOC_DEBUG_MORE */
+#endif /* H5MF_ALLOC_DEBUG_MORE */
} /* end if */
/* For paged aggregation and a metadata block: try to extend into page end threshold */
@@ -1406,7 +1406,7 @@ H5MF_try_extend(H5F_t *f, H5FD_mem_t alloc_type, haddr_t addr, hsize_t size, hsi
ret_value = TRUE;
#ifdef H5MF_ALLOC_DEBUG_MORE
HDfprintf(stderr, "%s: Try to extend into the page end threshold = %t\n", FUNC, ret_value);
-#endif /* H5MF_ALLOC_DEBUG_MORE */
+#endif /* H5MF_ALLOC_DEBUG_MORE */
} /* end if */
} /* end if */
} /* allow_extend */
@@ -2944,7 +2944,7 @@ H5MF_settle_raw_data_fsm(H5F_t *f, hbool_t *fsm_settled)
HDassert(fs_stat.serial_sect_count > 0);
HDassert(fs_stat.alloc_sect_size > 0);
HDassert(fs_stat.alloc_sect_size == fs_stat.sect_size);
-#endif /* NDEBUG */
+#endif /* NDEBUG */
} /* end if */
else {
HDassert(!H5F_addr_defined(fs_stat.addr));
diff --git a/src/H5MFsection.c b/src/H5MFsection.c
index 597da76..473c1dc 100644
--- a/src/H5MFsection.c
+++ b/src/H5MFsection.c
@@ -648,7 +648,7 @@ H5MF__sect_small_add(H5FS_section_info_t **_sect, unsigned *flags, void *_udata)
#ifdef H5MF_ALLOC_DEBUG_MORE
HDfprintf(stderr, "%s: section is dropped\n", FUNC);
#endif /* H5MF_ALLOC_DEBUG_MORE */
- } /* end if */
+ } /* end if */
/* Adjust the section if it is not at page end but its size + prem is at page end */
else if (prem <= H5F_PGEND_META_THRES(udata->f)) {
(*sect)->sect_info.size += prem;
@@ -656,7 +656,7 @@ H5MF__sect_small_add(H5FS_section_info_t **_sect, unsigned *flags, void *_udata)
HDfprintf(stderr, "%s: section is adjusted {%a, %Hu}\n", FUNC, (*sect)->sect_info.addr,
(*sect)->sect_info.size);
#endif /* H5MF_ALLOC_DEBUG_MORE */
- } /* end if */
+ } /* end if */
done:
FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5MM.c b/src/H5MM.c
index 7b49c72..ca358bf 100644
--- a/src/H5MM.c
+++ b/src/H5MM.c
@@ -52,8 +52,7 @@
/* Memory allocation "block", wrapped around each allocation */
struct H5MM_block_t; /* Forward declaration for typedef */
typedef struct H5MM_block_t {
- unsigned char
- sig[H5MM_SIG_SIZE]; /* Signature for the block, to indicate it was allocated with H5MM* interface */
+ unsigned char sig[H5MM_SIG_SIZE]; /* Signature for the block, to indicate it was allocated with H5MM* interface */
struct H5MM_block_t *next; /* Pointer to next block in the list of allocated blocks */
struct H5MM_block_t *prev; /* Pointer to previous block in the list of allocated blocks */
union {
@@ -70,7 +69,7 @@ typedef struct H5MM_block_t {
/********************/
/* Local Prototypes */
/********************/
-#if defined H5_MEMORY_ALLOC_SANITY_CHECK
+#if defined H5_MEMORY_ALLOC_SANITY_CHECK
static hbool_t H5MM__is_our_block(void *mem);
static void H5MM__sanity_check_block(const H5MM_block_t *block);
static void H5MM__sanity_check(void *mem);
@@ -271,7 +270,7 @@ H5MM_malloc(size_t size)
H5MM_block_head_s.u.info.in_use = TRUE;
H5MM_init_s = TRUE;
- } /* end if */
+ } /* end if */
#endif /* H5_MEMORY_ALLOC_SANITY_CHECK */
if (size) {
@@ -309,10 +308,10 @@ H5MM_malloc(size_t size)
} /* end if */
else
ret_value = NULL;
-#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
+#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
ret_value = HDmalloc(size);
#endif /* H5_MEMORY_ALLOC_SANITY_CHECK */
- } /* end if */
+ } /* end if */
else
ret_value = NULL;
@@ -352,10 +351,10 @@ H5MM_calloc(size_t size)
#if defined H5_MEMORY_ALLOC_SANITY_CHECK
if (NULL != (ret_value = H5MM_malloc(size)))
HDmemset(ret_value, 0, size);
-#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
+#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
ret_value = HDcalloc((size_t)1, size);
#endif /* H5_MEMORY_ALLOC_SANITY_CHECK */
- } /* end if */
+ } /* end if */
else
ret_value = NULL;
@@ -417,14 +416,14 @@ H5MM_realloc(void *mem, size_t size)
}
else
ret_value = H5MM_xfree(mem);
-#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
+#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
ret_value = HDrealloc(mem, size);
/* Some platforms do not return NULL if size is zero. */
if (0 == size)
ret_value = NULL;
#endif /* H5_MEMORY_ALLOC_SANITY_CHECK */
- } /* end else */
+ } /* end else */
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5MM_realloc() */
@@ -542,10 +541,10 @@ H5MM_xfree(void *mem)
}
else
HDfree(mem);
-#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
+#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
HDfree(mem);
#endif /* H5_MEMORY_ALLOC_SANITY_CHECK */
- } /* end if */
+ } /* end if */
FUNC_LEAVE_NOAPI(NULL)
} /* end H5MM_xfree() */
@@ -642,8 +641,8 @@ H5MM_get_alloc_stats(H5_alloc_stats_t *stats)
stats->total_alloc_blocks_count = H5MM_total_alloc_blocks_count_s;
stats->curr_alloc_blocks_count = H5MM_curr_alloc_blocks_count_s;
stats->peak_alloc_blocks_count = H5MM_peak_alloc_blocks_count_s;
- } /* end if */
-#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
+ } /* end if */
+#else /* H5_MEMORY_ALLOC_SANITY_CHECK */
if (stats)
HDmemset(stats, 0, sizeof(H5_alloc_stats_t));
#endif /* H5_MEMORY_ALLOC_SANITY_CHECK */
diff --git a/src/H5MMprivate.h b/src/H5MMprivate.h
index d957686..7c34a98 100644
--- a/src/H5MMprivate.h
+++ b/src/H5MMprivate.h
@@ -48,7 +48,7 @@ H5_DLL void * H5MM_xfree(void *mem);
H5_DLL void * H5MM_xfree_const(const void *mem);
H5_DLL void * H5MM_memcpy(void *dest, const void *src, size_t n);
H5_DLL herr_t H5MM_get_alloc_stats(H5_alloc_stats_t *stats);
-#if defined H5_MEMORY_ALLOC_SANITY_CHECK
+#if defined H5_MEMORY_ALLOC_SANITY_CHECK
H5_DLL void H5MM_sanity_check_all(void);
H5_DLL void H5MM_final_sanity_check(void);
#endif /* H5_MEMORY_ALLOC_SANITY_CHECK */
diff --git a/src/H5Ocache.c b/src/H5Ocache.c
index 778e77e..a2ca561 100644
--- a/src/H5Ocache.c
+++ b/src/H5Ocache.c
@@ -995,10 +995,10 @@ H5O__cache_chk_notify(H5AC_notify_action_t action, void *_thing)
default:
#ifdef NDEBUG
HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL, "unknown action from metadata cache")
-#else /* NDEBUG */
+#else /* NDEBUG */
HDassert(0 && "Unknown action?!?");
#endif /* NDEBUG */
- } /* end switch */
+ } /* end switch */
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -1284,7 +1284,7 @@ H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image
unsigned chunkno; /* Current chunk's index */
#ifndef NDEBUG
unsigned nullcnt; /* Count of null messages (for sanity checking gaps in chunks) */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
hbool_t mesgs_modified =
FALSE; /* Whether any messages were modified when the object header was deserialized */
herr_t ret_value = SUCCEED; /* Return value */
diff --git a/src/H5Odtype.c b/src/H5Odtype.c
index c8cd954..b6e986d 100644
--- a/src/H5Odtype.c
+++ b/src/H5Odtype.c
@@ -81,7 +81,7 @@ static herr_t H5O__dtype_debug(H5F_t *f, const void *_mesg, FILE *stream, int in
if (H5T__upgrade_version((DT), (VERS)) < 0) \
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "can't upgrade " CLASS " encoding version") \
*(IOF) |= H5O_DECODEIO_DIRTY; \
- } /* end if */
+ } /* end if */
#endif /* H5_STRICT_FORMAT_CHECKS */
/* This message derives from H5O message class */
diff --git a/src/H5Oint.c b/src/H5Oint.c
index a49e71b..066910f 100644
--- a/src/H5Oint.c
+++ b/src/H5Oint.c
@@ -102,25 +102,25 @@ const H5O_msg_class_t *const H5O_msg_class_g[] = {
H5O_MSG_LAYOUT, /*0x0008 Data Layout */
#ifdef H5O_ENABLE_BOGUS
H5O_MSG_BOGUS_VALID, /*0x0009 "Bogus valid" (for testing) */
-#else /* H5O_ENABLE_BOGUS */
+#else /* H5O_ENABLE_BOGUS */
NULL, /*0x0009 "Bogus valid" (for testing) */
-#endif /* H5O_ENABLE_BOGUS */
- H5O_MSG_GINFO, /*0x000A Group information */
- H5O_MSG_PLINE, /*0x000B Data storage -- filter pipeline */
- H5O_MSG_ATTR, /*0x000C Attribute */
- H5O_MSG_NAME, /*0x000D Object name */
- H5O_MSG_MTIME, /*0x000E Object modification date and time */
- H5O_MSG_SHMESG, /*0x000F File-wide shared message table */
- H5O_MSG_CONT, /*0x0010 Object header continuation */
- H5O_MSG_STAB, /*0x0011 Symbol table */
- H5O_MSG_MTIME_NEW, /*0x0012 New Object modification date and time */
- H5O_MSG_BTREEK, /*0x0013 Non-default v1 B-tree 'K' values */
- H5O_MSG_DRVINFO, /*0x0014 Driver info settings */
- H5O_MSG_AINFO, /*0x0015 Attribute information */
- H5O_MSG_REFCOUNT, /*0x0016 Object's ref. count */
- H5O_MSG_FSINFO, /*0x0017 Free-space manager info */
- H5O_MSG_MDCI, /*0x0018 Metadata cache image */
- H5O_MSG_UNKNOWN /*0x0019 Placeholder for unknown message */
+#endif /* H5O_ENABLE_BOGUS */
+ H5O_MSG_GINFO, /*0x000A Group information */
+ H5O_MSG_PLINE, /*0x000B Data storage -- filter pipeline */
+ H5O_MSG_ATTR, /*0x000C Attribute */
+ H5O_MSG_NAME, /*0x000D Object name */
+ H5O_MSG_MTIME, /*0x000E Object modification date and time */
+ H5O_MSG_SHMESG, /*0x000F File-wide shared message table */
+ H5O_MSG_CONT, /*0x0010 Object header continuation */
+ H5O_MSG_STAB, /*0x0011 Symbol table */
+ H5O_MSG_MTIME_NEW, /*0x0012 New Object modification date and time */
+ H5O_MSG_BTREEK, /*0x0013 Non-default v1 B-tree 'K' values */
+ H5O_MSG_DRVINFO, /*0x0014 Driver info settings */
+ H5O_MSG_AINFO, /*0x0015 Attribute information */
+ H5O_MSG_REFCOUNT, /*0x0016 Object's ref. count */
+ H5O_MSG_FSINFO, /*0x0017 Free-space manager info */
+ H5O_MSG_MDCI, /*0x0018 Metadata cache image */
+ H5O_MSG_UNKNOWN /*0x0019 Placeholder for unknown message */
};
/* Format version bounds for object header */
@@ -1075,7 +1075,7 @@ H5O_protect(const H5O_loc_t *loc, unsigned prot_flags, hbool_t pin_all_chunks)
H5O_chunk_proxy_t *chk_proxy; /* Proxy for chunk, to bring it into memory */
#ifndef NDEBUG
size_t chkcnt = oh->nchunks; /* Count of chunks (for sanity checking) */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
/* Bring the chunk into the cache */
/* (which adds to the object header) */
@@ -1123,7 +1123,7 @@ H5O_protect(const H5O_loc_t *loc, unsigned prot_flags, hbool_t pin_all_chunks)
(oh->nmesgs + udata.common.merged_null_msgs) != udata.v1_pfx_nmesgs)
HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "corrupt object header - incorrect # of messages")
#endif /* H5_STRICT_FORMAT_CHECKS */
- } /* end if */
+ } /* end if */
#ifdef H5O_DEBUG
H5O__assert(oh);
diff --git a/src/H5Opkg.h b/src/H5Opkg.h
index eece6b0..fac5269 100644
--- a/src/H5Opkg.h
+++ b/src/H5Opkg.h
@@ -277,10 +277,10 @@ struct H5O_t {
/* (This is to simulate a bug in earlier
* versions of the library)
*/
-#endif /* H5O_ENABLE_BAD_MESG_COUNT */
+#endif /* H5O_ENABLE_BAD_MESG_COUNT */
#ifndef NDEBUG
size_t ndecode_dirtied; /* Number of messages dirtied by decoding */
-#endif /* NDEBUG */
+#endif /* NDEBUG */
/* Chunk management information (not stored) */
size_t rc; /* Reference count of [continuation] chunks using this structure */
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h
index 7638666..8e338cc 100644
--- a/src/H5Oprivate.h
+++ b/src/H5Oprivate.h
@@ -29,22 +29,22 @@ typedef struct H5O_t H5O_t;
typedef struct H5O_fill_t H5O_fill_t;
/* Include the public header file for this API */
-#include "H5Opublic.h" /* Object header functions */
+#include "H5Opublic.h" /* Object header functions */
/* Public headers needed by this file */
-#include "H5Dpublic.h" /* Dataset functions */
-#include "H5Lpublic.h" /* Link functions */
-#include "H5Spublic.h" /* Dataspace functions */
+#include "H5Dpublic.h" /* Dataset functions */
+#include "H5Lpublic.h" /* Link functions */
+#include "H5Spublic.h" /* Dataspace functions */
/* Private headers needed by this file */
-#include "H5private.h" /* Generic Functions */
-#include "H5ACprivate.h" /* Metadata cache */
+#include "H5private.h" /* Generic Functions */
+#include "H5ACprivate.h" /* Metadata cache */
#include "H5Fprivate.h" /* File access */
-#include "H5HGprivate.h" /* Global Heaps */
+#include "H5HGprivate.h" /* Global Heaps */
#include "H5SLprivate.h" /* Skip lists */
#include "H5Tprivate.h" /* Datatype functions */
-#include "H5VLprivate.h"
-#include "H5Zprivate.h" /* I/O pipeline filters */
+#include "H5VLprivate.h" /* Virtual Object Layer */
+#include "H5Zprivate.h" /* I/O pipeline filters */
/* Forward references of package typedefs */
typedef struct H5O_msg_class_t H5O_msg_class_t;
diff --git a/src/H5Oshared.h b/src/H5Oshared.h
index aafa069..a8f76aa 100644
--- a/src/H5Oshared.h
+++ b/src/H5Oshared.h
@@ -72,10 +72,10 @@ H5O_SHARED_DECODE(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags, unsigned *iofla
#ifdef H5_STRICT_FORMAT_CHECKS
if (*ioflags & H5O_DECODEIO_DIRTY)
HGOTO_ERROR(H5E_OHDR, H5E_UNSUPPORTED, NULL, "unable to mark shared message dirty")
-#else /* H5_STRICT_FORMAT_CHECKS */
+#else /* H5_STRICT_FORMAT_CHECKS */
*ioflags &= ~H5O_DECODEIO_DIRTY;
#endif /* H5_STRICT_FORMAT_CHECKS */
- } /* end if */
+ } /* end if */
else {
/* Decode native message directly */
if (NULL == (ret_value = H5O_SHARED_DECODE_REAL(f, open_oh, mesg_flags, ioflags, p_size, p)))
@@ -237,7 +237,7 @@ H5O_SHARED_DELETE(H5F_t *f, H5O_t *open_oh, void *_mesg)
/* Decrement the reference count on the native message directly */
if (H5O_SHARED_DELETE_REAL(f, open_oh, _mesg) < 0)
HGOTO_ERROR(H5E_OHDR, H5E_CANTDEC, FAIL, "unable to decrement ref count for native message")
- } /* end else */
+ } /* end else */
#endif /* H5O_SHARED_DELETE_REAL */
done:
@@ -288,7 +288,7 @@ H5O_SHARED_LINK(H5F_t *f, H5O_t *open_oh, void *_mesg)
/* Increment the reference count on the native message directly */
if (H5O_SHARED_LINK_REAL(f, open_oh, _mesg) < 0)
HGOTO_ERROR(H5E_OHDR, H5E_CANTINC, FAIL, "unable to increment ref count for native message")
- } /* end else */
+ } /* end else */
#endif /* H5O_SHARED_LINK_REAL */
done:
@@ -333,7 +333,7 @@ H5O_SHARED_COPY_FILE(H5F_t *file_src, void *_native_src, H5F_t *file_dst, hbool_
if (NULL == (dst_mesg = H5O_SHARED_COPY_FILE_REAL(file_src, H5O_SHARED_TYPE, _native_src, file_dst,
recompute_size, cpy_info, udata)))
HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, NULL, "unable to copy native message to another file")
-#else /* H5O_SHARED_COPY_FILE_REAL */
+#else /* H5O_SHARED_COPY_FILE_REAL */
/* No copy file callback defined, just copy the message itself */
if (NULL == (dst_mesg = (H5O_SHARED_TYPE->copy)(_native_src, NULL)))
HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, NULL, "unable to copy native message")
diff --git a/src/H5PLpath.c b/src/H5PLpath.c
index 3879dc6..ff4dc0e 100644
--- a/src/H5PLpath.c
+++ b/src/H5PLpath.c
@@ -693,7 +693,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5PL__find_plugin_in_path() */
-#else /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
static herr_t
H5PL__find_plugin_in_path(const H5PL_search_params_t *search_params, hbool_t *found, const char *dir,
const void **plugin_info)
diff --git a/src/H5PLpublic.h b/src/H5PLpublic.h
index b345188..a08c78d 100644
--- a/src/H5PLpublic.h
+++ b/src/H5PLpublic.h
@@ -89,7 +89,7 @@ extern "C" {
* \since 1.8.15
*
*/
-H5_DLL herr_t H5PLset_loading_state(unsigned int plugin_control_mask);
+H5_DLL herr_t H5PLset_loading_state(unsigned int plugin_control_mask);
/**
* \ingroup H5PL
* \brief Queries the loadability of dynamic plugin types
@@ -114,7 +114,7 @@ H5_DLL herr_t H5PLset_loading_state(unsigned int plugin_control_mask);
* \since 1.8.15
*
*/
-H5_DLL herr_t H5PLget_loading_state(unsigned int *plugin_control_mask /*out*/);
+H5_DLL herr_t H5PLget_loading_state(unsigned int *plugin_control_mask /*out*/);
/**
* \ingroup H5PL
* \brief Inserts a plugin path at the end of the plugin search path list
@@ -127,7 +127,7 @@ H5_DLL herr_t H5PLget_loading_state(unsigned int *plugin_control_mask /*out*/);
* \since 1.10.1
*
*/
-H5_DLL herr_t H5PLappend(const char *search_path);
+H5_DLL herr_t H5PLappend(const char *search_path);
/**
* \ingroup H5PL
* \brief Inserts a plugin path at the beginning of the plugin search path list
@@ -140,7 +140,7 @@ H5_DLL herr_t H5PLappend(const char *search_path);
* \since 1.10.1
*
*/
-H5_DLL herr_t H5PLprepend(const char *search_path);
+H5_DLL herr_t H5PLprepend(const char *search_path);
/**
* \ingroup H5PL
* \brief Replaces the path at the specified index in the plugin search path list
@@ -154,7 +154,7 @@ H5_DLL herr_t H5PLprepend(const char *search_path);
* \since 1.10.1
*
*/
-H5_DLL herr_t H5PLreplace(const char *search_path, unsigned int index);
+H5_DLL herr_t H5PLreplace(const char *search_path, unsigned int index);
/**
* \ingroup H5PL
* \brief Inserts a path at the specified index in the plugin search path list
@@ -169,7 +169,7 @@ H5_DLL herr_t H5PLreplace(const char *search_path, unsigned int index);
* \since 1.10.1
*
*/
-H5_DLL herr_t H5PLinsert(const char *search_path, unsigned int index);
+H5_DLL herr_t H5PLinsert(const char *search_path, unsigned int index);
/**
* \ingroup H5PL
* \brief Removes a plugin path at a specified index from the plugin search path list
@@ -183,7 +183,7 @@ H5_DLL herr_t H5PLinsert(const char *search_path, unsigned int index);
* \since 1.10.1
*
*/
-H5_DLL herr_t H5PLremove(unsigned int index);
+H5_DLL herr_t H5PLremove(unsigned int index);
/**
* \ingroup H5PL
* \brief Queries the plugin search path list at the specified index
@@ -220,7 +220,7 @@ H5_DLL ssize_t H5PLget(unsigned int index, char *path_buf /*out*/, size_t buf_si
* \since 1.10.1
*
*/
-H5_DLL herr_t H5PLsize(unsigned int *num_paths /*out*/);
+H5_DLL herr_t H5PLsize(unsigned int *num_paths /*out*/);
#ifdef __cplusplus
}
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c
index 8c525e5..418d5e3 100644
--- a/src/H5Pdcpl.c
+++ b/src/H5Pdcpl.c
@@ -313,7 +313,7 @@ static const H5O_layout_t H5D_def_layout_compact_g = H5D_DEF_LAYOUT_COMPACT;
static const H5O_layout_t H5D_def_layout_contig_g = H5D_DEF_LAYOUT_CONTIG;
static const H5O_layout_t H5D_def_layout_chunk_g = H5D_DEF_LAYOUT_CHUNK;
static const H5O_layout_t H5D_def_layout_virtual_g = H5D_DEF_LAYOUT_VIRTUAL;
-#else /* H5_HAVE_C99_DESIGNATED_INITIALIZER */
+#else /* H5_HAVE_C99_DESIGNATED_INITIALIZER */
static H5O_layout_t H5D_def_layout_compact_g = H5D_DEF_LAYOUT_COMPACT;
static H5O_layout_t H5D_def_layout_contig_g = H5D_DEF_LAYOUT_CONTIG;
static H5O_layout_t H5D_def_layout_chunk_g = H5D_DEF_LAYOUT_CHUNK;
diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index f9a730d..09ff894 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -493,7 +493,7 @@ static const hbool_t H5F_def_coll_md_write_flag_g =
H5F_ACS_COLL_MD_WRITE_FLAG_DEF; /* Default setting for the collective metedata write flag */
static const MPI_Comm H5F_def_mpi_params_comm_g = H5F_ACS_MPI_PARAMS_COMM_DEF; /* Default MPI communicator */
static const MPI_Info H5F_def_mpi_params_info_g = H5F_ACS_MPI_PARAMS_INFO_DEF; /* Default MPI info struct */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
static const H5AC_cache_image_config_t H5F_def_mdc_initCacheImageCfg_g =
H5F_ACS_META_CACHE_INIT_IMAGE_CONFIG_DEF; /* Default metadata cache image settings */
static const size_t H5F_def_page_buf_size_g = H5F_ACS_PAGE_BUFFER_SIZE_DEF; /* Default page buffer size */
@@ -1816,23 +1816,22 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5Pget_mdc_image_config(hid_t plist_id, H5AC_cache_image_config_t *config_ptr)
+H5Pget_mdc_image_config(hid_t plist_id, H5AC_cache_image_config_t *config)
{
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* return value */
FUNC_ENTER_API(FAIL)
- H5TRACE2("e", "i*x", plist_id, config_ptr);
+ H5TRACE2("e", "i*x", plist_id, config);
/* Get the plist structure */
if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
- /* validate the config_ptr */
- if (config_ptr == NULL)
- HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL config_ptr on entry.")
-
- if (config_ptr->version != H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION)
+ /* validate the config ptr */
+ if (config == NULL)
+ HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL config ptr on entry.")
+ if (config->version != H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Unknown image config version.")
/* If we ever support multiple versions of H5AC_cache_config_t, we
@@ -1841,7 +1840,7 @@ H5Pget_mdc_image_config(hid_t plist_id, H5AC_cache_image_config_t *config_ptr)
*/
/* Get the current initial metadata cache resize configuration */
- if (H5P_get(plist, H5F_ACS_META_CACHE_INIT_IMAGE_CONFIG_NAME, config_ptr) < 0)
+ if (H5P_get(plist, H5F_ACS_META_CACHE_INIT_IMAGE_CONFIG_NAME, config) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get metadata cache initial image config")
done:
@@ -1897,7 +1896,7 @@ done:
* Purpose: Retrieve the metadata cache initial resize configuration
* from the target FAPL.
*
- * Observe that the function will fail if config_ptr is
+ * Observe that the function will fail if config is
* NULL, or if config_ptr->version specifies an unknown
* version of H5AC_cache_config_t.
*
@@ -1909,23 +1908,22 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5Pget_mdc_config(hid_t plist_id, H5AC_cache_config_t *config_ptr)
+H5Pget_mdc_config(hid_t plist_id, H5AC_cache_config_t *config)
{
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* return value */
FUNC_ENTER_API(FAIL)
- H5TRACE2("e", "i*x", plist_id, config_ptr);
+ H5TRACE2("e", "i*x", plist_id, config);
/* Get the plist structure */
if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
- /* validate the config_ptr */
- if (config_ptr == NULL)
- HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL config_ptr on entry.")
-
- if (config_ptr->version != H5AC__CURR_CACHE_CONFIG_VERSION)
+ /* validate the config ptr */
+ if (config == NULL)
+ HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL config ptr on entry.")
+ if (config->version != H5AC__CURR_CACHE_CONFIG_VERSION)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Unknown config version.")
/* If we ever support multiple versions of H5AC_cache_config_t, we
@@ -1934,7 +1932,7 @@ H5Pget_mdc_config(hid_t plist_id, H5AC_cache_config_t *config_ptr)
*/
/* Get the current initial metadata cache resize configuration */
- if (H5P_get(plist, H5F_ACS_META_CACHE_INIT_CONFIG_NAME, config_ptr) < 0)
+ if (H5P_get(plist, H5F_ACS_META_CACHE_INIT_CONFIG_NAME, config) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get metadata cache initial resize config")
done:
@@ -2438,7 +2436,6 @@ H5Pset_libver_bounds(hid_t plist_id, H5F_libver_t low, H5F_libver_t high)
/* Check args */
if (low < 0 || low > H5F_LIBVER_LATEST)
HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "low bound is not valid")
-
if (high < 0 || high > H5F_LIBVER_LATEST)
HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "high bound is not valid")
@@ -2490,15 +2487,13 @@ H5Pget_libver_bounds(hid_t plist_id, H5F_libver_t *low /*out*/, H5F_libver_t *hi
HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
/* Get values */
- if (low) {
+ if (low)
if (H5P_get(plist, H5F_ACS_LIBVER_LOW_BOUND_NAME, low) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get low bound for library format versions")
- }
- if (high) {
+ if (high)
if (H5P_get(plist, H5F_ACS_LIBVER_HIGH_BOUND_NAME, high) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get high bound for library format versions")
- }
done:
FUNC_LEAVE_API(ret_value)
@@ -2663,22 +2658,22 @@ done:
/*-------------------------------------------------------------------------
* Function: H5Pget_file_image
*
- * Purpose: If the file image exists and buf_ptr_ptr is not NULL,
+ * Purpose: If the file image exists and buf is not NULL,
* allocate a buffer of the correct size, copy the image into
* the new buffer, and return the buffer to the caller in
- * *buf_ptr_ptr. Do this using the file image callbacks
+ * *buf. Do this using the file image callbacks
* if defined.
*
* NB: It is the responsibility of the caller to free the
- * buffer whose address is returned in *buf_ptr_ptr. Do
+ * buffer whose address is returned in *buf. Do
* this using free if the file image callbacks are not
* defined, or with whatever method is appropriate if
* the callbacks are defined.
*
- * If buf_ptr_ptr is not NULL, and no image exists, set
- * *buf_ptr_ptr to NULL.
+ * If buf is not NULL, and no image exists, set
+ * *buf to NULL.
*
- * If buf_len_ptr is not NULL, set *buf_len_ptr equal
+ * If buf_len is not NULL, set *buf_len equal
* to the length of the file image if it exists, and
* to 0 if it does not.
*
@@ -2690,14 +2685,14 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5Pget_file_image(hid_t fapl_id, void **buf_ptr_ptr, size_t *buf_len_ptr)
+H5Pget_file_image(hid_t fapl_id, void **buf, size_t *buf_len)
{
H5P_genplist_t * fapl; /* Property list pointer */
H5FD_file_image_info_t image_info; /* File image info */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(FAIL)
- H5TRACE3("e", "i**x*z", fapl_id, buf_ptr_ptr, buf_len_ptr);
+ H5TRACE3("e", "i**x*z", fapl_id, buf, buf_len);
/* Get the plist structure */
if (NULL == (fapl = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
@@ -2712,11 +2707,11 @@ H5Pget_file_image(hid_t fapl_id, void **buf_ptr_ptr, size_t *buf_len_ptr)
((image_info.buffer == NULL) && (image_info.size == 0)));
/* Set output size */
- if (buf_len_ptr != NULL)
- *buf_len_ptr = image_info.size;
+ if (buf_len != NULL)
+ *buf_len = image_info.size;
/* Duplicate the image if desired, using callbacks if available */
- if (buf_ptr_ptr != NULL) {
+ if (buf != NULL) {
void *copy_ptr = NULL; /* Copy of memory image */
if (image_info.buffer != NULL) {
@@ -2741,7 +2736,7 @@ H5Pget_file_image(hid_t fapl_id, void **buf_ptr_ptr, size_t *buf_len_ptr)
H5MM_memcpy(copy_ptr, image_info.buffer, image_info.size);
} /* end if */
- *buf_ptr_ptr = copy_ptr;
+ *buf = copy_ptr;
} /* end if */
done:
@@ -2826,7 +2821,7 @@ done:
} /* end H5Pset_file_image_callbacks() */
/*-------------------------------------------------------------------------
- * Function: H5Pget_file_image_callbacks
+ * Function: H5Pget_file_image_callbacks
*
* Purpose: Sets the callbacks for file images. Some file drivers allow
* the use of user-defined callbacks for allocating, freeing and
@@ -2841,14 +2836,14 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5Pget_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callbacks_ptr)
+H5Pget_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callbacks)
{
H5P_genplist_t * fapl; /* Property list pointer */
H5FD_file_image_info_t info; /* File image info */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(FAIL)
- H5TRACE2("e", "i*x", fapl_id, callbacks_ptr);
+ H5TRACE2("e", "i*x", fapl_id, callbacks);
/* Get the plist structure */
if (NULL == (fapl = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
@@ -2861,17 +2856,17 @@ H5Pget_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callback
/* verify file image field consistency */
HDassert(((info.buffer != NULL) && (info.size > 0)) || ((info.buffer == NULL) && (info.size == 0)));
- /* verify that callbacks_ptr is not NULL */
- if (NULL == callbacks_ptr)
- HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL callbacks_ptr")
+ /* verify that callbacks is not NULL */
+ if (NULL == callbacks)
+ HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL callbacks ptr")
/* Transfer values to parameters */
- *callbacks_ptr = info.callbacks;
+ *callbacks = info.callbacks;
/* Copy udata if it exists */
if (info.callbacks.udata != NULL) {
HDassert(info.callbacks.udata_copy);
- if ((callbacks_ptr->udata = info.callbacks.udata_copy(info.callbacks.udata)) == 0)
+ if ((callbacks->udata = info.callbacks.udata_copy(info.callbacks.udata)) == 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't copy udata")
} /* end if */
@@ -4309,7 +4304,7 @@ H5Pget_mdc_log_options(hid_t plist_id, hbool_t *is_enabled, char *location, size
*location_size = HDstrlen(location_ptr) + 1;
else
*location_size = 0;
- }
+ } /* end if */
done:
FUNC_LEAVE_API(ret_value)
diff --git a/src/H5Pfcpl.c b/src/H5Pfcpl.c
index fbf9aac..d25db77 100644
--- a/src/H5Pfcpl.c
+++ b/src/H5Pfcpl.c
@@ -564,7 +564,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5Pget_sym_k(hid_t plist_id, unsigned *ik /*out */, unsigned *lk /*out */)
+H5Pget_sym_k(hid_t plist_id, unsigned *ik /*out*/, unsigned *lk /*out*/)
{
unsigned btree_k[H5B_NUM_BTREE_ID];
H5P_genplist_t *plist; /* Property list pointer */
@@ -654,7 +654,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5Pget_istore_k(hid_t plist_id, unsigned *ik /*out */)
+H5Pget_istore_k(hid_t plist_id, unsigned *ik /*out*/)
{
unsigned btree_k[H5B_NUM_BTREE_ID];
H5P_genplist_t *plist; /* Property list pointer */
diff --git a/src/H5Pint.c b/src/H5Pint.c
index 001f62b..f67e4d7 100644
--- a/src/H5Pint.c
+++ b/src/H5Pint.c
@@ -5012,9 +5012,9 @@ done:
herr_t
H5P_close(void *_plist)
{
- H5P_genclass_t *tclass; /* Temporary class pointer */
+ H5P_genclass_t *tclass; /* Temporary class pointer */
H5P_genplist_t *plist = (H5P_genplist_t *)_plist;
- H5SL_t * seen = NULL; /* Skip list to hold names of properties already seen */
+ H5SL_t * seen = NULL; /* Skip list to hold names of properties already seen */
size_t nseen; /* Number of items 'seen' */
hbool_t has_parent_class; /* Flag to indicate that this property list's class has a parent */
size_t ndel; /* Number of items deleted */
diff --git a/src/H5Ppkg.h b/src/H5Ppkg.h
index 166f1f2..075eae0 100644
--- a/src/H5Ppkg.h
+++ b/src/H5Ppkg.h
@@ -86,8 +86,7 @@ struct H5P_genclass_t {
char * name; /* Name of property list class */
H5P_plist_type_t type; /* Type of property */
size_t nprops; /* Number of properties in class */
- unsigned
- plists; /* Number of property lists that have been created since the last modification to the class */
+ unsigned plists; /* Number of property lists that have been created since the last modification to the class */
unsigned classes; /* Number of classes that have been derived since the last modification to the class */
unsigned ref_count; /* Number of outstanding ID's open on this class object */
hbool_t deleted; /* Whether this class has been deleted and is waiting for dependent classes & proplists
diff --git a/src/H5RS.c b/src/H5RS.c
index 0a62954..0e8ab27 100644
--- a/src/H5RS.c
+++ b/src/H5RS.c
@@ -18,9 +18,21 @@
*
*/
-#include "H5Eprivate.h" /* Error handling */
-#include "H5FLprivate.h" /* Free lists */
-#include "H5RSprivate.h" /* Reference-counted strings */
+/***********/
+/* Headers */
+/***********/
+#include "H5private.h" /* Generic Functions */
+#include "H5Eprivate.h" /* Error handling */
+#include "H5FLprivate.h" /* Free lists */
+#include "H5RSprivate.h" /* Reference-counted strings */
+
+/****************/
+/* Local Macros */
+/****************/
+
+/******************/
+/* Local Typedefs */
+/******************/
/* Private typedefs & structs */
struct H5RS_str_t {
@@ -29,6 +41,25 @@ struct H5RS_str_t {
unsigned n; /* Reference count of number of pointers sharing string */
};
+/********************/
+/* Package Typedefs */
+/********************/
+
+/********************/
+/* Local Prototypes */
+/********************/
+/*********************/
+/* Package Variables */
+/*********************/
+
+/*****************************/
+/* Library Private Variables */
+/*****************************/
+
+/*******************/
+/* Local Variables */
+/*******************/
+
/* Declare a free list to manage the H5RS_str_t struct */
H5FL_DEFINE_STATIC(H5RS_str_t);
@@ -135,13 +166,13 @@ done:
H5RS_str_t *
H5RS_wrap(const char *s)
{
- H5RS_str_t *ret_value; /* Return value */
+ H5RS_str_t *ret_value = NULL; /* Return value */
FUNC_ENTER_NOAPI(NULL)
/* Allocate ref-counted string structure */
if (NULL == (ret_value = H5FL_MALLOC(H5RS_str_t)))
- HGOTO_ERROR(H5E_RS, H5E_NOSPACE, NULL, "memory allocation failed")
+ HGOTO_ERROR(H5E_RS, H5E_CANTALLOC, NULL, "memory allocation failed")
/* Set the internal fields */
ret_value->s = (char *)s;
diff --git a/src/H5SM.c b/src/H5SM.c
index 52a5e8c..31f0e10 100644
--- a/src/H5SM.c
+++ b/src/H5SM.c
@@ -1092,7 +1092,7 @@ H5SM_try_share(H5F_t *f, H5O_t *open_oh, unsigned defer_flags, unsigned type_id,
if (defer_flags & H5SM_WAS_DEFERRED)
#ifndef NDEBUG
deferred_type = ((H5O_shared_t *)mesg)->type;
-#else /* NDEBUG */
+#else /* NDEBUG */
if ((((H5O_shared_t *)mesg)->type != H5O_SHARE_TYPE_HERE) &&
(((H5O_shared_t *)mesg)->type != H5O_SHARE_TYPE_SOHM))
HGOTO_DONE(FALSE);
@@ -1411,7 +1411,7 @@ H5SM__write_mesg(H5F_t *f, H5O_t *open_oh, H5SM_index_header_t *header, hbool_t
if (defer)
HDmemset(&shared.u, 0, sizeof(shared.u));
#endif /* H5_USING_MEMCHECKER */
- } /* end if */
+ } /* end if */
else {
htri_t share_in_ohdr; /* Whether the new message can be shared in another object's header */
@@ -1770,7 +1770,7 @@ H5SM__decr_ref(void *record, void *op_data, hbool_t *changed)
*/
static herr_t
H5SM__delete_from_index(H5F_t *f, H5O_t *open_oh, H5SM_index_header_t *header, const H5O_shared_t *mesg,
- unsigned *cache_flags, size_t * /*out*/ mesg_size, void ** /*out*/ encoded_mesg)
+ unsigned *cache_flags, size_t *mesg_size /*out*/, void **encoded_mesg /*out*/)
{
H5SM_list_t * list = NULL;
H5SM_mesg_key_t key;
diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index c527cd5..90d7d4f 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -2125,7 +2125,7 @@ H5S__hyper_iter_get_seq_list_opt(H5S_sel_iter_t *iter, size_t maxseq, size_t max
/* Decrement number of blocks */
fast_dim_count--;
} /* end while */
-#else /* NO_DUFFS_DEVICE */
+#else /* NO_DUFFS_DEVICE */
{
size_t duffs_index; /* Counting index for Duff's device */
@@ -2168,7 +2168,7 @@ H5S__hyper_iter_get_seq_list_opt(H5S_sel_iter_t *iter, size_t maxseq, size_t max
} while (--duffs_index > 0);
} /* end switch */
}
-#endif /* NO_DUFFS_DEVICE */
+#endif /* NO_DUFFS_DEVICE */
#undef DUFF_GUTS
/* Increment offset in destination buffer */
@@ -11748,7 +11748,7 @@ done:
for (u = 0; u < H5S_MAX_RANK; u++)
HDassert(!udata.ps_span_info[u]);
- } /* end block */
+ } /* end block */
#endif /* NDEBUG */
FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Spkg.h b/src/H5Spkg.h
index 76b2753..adb528e 100644
--- a/src/H5Spkg.h
+++ b/src/H5Spkg.h
@@ -280,26 +280,21 @@ typedef struct {
H5S_sel_copy_func_t copy; /* Method to make a copy of a selection */
H5S_sel_release_func_t release; /* Method to release current selection */
H5S_sel_is_valid_func_t is_valid; /* Method to determine if current selection is valid for dataspace */
- H5S_sel_serial_size_func_t
- serial_size; /* Method to determine number of bytes required to store current selection */
+ H5S_sel_serial_size_func_t serial_size; /* Method to determine number of bytes required to store current selection */
H5S_sel_serialize_func_t serialize; /* Method to store current selection in "serialized" form (a byte
sequence suitable for storing on disk) */
H5S_sel_deserialize_func_t deserialize; /* Method to store create selection from "serialized" form (a byte
sequence suitable for storing on disk) */
- H5S_sel_bounds_func_t
- bounds; /* Method to determine to smallest n-D bounding box containing the current selection */
- H5S_sel_offset_func_t
- offset; /* Method to determine linear offset of initial element in selection within dataspace */
+ H5S_sel_bounds_func_t bounds; /* Method to determine to smallest n-D bounding box containing the current selection */
+ H5S_sel_offset_func_t offset; /* Method to determine linear offset of initial element in selection within dataspace */
H5S_sel_unlim_dim_func_t unlim_dim; /* Method to get unlimited dimension of selection (or -1 for none) */
H5S_sel_num_elem_non_unlim_func_t num_elem_non_unlim; /* Method to get the number of elements in a slice
through the unlimited dimension */
H5S_sel_is_contiguous_func_t is_contiguous; /* Method to determine if current selection is contiguous */
H5S_sel_is_single_func_t is_single; /* Method to determine if current selection is a single block */
H5S_sel_is_regular_func_t is_regular; /* Method to determine if current selection is "regular" */
- H5S_sel_shape_same_func_t
- shape_same; /* Method to determine if two dataspaces' selections are the same shape */
- H5S_sel_intersect_block_func_t
- intersect_block; /* Method to determine if a dataspaces' selection intersects a block */
+ H5S_sel_shape_same_func_t shape_same; /* Method to determine if two dataspaces' selections are the same shape */
+ H5S_sel_intersect_block_func_t intersect_block; /* Method to determine if a dataspaces' selection intersects a block */
H5S_sel_adjust_u_func_t adjust_u; /* Method to adjust a selection by an offset */
H5S_sel_adjust_s_func_t adjust_s; /* Method to adjust a selection by an offset (signed) */
H5S_sel_project_scalar project_scalar; /* Method to construct scalar dataspace projection */
@@ -352,20 +347,13 @@ typedef struct H5S_sel_iter_class_t {
H5S_sel_type type; /* Type of selection (all, none, points or hyperslab) */
/* Methods on selections */
- H5S_sel_iter_coords_func_t
- iter_coords; /* Method to retrieve the current coordinates of iterator for current selection */
- H5S_sel_iter_block_func_t
- iter_block; /* Method to retrieve the current block of iterator for current selection */
- H5S_sel_iter_nelmts_func_t
- iter_nelmts; /* Method to determine number of elements left in iterator for current selection */
- H5S_sel_iter_has_next_block_func_t
- iter_has_next_block; /* Method to query if there is another block left in the selection */
- H5S_sel_iter_next_func_t
- iter_next; /* Method to move selection iterator to the next element in the selection */
- H5S_sel_iter_next_block_func_t
- iter_next_block; /* Method to move selection iterator to the next block in the selection */
- H5S_sel_iter_get_seq_list_func_t
- iter_get_seq_list; /* Method to retrieve a list of offset/length sequences for selection iterator */
+ H5S_sel_iter_coords_func_t iter_coords; /* Method to retrieve the current coordinates of iterator for current selection */
+ H5S_sel_iter_block_func_t iter_block; /* Method to retrieve the current block of iterator for current selection */
+ H5S_sel_iter_nelmts_func_t iter_nelmts; /* Method to determine number of elements left in iterator for current selection */
+ H5S_sel_iter_has_next_block_func_t iter_has_next_block; /* Method to query if there is another block left in the selection */
+ H5S_sel_iter_next_func_t iter_next; /* Method to move selection iterator to the next element in the selection */
+ H5S_sel_iter_next_block_func_t iter_next_block; /* Method to move selection iterator to the next block in the selection */
+ H5S_sel_iter_get_seq_list_func_t iter_get_seq_list; /* Method to retrieve a list of offset/length sequences for selection iterator */
H5S_sel_iter_release_func_t iter_release; /* Method to release iterator for current selection */
} H5S_sel_iter_class_t;
diff --git a/src/H5TS.c b/src/H5TS.c
index bd1b748..ea309bb 100644
--- a/src/H5TS.c
+++ b/src/H5TS.c
@@ -11,31 +11,77 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/* private headers */
-#include "H5private.h" /*library */
-#include "H5Eprivate.h" /*error handling */
-#include "H5MMprivate.h" /*memory management functions */
+/*
+ * Purpose: This file contains the framework for ensuring that the global
+ * library lock is held when an API routine is called. This
+ * framework works in concert with the FUNC_ENTER_API / FUNC_LEAVE_API
+ * macros defined in H5private.h.
+ *
+ * Note: Because this threadsafety framework operates outside the library,
+ * it does not use the error stack and only uses the "namecheck only"
+ * FUNC_ENTER_* / FUNC_LEAVE_* macros.
+ */
+
+/****************/
+/* Module Setup */
+/****************/
+
+/***********/
+/* Headers */
+/***********/
+#include "H5private.h" /* Generic Functions */
+#include "H5Eprivate.h" /* Error handling */
+#include "H5MMprivate.h" /* Memory management */
#ifdef H5_HAVE_THREADSAFE
-/* Module specific data structures */
+/****************/
+/* Local Macros */
+/****************/
-/* cancelability structure */
+/******************/
+/* Local Typedefs */
+/******************/
+
+/* Cancelability structure */
typedef struct H5TS_cancel_struct {
int previous_state;
unsigned int cancel_count;
} H5TS_cancel_t;
+/********************/
+/* Local Prototypes */
+/********************/
+static void H5TS__key_destructor(void *key_val);
+
+/*********************/
+/* Package Variables */
+/*********************/
+
+/*****************************/
+/* Library Private Variables */
+/*****************************/
+
/* Global variable definitions */
#ifdef H5_HAVE_WIN_THREADS
H5TS_once_t H5TS_first_init_g;
-#else /* H5_HAVE_WIN_THREADS */
+#else /* H5_HAVE_WIN_THREADS */
H5TS_once_t H5TS_first_init_g = PTHREAD_ONCE_INIT;
#endif /* H5_HAVE_WIN_THREADS */
-H5TS_key_t H5TS_errstk_key_g;
-H5TS_key_t H5TS_funcstk_key_g;
-H5TS_key_t H5TS_apictx_key_g;
-H5TS_key_t H5TS_cancel_key_g;
+
+/* Thread-local keys, used by other interfaces */
+H5TS_key_t H5TS_errstk_key_g; /* Error stack */
+#ifdef H5_HAVE_CODESTACK
+H5TS_key_t H5TS_funcstk_key_g; /* Function stack */
+#endif /* H5_HAVE_CODESTACK */
+H5TS_key_t H5TS_apictx_key_g; /* API context */
+
+/*******************/
+/* Local Variables */
+/*******************/
+
+/* Thread-local keys, used in this module */
+static H5TS_key_t H5TS_cancel_key_s; /* Thread cancellation state */
#ifndef H5_HAVE_WIN_THREADS
@@ -64,12 +110,13 @@ static H5TS_key_t H5TS_tid_key;
/*--------------------------------------------------------------------------
* NAME
- * H5TS_key_destructor
+ * H5TS__key_destructor
*
* USAGE
- * H5TS_key_destructor()
+ * H5TS__key_destructor()
*
* RETURNS
+ * None
*
* DESCRIPTION
* Frees the memory for a key. Called by each thread as it exits.
@@ -82,12 +129,12 @@ static H5TS_key_t H5TS_tid_key;
*--------------------------------------------------------------------------
*/
static void
-H5TS_key_destructor(void *key_val)
+H5TS__key_destructor(void *key_val)
{
/* Use HDfree here instead of H5MM_xfree(), to avoid calling the H5CS routines */
if (key_val != NULL)
HDfree(key_val);
-}
+} /* end H5TS__key_destructor() */
#ifndef H5_HAVE_WIN_THREADS
@@ -192,10 +239,9 @@ H5TS_thread_id(void)
pthread_mutex_unlock(&H5TS_tid_mtx);
/* If a prototype ID record was established, copy it to the heap. */
- if (tid == &proto_tid) {
+ if (tid == &proto_tid)
if ((tid = HDmalloc(sizeof(*tid))) != NULL)
*tid = proto_tid;
- }
if (tid == NULL)
return 0;
@@ -252,17 +298,19 @@ H5TS_pthread_first_thread_init(void)
H5TS_tid_init();
/* initialize key for thread-specific error stacks */
- pthread_key_create(&H5TS_errstk_key_g, H5TS_key_destructor);
+ pthread_key_create(&H5TS_errstk_key_g, H5TS__key_destructor);
+#ifdef H5_HAVE_CODESTACK
/* initialize key for thread-specific function stacks */
- pthread_key_create(&H5TS_funcstk_key_g, H5TS_key_destructor);
+ pthread_key_create(&H5TS_funcstk_key_g, H5TS__key_destructor);
+#endif /* H5_HAVE_CODESTACK */
/* initialize key for thread-specific API contexts */
- pthread_key_create(&H5TS_apictx_key_g, H5TS_key_destructor);
+ pthread_key_create(&H5TS_apictx_key_g, H5TS__key_destructor);
/* initialize key for thread cancellability mechanism */
- pthread_key_create(&H5TS_cancel_key_g, H5TS_key_destructor);
-}
+ pthread_key_create(&H5TS_cancel_key_s, H5TS__key_destructor);
+} /* end H5TS_pthread_first_thread_init() */
#endif /* H5_HAVE_WIN_THREADS */
/*--------------------------------------------------------------------------
@@ -288,32 +336,36 @@ H5TS_pthread_first_thread_init(void)
herr_t
H5TS_mutex_lock(H5TS_mutex_t *mutex)
{
+ herr_t ret_value = 0;
+
#ifdef H5_HAVE_WIN_THREADS
EnterCriticalSection(&mutex->CriticalSection);
- return 0;
-#else /* H5_HAVE_WIN_THREADS */
- herr_t ret_value = pthread_mutex_lock(&mutex->atomic_lock);
-
+#else /* H5_HAVE_WIN_THREADS */
+ /* Acquire the library lock */
+ ret_value = pthread_mutex_lock(&mutex->atomic_lock);
if (ret_value)
return ret_value;
- if (mutex->lock_count && pthread_equal(pthread_self(), mutex->owner_thread)) {
+ /* Check if this thread already owns the lock */
+ if (mutex->lock_count && pthread_equal(pthread_self(), mutex->owner_thread))
/* already owned by self - increment count */
mutex->lock_count++;
- }
else {
- /* if owned by other thread, wait for condition signal */
+ /* Wait until the lock is released by current owner thread */
while (mutex->lock_count)
pthread_cond_wait(&mutex->cond_var, &mutex->atomic_lock);
/* After we've received the signal, take ownership of the mutex */
mutex->owner_thread = pthread_self();
mutex->lock_count = 1;
- }
+ } /* end else */
- return pthread_mutex_unlock(&mutex->atomic_lock);
+ /* Release the library lock */
+ ret_value = pthread_mutex_unlock(&mutex->atomic_lock);
#endif /* H5_HAVE_WIN_THREADS */
-}
+
+ return ret_value;
+} /* end H5TS_mutex_lock() */
/*--------------------------------------------------------------------------
* NAME
@@ -338,20 +390,23 @@ H5TS_mutex_lock(H5TS_mutex_t *mutex)
herr_t
H5TS_mutex_unlock(H5TS_mutex_t *mutex)
{
+ herr_t ret_value = 0;
+
#ifdef H5_HAVE_WIN_THREADS
/* Releases ownership of the specified critical section object. */
LeaveCriticalSection(&mutex->CriticalSection);
- return 0;
-#else /* H5_HAVE_WIN_THREADS */
- herr_t ret_value = pthread_mutex_lock(&mutex->atomic_lock);
+#else /* H5_HAVE_WIN_THREADS */
+ /* Decrement the lock count for this thread */
+ ret_value = pthread_mutex_lock(&mutex->atomic_lock);
if (ret_value)
return ret_value;
-
mutex->lock_count--;
-
ret_value = pthread_mutex_unlock(&mutex->atomic_lock);
+ /* If the lock count drops to zero, signal the condition variable, to
+ * wake another thread.
+ */
if (mutex->lock_count == 0) {
int err;
@@ -359,9 +414,9 @@ H5TS_mutex_unlock(H5TS_mutex_t *mutex)
if (err != 0)
ret_value = err;
} /* end if */
+#endif /* H5_HAVE_WIN_THREADS */
return ret_value;
-#endif /* H5_HAVE_WIN_THREADS */
} /* H5TS_mutex_unlock */
/*--------------------------------------------------------------------------
@@ -375,12 +430,12 @@ H5TS_mutex_unlock(H5TS_mutex_t *mutex)
* 0 on success non-zero error code on error.
*
* DESCRIPTION
- * Creates a cancelation counter for a thread if it is the first time
+ * Creates a cancellation counter for a thread if it is the first time
* the thread is entering the library.
*
* if counter value is zero, then set cancelability type of the thread
* to PTHREAD_CANCEL_DISABLE as thread is entering the library and store
- * the previous cancelability type into cancelation counter.
+ * the previous cancelability type into cancellation counter.
* Increase the counter value by 1.
*
* PROGRAMMER: Chee Wai LEE
@@ -391,15 +446,18 @@ H5TS_mutex_unlock(H5TS_mutex_t *mutex)
herr_t
H5TS_cancel_count_inc(void)
{
-#ifdef H5_HAVE_WIN_THREADS
- /* unsupported; just return 0 */
- return SUCCEED;
-#else /* H5_HAVE_WIN_THREADS */
+#ifndef H5_HAVE_WIN_THREADS
H5TS_cancel_t *cancel_counter;
- herr_t ret_value = SUCCEED;
+#endif /* H5_HAVE_WIN_THREADS */
+ herr_t ret_value = SUCCEED;
- cancel_counter = (H5TS_cancel_t *)H5TS_get_thread_local_value(H5TS_cancel_key_g);
+#ifdef H5_HAVE_WIN_THREADS
+ /* unsupported */
+#else /* H5_HAVE_WIN_THREADS */
+ /* Acquire the thread's cancellation counter */
+ cancel_counter = (H5TS_cancel_t *)H5TS_get_thread_local_value(H5TS_cancel_key_s);
+ /* Check if it's created yet */
if (!cancel_counter) {
/*
* First time thread calls library - create new counter and associate
@@ -409,24 +467,32 @@ H5TS_cancel_count_inc(void)
* order to avoid codestack calls.
*/
cancel_counter = (H5TS_cancel_t *)HDcalloc(1, sizeof(H5TS_cancel_t));
-
- if (!cancel_counter) {
+ if (NULL == cancel_counter) {
HERROR(H5E_RESOURCE, H5E_NOSPACE, "memory allocation failed");
return FAIL;
- }
+ } /* end if */
- ret_value = pthread_setspecific(H5TS_cancel_key_g, (void *)cancel_counter);
- }
+ /* Set the thread's cancellation counter with the new object */
+ ret_value = pthread_setspecific(H5TS_cancel_key_s, (void *)cancel_counter);
+ if (ret_value) {
+ HDfree(cancel_counter);
+ return FAIL;
+ } /* end if */
+ } /* end if */
+ /* Check if thread entering library */
if (cancel_counter->cancel_count == 0)
- /* thread entering library */
+ /* Set cancellation state to 'disable', and remember previous state */
ret_value = pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cancel_counter->previous_state);
+ /* Increment # of times the library API was re-entered, to avoid resetting
+ * previous cancellation state until the final API routine is returning.
+ */
++cancel_counter->cancel_count;
+#endif /* H5_HAVE_WIN_THREADS */
return ret_value;
-#endif /* H5_HAVE_WIN_THREADS */
-}
+} /* end H5TS_cancel_count_inc() */
/*--------------------------------------------------------------------------
* NAME
@@ -440,7 +506,7 @@ H5TS_cancel_count_inc(void)
*
* DESCRIPTION
* If counter value is one, then set cancelability type of the thread
- * to the previous cancelability type stored in the cancelation counter.
+ * to the previous cancelability type stored in the cancellation counter.
* (the thread is leaving the library).
*
* Decrement the counter value by 1.
@@ -453,23 +519,28 @@ H5TS_cancel_count_inc(void)
herr_t
H5TS_cancel_count_dec(void)
{
-#ifdef H5_HAVE_WIN_THREADS
- /* unsupported; will just return 0 */
- return SUCCEED;
-#else /* H5_HAVE_WIN_THREADS */
- register H5TS_cancel_t *cancel_counter;
- herr_t ret_value = SUCCEED;
+#ifndef H5_HAVE_WIN_THREADS
+ H5TS_cancel_t *cancel_counter;
+#endif /* H5_HAVE_WIN_THREADS */
+ herr_t ret_value = SUCCEED;
- cancel_counter = (H5TS_cancel_t *)H5TS_get_thread_local_value(H5TS_cancel_key_g);
+#ifdef H5_HAVE_WIN_THREADS
+ /* unsupported */
+#else /* H5_HAVE_WIN_THREADS */
+ /* Acquire the thread's cancellation counter */
+ cancel_counter = (H5TS_cancel_t *)H5TS_get_thread_local_value(H5TS_cancel_key_s);
+ /* Check for leaving last API routine */
if (cancel_counter->cancel_count == 1)
+ /* Reset to previous thread cancellation state, if last API */
ret_value = pthread_setcancelstate(cancel_counter->previous_state, NULL);
+ /* Decrement cancellation counter */
--cancel_counter->cancel_count;
+#endif /* H5_HAVE_WIN_THREADS */
return ret_value;
-#endif /* H5_HAVE_WIN_THREADS */
-}
+} /* end H5TS_cancel_count_dec() */
#ifdef H5_HAVE_WIN_THREADS
/*--------------------------------------------------------------------------
@@ -506,9 +577,7 @@ H5TS_win32_process_enter(PINIT_ONCE InitOnce, PVOID Parameter, PVOID *lpContex)
return ret_value;
} /* H5TS_win32_process_enter() */
-#endif /* H5_HAVE_WIN_THREADS */
-#ifdef H5_HAVE_WIN_THREADS
/*--------------------------------------------------------------------------
* NAME
* H5TS_win32_thread_enter
@@ -536,9 +605,7 @@ H5TS_win32_thread_enter(void)
return ret_value;
} /* H5TS_win32_thread_enter() */
-#endif /* H5_HAVE_WIN_THREADS */
-#ifdef H5_HAVE_WIN_THREADS
/*--------------------------------------------------------------------------
* NAME
* H5TS_win32_process_exit
@@ -574,9 +641,7 @@ H5TS_win32_process_exit(void)
return;
} /* H5TS_win32_process_exit() */
-#endif /* H5_HAVE_WIN_THREADS */
-#ifdef H5_HAVE_WIN_THREADS
/*--------------------------------------------------------------------------
* NAME
* H5TS_win32_thread_exit
@@ -643,7 +708,6 @@ H5TS_create_thread(void *(*func)(void *), H5TS_attr_t *attr, void *udata)
H5TS_thread_t ret_value;
#ifdef H5_HAVE_WIN_THREADS
-
/* When calling C runtime functions, you should use _beginthread or
* _beginthreadex instead of CreateThread. Threads created with
* CreateThread risk being killed in low-memory situations. Since we
@@ -663,7 +727,6 @@ H5TS_create_thread(void *(*func)(void *), H5TS_attr_t *attr, void *udata)
#endif /* H5_HAVE_WIN_THREADS */
return ret_value;
-
} /* H5TS_create_thread */
#endif /* H5_HAVE_THREADSAFE */
diff --git a/src/H5TSprivate.h b/src/H5TSprivate.h
index 700d879..dc85145 100644
--- a/src/H5TSprivate.h
+++ b/src/H5TSprivate.h
@@ -27,7 +27,7 @@
#ifdef H5_HAVE_THREADSAFE
/* Public headers needed by this file */
#ifdef LATER
-#include "H5TSpublic.h" /*Public API prototypes */
+#include "H5TSpublic.h" /* Public API prototypes */
#endif /* LATER */
#ifdef H5_HAVE_WIN_THREADS
@@ -38,6 +38,8 @@
typedef struct H5TS_mutex_struct {
CRITICAL_SECTION CriticalSection;
} H5TS_mutex_t;
+
+/* Portability wrappers around Windows Threads types */
typedef CRITICAL_SECTION H5TS_mutex_simple_t;
typedef HANDLE H5TS_thread_t;
typedef HANDLE H5TS_attr_t;
@@ -50,7 +52,7 @@ typedef INIT_ONCE H5TS_once_t;
#define H5TS_SCOPE_PROCESS 0
#define H5TS_CALL_CONV WINAPI
-/* Functions */
+/* Portability function aliases */
#define H5TS_get_thread_local_value(key) TlsGetValue(key)
#define H5TS_set_thread_local_value(key, value) TlsSetValue(key, value)
#define H5TS_attr_init(attr_ptr) 0
@@ -80,6 +82,8 @@ typedef struct H5TS_mutex_struct {
pthread_cond_t cond_var; /* condition variable */
unsigned int lock_count;
} H5TS_mutex_t;
+
+/* Portability wrappers around pthread types */
typedef pthread_t H5TS_thread_t;
typedef pthread_attr_t H5TS_attr_t;
typedef pthread_mutex_t H5TS_mutex_simple_t;
@@ -91,7 +95,7 @@ typedef pthread_once_t H5TS_once_t;
#define H5TS_SCOPE_PROCESS PTHREAD_SCOPE_PROCESS
#define H5TS_CALL_CONV /* unused - Windows only */
-/* Functions */
+/* Portability function aliases */
#define H5TS_get_thread_local_value(key) pthread_getspecific(key)
#define H5TS_set_thread_local_value(key, value) pthread_setspecific(key, value)
#define H5TS_attr_init(attr_ptr) pthread_attr_init((attr_ptr))
@@ -101,31 +105,31 @@ typedef pthread_once_t H5TS_once_t;
#define H5TS_mutex_init(mutex) pthread_mutex_init(mutex, NULL)
#define H5TS_mutex_lock_simple(mutex) pthread_mutex_lock(mutex)
#define H5TS_mutex_unlock_simple(mutex) pthread_mutex_unlock(mutex)
+
+/* Pthread-only routines */
H5_DLL uint64_t H5TS_thread_id(void);
+H5_DLL void H5TS_pthread_first_thread_init(void);
#endif /* H5_HAVE_WIN_THREADS */
-/* External global variables */
-extern H5TS_once_t H5TS_first_init_g;
-extern H5TS_key_t H5TS_errstk_key_g;
-extern H5TS_key_t H5TS_funcstk_key_g;
-extern H5TS_key_t H5TS_apictx_key_g;
-
-#if defined c_plusplus || defined __cplusplus
-extern "C" {
-#endif /* c_plusplus || __cplusplus */
-
-H5_DLL void H5TS_pthread_first_thread_init(void);
-H5_DLL herr_t H5TS_mutex_lock(H5TS_mutex_t *mutex);
-H5_DLL herr_t H5TS_mutex_unlock(H5TS_mutex_t *mutex);
-H5_DLL herr_t H5TS_cancel_count_inc(void);
-H5_DLL herr_t H5TS_cancel_count_dec(void);
+/* Library-scope global variables */
+extern H5TS_once_t H5TS_first_init_g; /* Library initialization */
+extern H5TS_key_t H5TS_errstk_key_g; /* Error stacks */
+#ifdef H5_HAVE_CODESTACK
+extern H5TS_key_t H5TS_funcstk_key_g; /* Function stacks */
+#endif /* H5_HAVE_CODESTACK */
+extern H5TS_key_t H5TS_apictx_key_g; /* API contexts */
+
+/* Library-scope routines */
+/* (Only used within H5private.h macros) */
+H5_DLL herr_t H5TS_mutex_lock(H5TS_mutex_t *mutex);
+H5_DLL herr_t H5TS_mutex_unlock(H5TS_mutex_t *mutex);
+H5_DLL herr_t H5TS_cancel_count_inc(void);
+H5_DLL herr_t H5TS_cancel_count_dec(void);
+
+/* Testing routines */
H5_DLL H5TS_thread_t H5TS_create_thread(void *(*func)(void *), H5TS_attr_t *attr, void *udata);
-#if defined c_plusplus || defined __cplusplus
-}
-#endif /* c_plusplus || __cplusplus */
-
#else /* H5_HAVE_THREADSAFE */
#define H5TS_thread_id() ((uint64_t)0)
diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h
index 0261428..4f3d89d 100644
--- a/src/H5Tpkg.h
+++ b/src/H5Tpkg.h
@@ -338,8 +338,7 @@ typedef struct H5T_shared_t {
H5T_class_t type; /*which class of type is this? */
size_t size; /*total size of an instance of this type */
unsigned version; /* Version of object header message to encode this object with */
- hbool_t
- force_conv; /* Set if this type always needs to be converted and H5T__conv_noop cannot be called */
+ hbool_t force_conv; /* Set if this type always needs to be converted and H5T__conv_noop cannot be called */
struct H5T_t * parent; /*parent type for derived datatypes */
H5VL_object_t *owned_vol_obj; /* Vol object owned by this type (free on close) */
union {
diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h
index 4675871..b3dc064 100644
--- a/src/H5Tprivate.h
+++ b/src/H5Tprivate.h
@@ -24,7 +24,7 @@ typedef struct H5T_t H5T_t;
#include "H5Tpublic.h"
/* Other public headers needed by this file */
-#include "H5MMpublic.h" /* Memory management */
+#include "H5MMpublic.h" /* Memory management */
/* Private headers needed by this file */
#include "H5private.h" /* Generic Functions */
diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index 8bebb98..68a1d79 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -230,7 +230,7 @@ typedef enum H5T_conv_ret_t {
*/
typedef struct {
size_t len; /**< Length of VL data (in base type units) */
- void *p; /**< Pointer to VL data */
+ void * p; /**< Pointer to VL data */
} hvl_t;
/* Variable Length String information */
@@ -238,14 +238,14 @@ typedef struct {
* Indicate that a string is variable length (null-terminated in C, instead of
* fixed length)
*/
-#define H5T_VARIABLE ((size_t)(-1))
+#define H5T_VARIABLE ((size_t)(-1))
/* Opaque information */
/**
* Maximum length of an opaque tag
* \internal This could be raised without too much difficulty
*/
-#define H5T_OPAQUE_TAG_MAX 256
+#define H5T_OPAQUE_TAG_MAX 256
#ifdef __cplusplus
extern "C" {
@@ -255,17 +255,16 @@ extern "C" {
* All datatype conversion functions are...
*/
//! [H5T_conv_t_snip]
-typedef herr_t (*H5T_conv_t) (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf,
- void *bkg, hid_t dset_xfer_plist);
+typedef herr_t (*H5T_conv_t)(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride,
+ size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist);
//! [H5T_conv_t_snip]
/**
* Exception handler. If an exception like overflow happenes during conversion,
* this function is called if it's registered through H5Pset_type_conv_cb().
*/
-typedef H5T_conv_ret_t (*H5T_conv_except_func_t)(H5T_conv_except_t except_type,
- hid_t src_id, hid_t dst_id, void *src_buf, void *dst_buf, void *user_data);
+typedef H5T_conv_ret_t (*H5T_conv_except_func_t)(H5T_conv_except_t except_type, hid_t src_id, hid_t dst_id,
+ void *src_buf, void *dst_buf, void *user_data);
/* When this header is included from a private header, don't make calls to H5open() */
#undef H5OPEN
@@ -282,22 +281,22 @@ typedef H5T_conv_ret_t (*H5T_conv_except_func_t)(H5T_conv_except_t except_type,
* \ingroup PDTIEEE
* 32-bit big-endian IEEE floating-point numbers
*/
-#define H5T_IEEE_F32BE (H5OPEN H5T_IEEE_F32BE_g)
+#define H5T_IEEE_F32BE (H5OPEN H5T_IEEE_F32BE_g)
/**
* \ingroup PDTIEEE
* 32-bit little-endian IEEE floating-point numbers
*/
-#define H5T_IEEE_F32LE (H5OPEN H5T_IEEE_F32LE_g)
+#define H5T_IEEE_F32LE (H5OPEN H5T_IEEE_F32LE_g)
/**
* \ingroup PDTIEEE
* 64-bit big-endian IEEE floating-point numbers
*/
-#define H5T_IEEE_F64BE (H5OPEN H5T_IEEE_F64BE_g)
+#define H5T_IEEE_F64BE (H5OPEN H5T_IEEE_F64BE_g)
/**
* \ingroup PDTIEEE
* 64-bit little-endian IEEE floating-point numbers
*/
-#define H5T_IEEE_F64LE (H5OPEN H5T_IEEE_F64LE_g)
+#define H5T_IEEE_F64LE (H5OPEN H5T_IEEE_F64LE_g)
H5_DLLVAR hid_t H5T_IEEE_F32BE_g;
H5_DLLVAR hid_t H5T_IEEE_F32LE_g;
H5_DLLVAR hid_t H5T_IEEE_F64BE_g;
@@ -311,137 +310,137 @@ H5_DLLVAR hid_t H5T_IEEE_F64LE_g;
* \ingroup PDTSTD
* 8-bit big-endian signed integers
*/
-#define H5T_STD_I8BE (H5OPEN H5T_STD_I8BE_g)
+#define H5T_STD_I8BE (H5OPEN H5T_STD_I8BE_g)
/**
* \ingroup PDTSTD
* 8-bit little-endian signed integers
*/
-#define H5T_STD_I8LE (H5OPEN H5T_STD_I8LE_g)
+#define H5T_STD_I8LE (H5OPEN H5T_STD_I8LE_g)
/**
* \ingroup PDTSTD
* 16-bit big-endian signed integers
*/
-#define H5T_STD_I16BE (H5OPEN H5T_STD_I16BE_g)
+#define H5T_STD_I16BE (H5OPEN H5T_STD_I16BE_g)
/**
* \ingroup PDTSTD
* 16-bit little-endian signed integers
*/
-#define H5T_STD_I16LE (H5OPEN H5T_STD_I16LE_g)
+#define H5T_STD_I16LE (H5OPEN H5T_STD_I16LE_g)
/**
* \ingroup PDTSTD
* 32-bit big-endian signed integers
*/
-#define H5T_STD_I32BE (H5OPEN H5T_STD_I32BE_g)
+#define H5T_STD_I32BE (H5OPEN H5T_STD_I32BE_g)
/**
* \ingroup PDTSTD
* 32-bit little-endian signed integers
*/
-#define H5T_STD_I32LE (H5OPEN H5T_STD_I32LE_g)
+#define H5T_STD_I32LE (H5OPEN H5T_STD_I32LE_g)
/**
* \ingroup PDTSTD
* 64-bit big-endian signed integers
*/
-#define H5T_STD_I64BE (H5OPEN H5T_STD_I64BE_g)
+#define H5T_STD_I64BE (H5OPEN H5T_STD_I64BE_g)
/**
* \ingroup PDTSTD
* 64-bit little-endian signed integers
*/
-#define H5T_STD_I64LE (H5OPEN H5T_STD_I64LE_g)
+#define H5T_STD_I64LE (H5OPEN H5T_STD_I64LE_g)
/**
* \ingroup PDTSTD
* 8-bit big-endian unsigned integers
*/
-#define H5T_STD_U8BE (H5OPEN H5T_STD_U8BE_g)
+#define H5T_STD_U8BE (H5OPEN H5T_STD_U8BE_g)
/**
* \ingroup PDTSTD
* 8-bit little-endian unsigned integers
*/
-#define H5T_STD_U8LE (H5OPEN H5T_STD_U8LE_g)
+#define H5T_STD_U8LE (H5OPEN H5T_STD_U8LE_g)
/**
* \ingroup PDTSTD
* 16-bit big-endian unsigned integers
*/
-#define H5T_STD_U16BE (H5OPEN H5T_STD_U16BE_g)
+#define H5T_STD_U16BE (H5OPEN H5T_STD_U16BE_g)
/**
* \ingroup PDTSTD
* 16-bit little-endian unsigned integers
*/
-#define H5T_STD_U16LE (H5OPEN H5T_STD_U16LE_g)
+#define H5T_STD_U16LE (H5OPEN H5T_STD_U16LE_g)
/**
* \ingroup PDTSTD
* 32-bit big-endian unsigned integers
*/
-#define H5T_STD_U32BE (H5OPEN H5T_STD_U32BE_g)
+#define H5T_STD_U32BE (H5OPEN H5T_STD_U32BE_g)
/**
* \ingroup PDTSTD
* 32-bit little-endian unsigned integers
*/
-#define H5T_STD_U32LE (H5OPEN H5T_STD_U32LE_g)
+#define H5T_STD_U32LE (H5OPEN H5T_STD_U32LE_g)
/**
* \ingroup PDTSTD
* 64-bit big-endian unsigned integers
*/
-#define H5T_STD_U64BE (H5OPEN H5T_STD_U64BE_g)
+#define H5T_STD_U64BE (H5OPEN H5T_STD_U64BE_g)
/**
* \ingroup PDTSTD
* 64-bit little-endian unsigned integers
*/
-#define H5T_STD_U64LE (H5OPEN H5T_STD_U64LE_g)
+#define H5T_STD_U64LE (H5OPEN H5T_STD_U64LE_g)
/**
* \ingroup PDTSTD
* 8-bit big-endian bitfield
*/
-#define H5T_STD_B8BE (H5OPEN H5T_STD_B8BE_g)
+#define H5T_STD_B8BE (H5OPEN H5T_STD_B8BE_g)
/**
* \ingroup PDTSTD
* 8-bit little-endian bitfield
*/
-#define H5T_STD_B8LE (H5OPEN H5T_STD_B8LE_g)
+#define H5T_STD_B8LE (H5OPEN H5T_STD_B8LE_g)
/**
* \ingroup PDTSTD
* 16-bit big-endian bitfield
*/
-#define H5T_STD_B16BE (H5OPEN H5T_STD_B16BE_g)
+#define H5T_STD_B16BE (H5OPEN H5T_STD_B16BE_g)
/**
* \ingroup PDTSTD
* 16-bit little-endian bitfield
*/
-#define H5T_STD_B16LE (H5OPEN H5T_STD_B16LE_g)
+#define H5T_STD_B16LE (H5OPEN H5T_STD_B16LE_g)
/**
* \ingroup PDTSTD
* 32-bit big-endian bitfield
*/
-#define H5T_STD_B32BE (H5OPEN H5T_STD_B32BE_g)
+#define H5T_STD_B32BE (H5OPEN H5T_STD_B32BE_g)
/**
* \ingroup PDTSTD
* 32-bit little-endian bitfield
*/
-#define H5T_STD_B32LE (H5OPEN H5T_STD_B32LE_g)
+#define H5T_STD_B32LE (H5OPEN H5T_STD_B32LE_g)
/**
* \ingroup PDTSTD
* 64-bit big-endian bitfield
*/
-#define H5T_STD_B64BE (H5OPEN H5T_STD_B64BE_g)
+#define H5T_STD_B64BE (H5OPEN H5T_STD_B64BE_g)
/**
* \ingroup PDTSTD
* 64-bit little-endian bitfield
*/
-#define H5T_STD_B64LE (H5OPEN H5T_STD_B64LE_g)
+#define H5T_STD_B64LE (H5OPEN H5T_STD_B64LE_g)
/**
* \ingroup PDTSTD
* Object reference
*/
-#define H5T_STD_REF_OBJ (H5OPEN H5T_STD_REF_OBJ_g)
+#define H5T_STD_REF_OBJ (H5OPEN H5T_STD_REF_OBJ_g)
/**
* \ingroup PDTSTD
* Dataset region reference
*/
-#define H5T_STD_REF_DSETREG (H5OPEN H5T_STD_REF_DSETREG_g)
+#define H5T_STD_REF_DSETREG (H5OPEN H5T_STD_REF_DSETREG_g)
/**
* \ingroup PDTSTD
* Generic reference
*/
-#define H5T_STD_REF (H5OPEN H5T_STD_REF_g)
+#define H5T_STD_REF (H5OPEN H5T_STD_REF_g)
H5_DLLVAR hid_t H5T_STD_I8BE_g;
H5_DLLVAR hid_t H5T_STD_I8LE_g;
H5_DLLVAR hid_t H5T_STD_I16BE_g;
@@ -476,19 +475,19 @@ H5_DLLVAR hid_t H5T_STD_REF_g;
/**
* \ingroup PDTUNIX
*/
-#define H5T_UNIX_D32BE (H5OPEN H5T_UNIX_D32BE_g)
+#define H5T_UNIX_D32BE (H5OPEN H5T_UNIX_D32BE_g)
/**
* \ingroup PDTUNIX
*/
-#define H5T_UNIX_D32LE (H5OPEN H5T_UNIX_D32LE_g)
+#define H5T_UNIX_D32LE (H5OPEN H5T_UNIX_D32LE_g)
/**
* \ingroup PDTUNIX
*/
-#define H5T_UNIX_D64BE (H5OPEN H5T_UNIX_D64BE_g)
+#define H5T_UNIX_D64BE (H5OPEN H5T_UNIX_D64BE_g)
/**
* \ingroup PDTUNIX
*/
-#define H5T_UNIX_D64LE (H5OPEN H5T_UNIX_D64LE_g)
+#define H5T_UNIX_D64LE (H5OPEN H5T_UNIX_D64LE_g)
H5_DLLVAR hid_t H5T_UNIX_D32BE_g;
H5_DLLVAR hid_t H5T_UNIX_D32LE_g;
H5_DLLVAR hid_t H5T_UNIX_D64BE_g;
@@ -523,72 +522,72 @@ H5_DLLVAR hid_t H5T_FORTRAN_S1_g;
* \ingroup PDTX86
* 8-bit little-endian signed (2's complement) integers for Intel CPUs
*/
-#define H5T_INTEL_I8 H5T_STD_I8LE
+#define H5T_INTEL_I8 H5T_STD_I8LE
/**
* \ingroup PDTX86
* 16-bit little-endian signed (2's complement) integers for Intel CPUs
*/
-#define H5T_INTEL_I16 H5T_STD_I16LE
+#define H5T_INTEL_I16 H5T_STD_I16LE
/**
* \ingroup PDTX86
* 32-bit little-endian signed (2's complement) integers for Intel CPUs
*/
-#define H5T_INTEL_I32 H5T_STD_I32LE
+#define H5T_INTEL_I32 H5T_STD_I32LE
/**
* \ingroup PDTX86
* 64-bit little-endian signed (2's complement) integers for Intel CPUs
*/
-#define H5T_INTEL_I64 H5T_STD_I64LE
+#define H5T_INTEL_I64 H5T_STD_I64LE
/**
* \ingroup PDTX86
* 8-bit little-endian unsigned integers for Intel CPUs
*/
-#define H5T_INTEL_U8 H5T_STD_U8LE
+#define H5T_INTEL_U8 H5T_STD_U8LE
/**
* \ingroup PDTX86
* 16-bit little-endian unsigned integers for Intel CPUs
*/
-#define H5T_INTEL_U16 H5T_STD_U16LE
+#define H5T_INTEL_U16 H5T_STD_U16LE
/**
* \ingroup PDTX86
* 32-bit little-endian unsigned integers for Intel CPUs
*/
-#define H5T_INTEL_U32 H5T_STD_U32LE
+#define H5T_INTEL_U32 H5T_STD_U32LE
/**
* \ingroup PDTX86
* 64-bit little-endian unsigned integers for Intel CPUs
*/
-#define H5T_INTEL_U64 H5T_STD_U64LE
+#define H5T_INTEL_U64 H5T_STD_U64LE
/**
* \ingroup PDTX86
* 8-bit little-endian bitfield for Intel CPUs
*/
-#define H5T_INTEL_B8 H5T_STD_B8LE
+#define H5T_INTEL_B8 H5T_STD_B8LE
/**
* \ingroup PDTX86
* 16-bit little-endian bitfield for Intel CPUs
*/
-#define H5T_INTEL_B16 H5T_STD_B16LE
+#define H5T_INTEL_B16 H5T_STD_B16LE
/**
* \ingroup PDTX86
* 32-bit little-endian bitfield for Intel CPUs
*/
-#define H5T_INTEL_B32 H5T_STD_B32LE
+#define H5T_INTEL_B32 H5T_STD_B32LE
/**
* \ingroup PDTX86
* 64-bit little-endian bitfield for Intel CPUs
*/
-#define H5T_INTEL_B64 H5T_STD_B64LE
+#define H5T_INTEL_B64 H5T_STD_B64LE
/**
* \ingroup PDTX86
* 32-bit little-endian IEEE floating-point numbers for Intel CPUs
*/
-#define H5T_INTEL_F32 H5T_IEEE_F32LE
+#define H5T_INTEL_F32 H5T_IEEE_F32LE
/**
* \ingroup PDTX86
* 64-bit little-endian IEEE floating-point numbers for Intel CPUs
*/
-#define H5T_INTEL_F64 H5T_IEEE_F64LE
+#define H5T_INTEL_F64 H5T_IEEE_F64LE
/*
* These types are for DEC Alpha CPU's. They are little endian with IEEE
@@ -598,72 +597,72 @@ H5_DLLVAR hid_t H5T_FORTRAN_S1_g;
* \ingroup PDTALPHA
* 8-bit little-endian signed (2's complement) integers for DEC Alpha CPUs
*/
-#define H5T_ALPHA_I8 H5T_STD_I8LE
+#define H5T_ALPHA_I8 H5T_STD_I8LE
/**
* \ingroup PDTALPHA
* 16-bit little-endian signed (2's complement) integers for DEC Alpha CPUs
*/
-#define H5T_ALPHA_I16 H5T_STD_I16LE
+#define H5T_ALPHA_I16 H5T_STD_I16LE
/**
* \ingroup PDTALPHA
* 32-bit little-endian signed (2's complement) integers for DEC Alpha CPUs
*/
-#define H5T_ALPHA_I32 H5T_STD_I32LE
+#define H5T_ALPHA_I32 H5T_STD_I32LE
/**
* \ingroup PDTALPHA
* 64-bit little-endian signed (2's complement) integers for DEC Alpha CPUs
*/
-#define H5T_ALPHA_I64 H5T_STD_I64LE
+#define H5T_ALPHA_I64 H5T_STD_I64LE
/**
* \ingroup PDTALPHA
* 8-bit little-endian unsigned integers for DEC Alpha CPUs
*/
-#define H5T_ALPHA_U8 H5T_STD_U8LE
+#define H5T_ALPHA_U8 H5T_STD_U8LE
/**
* \ingroup PDTALPHA
* 16-bit little-endian unsigned integers for DEC Alpha CPUs
*/
-#define H5T_ALPHA_U16 H5T_STD_U16LE
+#define H5T_ALPHA_U16 H5T_STD_U16LE
/**
* \ingroup PDTALPHA
* 32-bit little-endian unsigned integers for DEC Alpha CPUs
*/
-#define H5T_ALPHA_U32 H5T_STD_U32LE
+#define H5T_ALPHA_U32 H5T_STD_U32LE
/**
* \ingroup PDTALPHA
* 64-bit little-endian unsigned integers for DEC Alpha CPUs
*/
-#define H5T_ALPHA_U64 H5T_STD_U64LE
+#define H5T_ALPHA_U64 H5T_STD_U64LE
/**
* \ingroup PDTALPHA
* 8-bit little-endian bitfield for DEC Alpha CPUs
*/
-#define H5T_ALPHA_B8 H5T_STD_B8LE
+#define H5T_ALPHA_B8 H5T_STD_B8LE
/**
* \ingroup PDTALPHA
* 16-bit little-endian bitfield for DEC Alpha CPUs
*/
-#define H5T_ALPHA_B16 H5T_STD_B16LE
+#define H5T_ALPHA_B16 H5T_STD_B16LE
/**
* \ingroup PDTALPHA
* 32-bit little-endian bitfield for DEC Alpha CPUs
*/
-#define H5T_ALPHA_B32 H5T_STD_B32LE
+#define H5T_ALPHA_B32 H5T_STD_B32LE
/**
* \ingroup PDTALPHA
* 64-bit little-endian bitfield for DEC Alpha CPUs
*/
-#define H5T_ALPHA_B64 H5T_STD_B64LE
+#define H5T_ALPHA_B64 H5T_STD_B64LE
/**
* \ingroup PDTALPHA
* 32-bit little-endian IEEE floating-point numbers for DEC Alpha CPUs
*/
-#define H5T_ALPHA_F32 H5T_IEEE_F32LE
+#define H5T_ALPHA_F32 H5T_IEEE_F32LE
/**
* \ingroup PDTALPHA
* 64-bit little-endian IEEE floating-point numbers for DEC Alpha CPUs
*/
-#define H5T_ALPHA_F64 H5T_IEEE_F64LE
+#define H5T_ALPHA_F64 H5T_IEEE_F64LE
/*
* These types are for MIPS cpu's commonly used in SGI systems. They are big
@@ -673,72 +672,72 @@ H5_DLLVAR hid_t H5T_FORTRAN_S1_g;
* \ingroup PDTMIPS
* 8-bit big-endian signed (2's complement) integers for SGI MIPS CPUs
*/
-#define H5T_MIPS_I8 H5T_STD_I8BE
+#define H5T_MIPS_I8 H5T_STD_I8BE
/**
* \ingroup PDTMIPS
* 16-bit big-endian signed (2's complement) integers for SGI MIPS CPUs
*/
-#define H5T_MIPS_I16 H5T_STD_I16BE
+#define H5T_MIPS_I16 H5T_STD_I16BE
/**
* \ingroup PDTMIPS
* 32-bit big-endian signed (2's complement) integers for SGI MIPS CPUs
*/
-#define H5T_MIPS_I32 H5T_STD_I32BE
+#define H5T_MIPS_I32 H5T_STD_I32BE
/**
* \ingroup PDTMIPS
* 64-bit big-endian signed (2's complement) integers for SGI MIPS CPUs
*/
-#define H5T_MIPS_I64 H5T_STD_I64BE
+#define H5T_MIPS_I64 H5T_STD_I64BE
/**
* \ingroup PDTMIPS
* 8-bit big-endian unsigned integers for SGI MIPS CPUs
*/
-#define H5T_MIPS_U8 H5T_STD_U8BE
+#define H5T_MIPS_U8 H5T_STD_U8BE
/**
* \ingroup PDTMIPS
* 16-bit big-endian unsigned integers for SGI MIPS CPUs
*/
-#define H5T_MIPS_U16 H5T_STD_U16BE
+#define H5T_MIPS_U16 H5T_STD_U16BE
/**
* \ingroup PDTMIPS
* 32-bit big-endian unsigned integers for SGI MIPS CPUs
*/
-#define H5T_MIPS_U32 H5T_STD_U32BE
+#define H5T_MIPS_U32 H5T_STD_U32BE
/**
* \ingroup PDTMIPS
* 64-bit big-endian unsigned integers for SGI MIPS CPUs
*/
-#define H5T_MIPS_U64 H5T_STD_U64BE
+#define H5T_MIPS_U64 H5T_STD_U64BE
/**
* \ingroup PDTMIPS
* 8-bit big-endian bitfield for SGI MIPS CPUs
*/
-#define H5T_MIPS_B8 H5T_STD_B8BE
+#define H5T_MIPS_B8 H5T_STD_B8BE
/**
* \ingroup PDTMIPS
* 16-bit big-endian bitfield for SGI MIPS CPUs
*/
-#define H5T_MIPS_B16 H5T_STD_B16BE
+#define H5T_MIPS_B16 H5T_STD_B16BE
/**
* \ingroup PDTMIPS
* 32-bit big-endian bitfield for SGI MIPS CPUs
*/
-#define H5T_MIPS_B32 H5T_STD_B32BE
+#define H5T_MIPS_B32 H5T_STD_B32BE
/**
* \ingroup PDTMIPS
* 64-bit big-endian bitfield for SGI MIPS CPUs
*/
-#define H5T_MIPS_B64 H5T_STD_B64BE
+#define H5T_MIPS_B64 H5T_STD_B64BE
/**
* \ingroup PDTMIPS
* 32-bit big-endian IEEE floating-point numbers for MIPS CPUs
*/
-#define H5T_MIPS_F32 H5T_IEEE_F32BE
+#define H5T_MIPS_F32 H5T_IEEE_F32BE
/**
* \ingroup PDTMIPS
* 64-bit big-endian IEEE floating-point numbers for MIPS CPUs
*/
-#define H5T_MIPS_F64 H5T_IEEE_F64BE
+#define H5T_MIPS_F64 H5T_IEEE_F64BE
/*
* The VAX floating point types (i.e. in VAX byte order)
@@ -769,22 +768,22 @@ H5_DLLVAR hid_t H5T_VAX_F64_g;
* \ingroup PDTNAT
* C-style \c char
*/
-#define H5T_NATIVE_CHAR (CHAR_MIN?H5T_NATIVE_SCHAR:H5T_NATIVE_UCHAR)
+#define H5T_NATIVE_CHAR (CHAR_MIN ? H5T_NATIVE_SCHAR : H5T_NATIVE_UCHAR)
/**
* \ingroup PDTNAT
* C-style \Code{signed char}
*/
-#define H5T_NATIVE_SCHAR (H5OPEN H5T_NATIVE_SCHAR_g)
+#define H5T_NATIVE_SCHAR (H5OPEN H5T_NATIVE_SCHAR_g)
/**
* \ingroup PDTNAT
* C-style \Code{unsigned char}
*/
-#define H5T_NATIVE_UCHAR (H5OPEN H5T_NATIVE_UCHAR_g)
+#define H5T_NATIVE_UCHAR (H5OPEN H5T_NATIVE_UCHAR_g)
/**
* \ingroup PDTNAT
* C-style \Code{short}
*/
-#define H5T_NATIVE_SHORT (H5OPEN H5T_NATIVE_SHORT_g)
+#define H5T_NATIVE_SHORT (H5OPEN H5T_NATIVE_SHORT_g)
/**
* \ingroup PDTNAT
* C-style \Code{unsigned short}
@@ -794,27 +793,27 @@ H5_DLLVAR hid_t H5T_VAX_F64_g;
* \ingroup PDTNAT
* C-style \Code{int}
*/
-#define H5T_NATIVE_INT (H5OPEN H5T_NATIVE_INT_g)
+#define H5T_NATIVE_INT (H5OPEN H5T_NATIVE_INT_g)
/**
* \ingroup PDTNAT
* C-style \Code{unsigned int}
*/
-#define H5T_NATIVE_UINT (H5OPEN H5T_NATIVE_UINT_g)
+#define H5T_NATIVE_UINT (H5OPEN H5T_NATIVE_UINT_g)
/**
* \ingroup PDTNAT
* C-style \Code{long}
*/
-#define H5T_NATIVE_LONG (H5OPEN H5T_NATIVE_LONG_g)
+#define H5T_NATIVE_LONG (H5OPEN H5T_NATIVE_LONG_g)
/**
* \ingroup PDTNAT
* C-style \Code{unsigned long}
*/
-#define H5T_NATIVE_ULONG (H5OPEN H5T_NATIVE_ULONG_g)
+#define H5T_NATIVE_ULONG (H5OPEN H5T_NATIVE_ULONG_g)
/**
* \ingroup PDTNAT
* C-style \Code{long long}
*/
-#define H5T_NATIVE_LLONG (H5OPEN H5T_NATIVE_LLONG_g)
+#define H5T_NATIVE_LLONG (H5OPEN H5T_NATIVE_LLONG_g)
/**
* \ingroup PDTNAT
* C-style \Code{unsigned long long}
@@ -824,13 +823,13 @@ H5_DLLVAR hid_t H5T_VAX_F64_g;
* \ingroup PDTNAT
* C-style \Code{float}
*/
-#define H5T_NATIVE_FLOAT (H5OPEN H5T_NATIVE_FLOAT_g)
+#define H5T_NATIVE_FLOAT (H5OPEN H5T_NATIVE_FLOAT_g)
/**
* \ingroup PDTNAT
* C-style \Code{double}
*/
#define H5T_NATIVE_DOUBLE (H5OPEN H5T_NATIVE_DOUBLE_g)
-#if H5_SIZEOF_LONG_DOUBLE !=0
+#if H5_SIZEOF_LONG_DOUBLE != 0
/**
* \ingroup PDTNAT
* C-style \Code{long double}
@@ -841,22 +840,22 @@ H5_DLLVAR hid_t H5T_VAX_F64_g;
* \ingroup PDTNAT
* HDF5 8-bit bitfield based on native types
*/
-#define H5T_NATIVE_B8 (H5OPEN H5T_NATIVE_B8_g)
+#define H5T_NATIVE_B8 (H5OPEN H5T_NATIVE_B8_g)
/**
* \ingroup PDTNAT
* HDF5 16-bit bitfield based on native types
*/
-#define H5T_NATIVE_B16 (H5OPEN H5T_NATIVE_B16_g)
+#define H5T_NATIVE_B16 (H5OPEN H5T_NATIVE_B16_g)
/**
* \ingroup PDTNAT
* HDF5 32-bit bitfield based on native types
*/
-#define H5T_NATIVE_B32 (H5OPEN H5T_NATIVE_B32_g)
+#define H5T_NATIVE_B32 (H5OPEN H5T_NATIVE_B32_g)
/**
* \ingroup PDTNAT
* HDF5 64-bit bitfield based on native types
*/
-#define H5T_NATIVE_B64 (H5OPEN H5T_NATIVE_B64_g)
+#define H5T_NATIVE_B64 (H5OPEN H5T_NATIVE_B64_g)
/**
* \ingroup PDTNAT
* HDF5 opaque unit based on native types
@@ -866,12 +865,12 @@ H5_DLLVAR hid_t H5T_VAX_F64_g;
* \ingroup PDTNAT
* HDF5 address type based on native types
*/
-#define H5T_NATIVE_HADDR (H5OPEN H5T_NATIVE_HADDR_g)
+#define H5T_NATIVE_HADDR (H5OPEN H5T_NATIVE_HADDR_g)
/**
* \ingroup PDTNAT
* HDF5 size type based on native types
*/
-#define H5T_NATIVE_HSIZE (H5OPEN H5T_NATIVE_HSIZE_g)
+#define H5T_NATIVE_HSIZE (H5OPEN H5T_NATIVE_HSIZE_g)
/**
* \ingroup PDTNAT
* HDF5 signed size type based on native types
@@ -881,12 +880,12 @@ H5_DLLVAR hid_t H5T_VAX_F64_g;
* \ingroup PDTNAT
* HDF5 error code type based on native types
*/
-#define H5T_NATIVE_HERR (H5OPEN H5T_NATIVE_HERR_g)
+#define H5T_NATIVE_HERR (H5OPEN H5T_NATIVE_HERR_g)
/**
* \ingroup PDTNAT
* HDF5 Boolean type based on native types
*/
-#define H5T_NATIVE_HBOOL (H5OPEN H5T_NATIVE_HBOOL_g)
+#define H5T_NATIVE_HBOOL (H5OPEN H5T_NATIVE_HBOOL_g)
H5_DLLVAR hid_t H5T_NATIVE_SCHAR_g;
H5_DLLVAR hid_t H5T_NATIVE_UCHAR_g;
H5_DLLVAR hid_t H5T_NATIVE_SHORT_g;
@@ -917,27 +916,27 @@ H5_DLLVAR hid_t H5T_NATIVE_HBOOL_g;
/**
* \ingroup PDTC9x
*/
-#define H5T_NATIVE_INT8 (H5OPEN H5T_NATIVE_INT8_g)
+#define H5T_NATIVE_INT8 (H5OPEN H5T_NATIVE_INT8_g)
/**
* \ingroup PDTC9x
*/
-#define H5T_NATIVE_UINT8 (H5OPEN H5T_NATIVE_UINT8_g)
+#define H5T_NATIVE_UINT8 (H5OPEN H5T_NATIVE_UINT8_g)
/**
* \ingroup PDTC9x
*/
-#define H5T_NATIVE_INT_LEAST8 (H5OPEN H5T_NATIVE_INT_LEAST8_g)
+#define H5T_NATIVE_INT_LEAST8 (H5OPEN H5T_NATIVE_INT_LEAST8_g)
/**
* \ingroup PDTC9x
*/
-#define H5T_NATIVE_UINT_LEAST8 (H5OPEN H5T_NATIVE_UINT_LEAST8_g)
+#define H5T_NATIVE_UINT_LEAST8 (H5OPEN H5T_NATIVE_UINT_LEAST8_g)
/**
* \ingroup PDTC9x
*/
-#define H5T_NATIVE_INT_FAST8 (H5OPEN H5T_NATIVE_INT_FAST8_g)
+#define H5T_NATIVE_INT_FAST8 (H5OPEN H5T_NATIVE_INT_FAST8_g)
/**
* \ingroup PDTC9x
*/
-#define H5T_NATIVE_UINT_FAST8 (H5OPEN H5T_NATIVE_UINT_FAST8_g)
+#define H5T_NATIVE_UINT_FAST8 (H5OPEN H5T_NATIVE_UINT_FAST8_g)
H5_DLLVAR hid_t H5T_NATIVE_INT8_g;
H5_DLLVAR hid_t H5T_NATIVE_UINT8_g;
H5_DLLVAR hid_t H5T_NATIVE_INT_LEAST8_g;
@@ -948,27 +947,27 @@ H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST8_g;
/**
* \ingroup PDTC9x
*/
-#define H5T_NATIVE_INT16 (H5OPEN H5T_NATIVE_INT16_g)
+#define H5T_NATIVE_INT16 (H5OPEN H5T_NATIVE_INT16_g)
/**
* \ingroup PDTC9x
*/
-#define H5T_NATIVE_UINT16 (H5OPEN H5T_NATIVE_UINT16_g)
+#define H5T_NATIVE_UINT16 (H5OPEN H5T_NATIVE_UINT16_g)
/**
* \ingroup PDTC9x
*/
-#define H5T_NATIVE_INT_LEAST16 (H5OPEN H5T_NATIVE_INT_LEAST16_g)
+#define H5T_NATIVE_INT_LEAST16 (H5OPEN H5T_NATIVE_INT_LEAST16_g)
/**
* \ingroup PDTC9x
*/
-#define H5T_NATIVE_UINT_LEAST16 (H5OPEN H5T_NATIVE_UINT_LEAST16_g)
+#define H5T_NATIVE_UINT_LEAST16 (H5OPEN H5T_NATIVE_UINT_LEAST16_g)
/**
* \ingroup PDTC9x
*/
-#define H5T_NATIVE_INT_FAST16 (H5OPEN H5T_NATIVE_INT_FAST16_g)
+#define H5T_NATIVE_INT_FAST16 (H5OPEN H5T_NATIVE_INT_FAST16_g)
/**
* \ingroup PDTC9x
*/
-#define H5T_NATIVE_UINT_FAST16 (H5OPEN H5T_NATIVE_UINT_FAST16_g)
+#define H5T_NATIVE_UINT_FAST16 (H5OPEN H5T_NATIVE_UINT_FAST16_g)
H5_DLLVAR hid_t H5T_NATIVE_INT16_g;
H5_DLLVAR hid_t H5T_NATIVE_UINT16_g;
H5_DLLVAR hid_t H5T_NATIVE_INT_LEAST16_g;
@@ -979,27 +978,27 @@ H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST16_g;
/**
* \ingroup PDTC9x
*/
-#define H5T_NATIVE_INT32 (H5OPEN H5T_NATIVE_INT32_g)
+#define H5T_NATIVE_INT32 (H5OPEN H5T_NATIVE_INT32_g)
/**
* \ingroup PDTC9x
*/
-#define H5T_NATIVE_UINT32 (H5OPEN H5T_NATIVE_UINT32_g)
+#define H5T_NATIVE_UINT32 (H5OPEN H5T_NATIVE_UINT32_g)
/**
* \ingroup PDTC9x
*/
-#define H5T_NATIVE_INT_LEAST32 (H5OPEN H5T_NATIVE_INT_LEAST32_g)
+#define H5T_NATIVE_INT_LEAST32 (H5OPEN H5T_NATIVE_INT_LEAST32_g)
/**
* \ingroup PDTC9x
*/
-#define H5T_NATIVE_UINT_LEAST32 (H5OPEN H5T_NATIVE_UINT_LEAST32_g)
+#define H5T_NATIVE_UINT_LEAST32 (H5OPEN H5T_NATIVE_UINT_LEAST32_g)
/**
* \ingroup PDTC9x
*/
-#define H5T_NATIVE_INT_FAST32 (H5OPEN H5T_NATIVE_INT_FAST32_g)
+#define H5T_NATIVE_INT_FAST32 (H5OPEN H5T_NATIVE_INT_FAST32_g)
/**
* \ingroup PDTC9x
*/
-#define H5T_NATIVE_UINT_FAST32 (H5OPEN H5T_NATIVE_UINT_FAST32_g)
+#define H5T_NATIVE_UINT_FAST32 (H5OPEN H5T_NATIVE_UINT_FAST32_g)
H5_DLLVAR hid_t H5T_NATIVE_INT32_g;
H5_DLLVAR hid_t H5T_NATIVE_UINT32_g;
H5_DLLVAR hid_t H5T_NATIVE_INT_LEAST32_g;
@@ -1010,15 +1009,15 @@ H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST32_g;
/**
* \ingroup PDTC9x
*/
-#define H5T_NATIVE_INT64 (H5OPEN H5T_NATIVE_INT64_g)
+#define H5T_NATIVE_INT64 (H5OPEN H5T_NATIVE_INT64_g)
/**
* \ingroup PDTC9x
*/
-#define H5T_NATIVE_UINT64 (H5OPEN H5T_NATIVE_UINT64_g)
+#define H5T_NATIVE_UINT64 (H5OPEN H5T_NATIVE_UINT64_g)
/**
* \ingroup PDTC9x
*/
-#define H5T_NATIVE_INT_LEAST64 (H5OPEN H5T_NATIVE_INT_LEAST64_g)
+#define H5T_NATIVE_INT_LEAST64 (H5OPEN H5T_NATIVE_INT_LEAST64_g)
/**
* \ingroup PDTC9x
*/
@@ -1026,11 +1025,11 @@ H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST32_g;
/**
* \ingroup PDTC9x
*/
-#define H5T_NATIVE_INT_FAST64 (H5OPEN H5T_NATIVE_INT_FAST64_g)
+#define H5T_NATIVE_INT_FAST64 (H5OPEN H5T_NATIVE_INT_FAST64_g)
/**
* \ingroup PDTC9x
*/
-#define H5T_NATIVE_UINT_FAST64 (H5OPEN H5T_NATIVE_UINT_FAST64_g)
+#define H5T_NATIVE_UINT_FAST64 (H5OPEN H5T_NATIVE_UINT_FAST64_g)
H5_DLLVAR hid_t H5T_NATIVE_INT64_g;
H5_DLLVAR hid_t H5T_NATIVE_UINT64_g;
H5_DLLVAR hid_t H5T_NATIVE_INT_LEAST64_g;
@@ -1085,7 +1084,7 @@ H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST64_g;
* \todo Create an example for H5Tcreate.
*
*/
-H5_DLL hid_t H5Tcreate(H5T_class_t type, size_t size);
+H5_DLL hid_t H5Tcreate(H5T_class_t type, size_t size);
/**
* \ingroup H5T
*
@@ -1110,7 +1109,7 @@ H5_DLL hid_t H5Tcreate(H5T_class_t type, size_t size);
* \todo Create an example for H5Tcopy().
*
*/
-H5_DLL hid_t H5Tcopy(hid_t type_id);
+H5_DLL hid_t H5Tcopy(hid_t type_id);
/**
* \ingroup H5T
*
@@ -1231,7 +1230,7 @@ H5_DLL herr_t H5Tcommit2(hid_t loc_id, const char *name, hid_t type_id, hid_t lc
* \since 1.8.0
*
*/
-H5_DLL hid_t H5Topen2(hid_t loc_id, const char *name, hid_t tapl_id);
+H5_DLL hid_t H5Topen2(hid_t loc_id, const char *name, hid_t tapl_id);
/**
* \ingroup H5T
*
@@ -1304,7 +1303,7 @@ H5_DLL herr_t H5Tcommit_anon(hid_t loc_id, hid_t type_id, hid_t tcpl_id, hid_t t
* \since 1.8.0
*
*/
-H5_DLL hid_t H5Tget_create_plist(hid_t type_id);
+H5_DLL hid_t H5Tget_create_plist(hid_t type_id);
/**
* \ingroup H5T
*
@@ -1383,7 +1382,7 @@ H5_DLL herr_t H5Tencode(hid_t obj_id, void *buf, size_t *nalloc);
* resource leaks will not develop.
*
*/
-H5_DLL hid_t H5Tdecode(const void *buf);
+H5_DLL hid_t H5Tdecode(const void *buf);
/**
* \ingroup H5T
*
@@ -1516,7 +1515,7 @@ H5_DLL herr_t H5Tpack(hid_t type_id);
* \since 1.2.0
*
*/
-H5_DLL hid_t H5Tenum_create(hid_t base_id);
+H5_DLL hid_t H5Tenum_create(hid_t base_id);
/**
* \ingroup ENUM
*
@@ -1683,7 +1682,7 @@ H5_DLL hid_t H5Tarray_create2(hid_t base_id, unsigned ndims, const hsize_t dim[/
* \since 1.2.0
*
*/
-H5_DLL int H5Tget_array_ndims(hid_t type_id);
+H5_DLL int H5Tget_array_ndims(hid_t type_id);
/**
* \ingroup ARRAY
*
@@ -1701,7 +1700,7 @@ H5_DLL int H5Tget_array_ndims(hid_t type_id);
* \since 1.2.0
*
*/
-H5_DLL int H5Tget_array_dims2(hid_t type_id, hsize_t dims[]);
+H5_DLL int H5Tget_array_dims2(hid_t type_id, hsize_t dims[]);
/* Operations defined on opaque datatypes */
/**
@@ -1745,7 +1744,7 @@ H5_DLL herr_t H5Tset_tag(hid_t type, const char *tag);
* the caller must free.
*
*/
-H5_DLL char * H5Tget_tag(hid_t type);
+H5_DLL char *H5Tget_tag(hid_t type);
/* Querying property values */
/**
@@ -1766,7 +1765,7 @@ H5_DLL char * H5Tget_tag(hid_t type);
* resource leaks will not develop.
*
*/
-H5_DLL hid_t H5Tget_super(hid_t type);
+H5_DLL hid_t H5Tget_super(hid_t type);
/**
* \ingroup H5T
*
@@ -1815,7 +1814,7 @@ H5_DLL H5T_class_t H5Tget_class(hid_t type_id);
* \since 1.6.0
*
*/
-H5_DLL htri_t H5Tdetect_class(hid_t type_id, H5T_class_t cls);
+H5_DLL htri_t H5Tdetect_class(hid_t type_id, H5T_class_t cls);
/**
* \ingroup H5T
*
@@ -1848,7 +1847,7 @@ H5_DLL htri_t H5Tdetect_class(hid_t type_id, H5T_class_t cls);
* \todo Create an example for H5Tget_size().
*
*/
-H5_DLL size_t H5Tget_size(hid_t type_id);
+H5_DLL size_t H5Tget_size(hid_t type_id);
/**
* \ingroup ATOM
*
@@ -1894,7 +1893,7 @@ H5_DLL H5T_order_t H5Tget_order(hid_t type_id);
* \since 1.2.0
*
*/
-H5_DLL size_t H5Tget_precision(hid_t type_id);
+H5_DLL size_t H5Tget_precision(hid_t type_id);
/**
* \ingroup ATOM
*
@@ -1923,7 +1922,7 @@ H5_DLL size_t H5Tget_precision(hid_t type_id);
* \since 1.2.0
*
*/
-H5_DLL int H5Tget_offset(hid_t type_id);
+H5_DLL int H5Tget_offset(hid_t type_id);
/**
* \ingroup ATOM
*
@@ -1942,7 +1941,7 @@ H5_DLL int H5Tget_offset(hid_t type_id);
* \since 1.2.0
*
*/
-H5_DLL herr_t H5Tget_pad(hid_t type_id, H5T_pad_t *lsb /*out*/, H5T_pad_t *msb /*out*/);
+H5_DLL herr_t H5Tget_pad(hid_t type_id, H5T_pad_t *lsb /*out*/, H5T_pad_t *msb /*out*/);
/**
* \ingroup ATOM
*
@@ -2018,7 +2017,7 @@ H5_DLL size_t H5Tget_ebias(hid_t type_id);
* \since 1.2.0
*
*/
-H5_DLL H5T_norm_t H5Tget_norm(hid_t type_id);
+H5_DLL H5T_norm_t H5Tget_norm(hid_t type_id);
/**
* \ingroup ATOM
*
@@ -2037,7 +2036,7 @@ H5_DLL H5T_norm_t H5Tget_norm(hid_t type_id);
* \since 1.2.0
*
*/
-H5_DLL H5T_pad_t H5Tget_inpad(hid_t type_id);
+H5_DLL H5T_pad_t H5Tget_inpad(hid_t type_id);
/**
* \ingroup ATOM
*
@@ -2058,7 +2057,7 @@ H5_DLL H5T_pad_t H5Tget_inpad(hid_t type_id);
* \since 1.2.0
*
*/
-H5_DLL H5T_str_t H5Tget_strpad(hid_t type_id);
+H5_DLL H5T_str_t H5Tget_strpad(hid_t type_id);
/**
* \ingroup COMPOUND
*
@@ -2075,7 +2074,7 @@ H5_DLL H5T_str_t H5Tget_strpad(hid_t type_id);
* \since 1.2.0
*
*/
-H5_DLL int H5Tget_nmembers(hid_t type_id);
+H5_DLL int H5Tget_nmembers(hid_t type_id);
/**
* \ingroup COMPOUND
*
@@ -2102,7 +2101,7 @@ H5_DLL int H5Tget_nmembers(hid_t type_id);
* \since 1.2.0
*
*/
-H5_DLL char * H5Tget_member_name(hid_t type_id, unsigned membno);
+H5_DLL char *H5Tget_member_name(hid_t type_id, unsigned membno);
/**
* \ingroup COMPOUND
*
@@ -2124,7 +2123,7 @@ H5_DLL char * H5Tget_member_name(hid_t type_id, unsigned membno);
* \since 1.2.0
*
*/
-H5_DLL int H5Tget_member_index(hid_t type_id, const char *name);
+H5_DLL int H5Tget_member_index(hid_t type_id, const char *name);
/**
* \ingroup COMPOUND
*
@@ -2148,7 +2147,7 @@ H5_DLL int H5Tget_member_index(hid_t type_id, const char *name);
* \since 1.2.0
*
*/
-H5_DLL size_t H5Tget_member_offset(hid_t type_id, unsigned membno);
+H5_DLL size_t H5Tget_member_offset(hid_t type_id, unsigned membno);
/**
* \ingroup COMPOUND
*
@@ -2190,7 +2189,7 @@ H5_DLL H5T_class_t H5Tget_member_class(hid_t type_id, unsigned membno);
* \since 1.2.0
*
*/
-H5_DLL hid_t H5Tget_member_type(hid_t type_id, unsigned membno);
+H5_DLL hid_t H5Tget_member_type(hid_t type_id, unsigned membno);
/**
* \ingroup ENUM
*
@@ -2217,7 +2216,7 @@ H5_DLL hid_t H5Tget_member_type(hid_t type_id, unsigned membno);
* \since 1.2.0
*
*/
-H5_DLL herr_t H5Tget_member_value(hid_t type_id, unsigned membno, void *value /*out*/);
+H5_DLL herr_t H5Tget_member_value(hid_t type_id, unsigned membno, void *value /*out*/);
/**
* \ingroup ATOM
*
@@ -2235,7 +2234,7 @@ H5_DLL herr_t H5Tget_member_value(hid_t type_id, unsigned membno, void *val
* \since 1.2.0
*
*/
-H5_DLL H5T_cset_t H5Tget_cset(hid_t type_id);
+H5_DLL H5T_cset_t H5Tget_cset(hid_t type_id);
/**
* \ingroup ATOM
*
@@ -2258,7 +2257,7 @@ H5_DLL H5T_cset_t H5Tget_cset(hid_t type_id);
* \since 1.6.0
*
*/
-H5_DLL htri_t H5Tis_variable_str(hid_t type_id);
+H5_DLL htri_t H5Tis_variable_str(hid_t type_id);
/**
* \ingroup H5T
*
@@ -2342,7 +2341,7 @@ H5_DLL htri_t H5Tis_variable_str(hid_t type_id);
* \since 1.6.0
*
*/
-H5_DLL hid_t H5Tget_native_type(hid_t type_id, H5T_direction_t direction);
+H5_DLL hid_t H5Tget_native_type(hid_t type_id, H5T_direction_t direction);
/* Setting property values */
/**
@@ -2805,7 +2804,7 @@ H5_DLL H5T_conv_t H5Tfind(hid_t src_id, hid_t dst_id, H5T_cdata_t **pcdata);
* \since 1.8.0
*
*/
-H5_DLL htri_t H5Tcompiler_conv(hid_t src_id, hid_t dst_id);
+H5_DLL htri_t H5Tcompiler_conv(hid_t src_id, hid_t dst_id);
/**
* --------------------------------------------------------------------------
* \ingroup CONV
@@ -2846,8 +2845,8 @@ H5_DLL htri_t H5Tcompiler_conv(hid_t src_id, hid_t dst_id);
* \version 1.4.0 \p nelmts parameter type changed to \ref hsize_t.
*
*/
-H5_DLL herr_t H5Tconvert(hid_t src_id, hid_t dst_id, size_t nelmts, void *buf, void *background,
- hid_t plist_id);
+H5_DLL herr_t H5Tconvert(hid_t src_id, hid_t dst_id, size_t nelmts, void *buf, void *background,
+ hid_t plist_id);
/**
* \ingroup VLEN
*
@@ -2870,7 +2869,7 @@ H5_DLL herr_t H5Tconvert(hid_t src_id, hid_t dst_id, size_t nelmts, void *bu
* \since 1.12.0
*
*/
-H5_DLL herr_t H5Treclaim(hid_t type_id, hid_t space_id, hid_t plist_id, void *buf);
+H5_DLL herr_t H5Treclaim(hid_t type_id, hid_t space_id, hid_t plist_id, void *buf);
/* Symbols defined for compatibility with previous versions of the HDF5 API.
*
@@ -2953,7 +2952,7 @@ H5_DLL herr_t H5Tcommit1(hid_t loc_id, const char *name, hid_t type_id);
* \since 1.2.0
*
*/
-H5_DLL hid_t H5Topen1(hid_t loc_id, const char *name);
+H5_DLL hid_t H5Topen1(hid_t loc_id, const char *name);
/**
* \ingroup ARRAY
*
@@ -2988,8 +2987,8 @@ H5_DLL hid_t H5Topen1(hid_t loc_id, const char *name);
* \since 1.4.0
*
*/
-H5_DLL hid_t H5Tarray_create1(hid_t base_id, int ndims, const hsize_t dim[/* ndims */],
- const int perm[/* ndims */]);
+H5_DLL hid_t H5Tarray_create1(hid_t base_id, int ndims, const hsize_t dim[/* ndims */],
+ const int perm[/* ndims */]);
/**
* \ingroup ARRAY
*
@@ -3016,7 +3015,7 @@ H5_DLL hid_t H5Tarray_create1(hid_t base_id, int ndims, const hsize_t dim[/* nd
* \since 1.2.0
*
*/
-H5_DLL int H5Tget_array_dims1(hid_t type_id, hsize_t dims[], int perm[]);
+H5_DLL int H5Tget_array_dims1(hid_t type_id, hsize_t dims[], int perm[]);
#endif /* H5_NO_DEPRECATED_SYMBOLS */
diff --git a/src/H5Tvlen.c b/src/H5Tvlen.c
index 0fdd113..2d373d1 100644
--- a/src/H5Tvlen.c
+++ b/src/H5Tvlen.c
@@ -626,7 +626,7 @@ H5T__vlen_mem_str_getptr(void *_vl)
#ifdef H5_NO_ALIGNMENT_RESTRICTIONS
char *s = *(char **)_vl; /* Pointer to the user's string information */
#else
- char * s = NULL; /* Pointer to the user's string information */
+ char *s = NULL; /* Pointer to the user's string information */
#endif
FUNC_ENTER_STATIC_NOERR
@@ -717,7 +717,7 @@ H5T__vlen_mem_str_read(H5VL_object_t H5_ATTR_UNUSED *file, void *_vl, void *buf,
#ifdef H5_NO_ALIGNMENT_RESTRICTIONS
char *s = *(char **)_vl; /* Pointer to the user's string information */
#else
- char *s; /* Pointer to the user's string information */
+ char *s; /* Pointer to the user's string information */
#endif
FUNC_ENTER_STATIC_NOERR
diff --git a/src/H5UCprivate.h b/src/H5UCprivate.h
index 2d6f40f..2687318 100644
--- a/src/H5UCprivate.h
+++ b/src/H5UCprivate.h
@@ -59,4 +59,4 @@ typedef struct H5UC_t {
H5_DLL H5UC_t *H5UC_create(void *s, H5UC_free_func_t free_func);
H5_DLL herr_t H5UC_decr(H5UC_t *rc);
-#endif /* _H5RSprivate_H */
+#endif /* _H5UCprivate_H */
diff --git a/src/H5VLcallback.c b/src/H5VLcallback.c
index 6abbf8d..4657213 100644
--- a/src/H5VLcallback.c
+++ b/src/H5VLcallback.c
@@ -29,7 +29,7 @@
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
-#include "H5Fprivate.h" /* File access */
+#include "H5Fprivate.h" /* File access */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5Pprivate.h" /* Property lists */
diff --git a/src/H5VLint.c b/src/H5VLint.c
index cc5b8b7..32aa8fb 100644
--- a/src/H5VLint.c
+++ b/src/H5VLint.c
@@ -2325,11 +2325,10 @@ H5VL_wrap_register(H5I_type_t type, void *obj, hbool_t app_ref)
/* If the datatype is already VOL-managed, the datatype's vol_obj
* field will get clobbered later, so disallow this.
*/
- if (type == H5I_DATATYPE) {
+ if (type == H5I_DATATYPE)
if (vol_wrap_ctx->connector->id == H5VL_NATIVE)
if (TRUE == H5T_already_vol_managed((const H5T_t *)obj))
HGOTO_ERROR(H5E_VOL, H5E_BADTYPE, H5I_INVALID_HID, "can't wrap an uncommitted datatype")
- }
/* Wrap the object with VOL connector info */
if (NULL == (new_obj = H5VL__wrap_obj(obj, type)))
diff --git a/src/H5VLpassthru.c b/src/H5VLpassthru.c
index eacb01e..4e967d9 100644
--- a/src/H5VLpassthru.c
+++ b/src/H5VLpassthru.c
@@ -2905,8 +2905,11 @@ H5VL_pass_through_request_specific(void *obj, H5VL_request_specific_t specific_t
/* Finish use of copied vararg list */
va_end(tmp_arguments);
} /* end if */
- else
- assert(0 && "Unknown 'specific' operation");
+ else {
+ H5VL_pass_through_t *o = (H5VL_pass_through_t *)obj;
+
+ ret_value = H5VLrequest_specific(o->under_object, o->under_vol_id, specific_type, arguments);
+ } /* end else */
return ret_value;
} /* end H5VL_pass_through_request_specific() */
diff --git a/src/H5VLpublic.h b/src/H5VLpublic.h
index 19cd2b9..9c9d60a 100644
--- a/src/H5VLpublic.h
+++ b/src/H5VLpublic.h
@@ -32,12 +32,12 @@
* \ingroup H5VLDEF
* Invalid ID for VOL connector ID
*/
-#define H5_VOL_INVALID (-1)
+#define H5_VOL_INVALID (-1)
/**
* \ingroup H5VLDEF
* Native HDF5 file format VOL connector
*/
-#define H5_VOL_NATIVE 0
+#define H5_VOL_NATIVE 0
/**
* \ingroup H5VLDEF
* VOL connector IDs below this value are reserved for library use
@@ -47,7 +47,7 @@
* \ingroup H5VLDEF
* Maximum VOL connector ID
*/
-#define H5_VOL_MAX 65535
+#define H5_VOL_MAX 65535
/*******************/
/* Public Typedefs */
@@ -129,7 +129,7 @@ extern "C" {
*
* \since 1.12.0
*/
-H5_DLL hid_t H5VLregister_connector_by_name(const char *connector_name, hid_t vipl_id);
+H5_DLL hid_t H5VLregister_connector_by_name(const char *connector_name, hid_t vipl_id);
/**
* \ingroup H5VL
* \brief Registers a new VOL connector by value
@@ -168,7 +168,7 @@ H5_DLL hid_t H5VLregister_connector_by_name(const char *connector_name, hid_t
*
* \since 1.12.0
*/
-H5_DLL hid_t H5VLregister_connector_by_value(H5VL_class_value_t connector_value, hid_t vipl_id);
+H5_DLL hid_t H5VLregister_connector_by_value(H5VL_class_value_t connector_value, hid_t vipl_id);
/**
* \ingroup H5VL
* \brief Tests whether a VOL class has been registered under a certain name
@@ -182,7 +182,7 @@ H5_DLL hid_t H5VLregister_connector_by_value(H5VL_class_value_t connector_valu
*
* \since 1.12.0
*/
-H5_DLL htri_t H5VLis_connector_registered_by_name(const char *name);
+H5_DLL htri_t H5VLis_connector_registered_by_name(const char *name);
/**
* \ingroup H5VL
* \brief Tests whether a VOL class has been registered for a given value
@@ -205,7 +205,7 @@ H5_DLL htri_t H5VLis_connector_registered_by_name(const char *name);
*
* \since 1.12.0
*/
-H5_DLL htri_t H5VLis_connector_registered_by_value(H5VL_class_value_t connector_value);
+H5_DLL htri_t H5VLis_connector_registered_by_value(H5VL_class_value_t connector_value);
/**
* \ingroup H5VL
* \brief Retrieves the VOL connector identifier for a given object identifier
@@ -220,7 +220,7 @@ H5_DLL htri_t H5VLis_connector_registered_by_value(H5VL_class_value_t connector
*
* \since 1.12.0
*/
-H5_DLL hid_t H5VLget_connector_id(hid_t obj_id);
+H5_DLL hid_t H5VLget_connector_id(hid_t obj_id);
/**
* \ingroup H5VL
* \brief Retrieves the identifier for a registered VOL connector name
@@ -234,7 +234,7 @@ H5_DLL hid_t H5VLget_connector_id(hid_t obj_id);
*
* \since 1.12.0
*/
-H5_DLL hid_t H5VLget_connector_id_by_name(const char *name);
+H5_DLL hid_t H5VLget_connector_id_by_name(const char *name);
/**
* \ingroup H5VL
* \brief Retrieves the identifier for a registered VOL connector value
@@ -257,7 +257,7 @@ H5_DLL hid_t H5VLget_connector_id_by_name(const char *name);
*
* \since 1.12.0
*/
-H5_DLL hid_t H5VLget_connector_id_by_value(H5VL_class_value_t connector_value);
+H5_DLL hid_t H5VLget_connector_id_by_value(H5VL_class_value_t connector_value);
/**
* \ingroup H5VL
* \brief Retrieves a connector name for a VOL
@@ -292,7 +292,7 @@ H5_DLL ssize_t H5VLget_connector_name(hid_t id, char *name /*out*/, size_t size)
*
* \since 1.12.0
*/
-H5_DLL herr_t H5VLclose(hid_t connector_id);
+H5_DLL herr_t H5VLclose(hid_t connector_id);
/**
* \ingroup H5VL
* \brief Removes a VOL connector identifier from the library
@@ -310,7 +310,7 @@ H5_DLL herr_t H5VLclose(hid_t connector_id);
*
* \since 1.12.0
*/
-H5_DLL herr_t H5VLunregister_connector(hid_t connector_id);
+H5_DLL herr_t H5VLunregister_connector(hid_t connector_id);
/**
* \ingroup H5VL
* \brief Determine if a VOL connector supports a particular
@@ -324,7 +324,7 @@ H5_DLL herr_t H5VLunregister_connector(hid_t connector_id);
*
* \since 1.12.0
*/
-H5_DLL herr_t H5VLquery_optional(hid_t obj_id, H5VL_subclass_t subcls, int opt_type, hbool_t *supported);
+H5_DLL herr_t H5VLquery_optional(hid_t obj_id, H5VL_subclass_t subcls, int opt_type, hbool_t *supported);
#ifdef __cplusplus
}
diff --git a/src/H5VM.c b/src/H5VM.c
index a5461e8..72ec045 100644
--- a/src/H5VM.c
+++ b/src/H5VM.c
@@ -447,13 +447,8 @@ H5VM_hyper_fill(unsigned n, const hsize_t *_size, const hsize_t *total_size, con
*-------------------------------------------------------------------------
*/
herr_t
-H5VM_hyper_copy(unsigned n, const hsize_t *_size,
-
- /*destination*/
- const hsize_t *dst_size, const hsize_t *dst_offset, void *_dst,
-
- /*source*/
- const hsize_t *src_size, const hsize_t *src_offset, const void *_src)
+H5VM_hyper_copy(unsigned n, const hsize_t *_size, const hsize_t *dst_size, const hsize_t *dst_offset,
+ void *_dst, const hsize_t *src_size, const hsize_t *src_offset, const void *_src)
{
const uint8_t *src = (const uint8_t *)_src; /*cast for ptr arithmtc */
uint8_t * dst = (uint8_t *)_dst; /*cast for ptr arithmtc */
@@ -491,7 +486,7 @@ H5VM_hyper_copy(unsigned n, const hsize_t *_size,
#ifdef NO_INLINED_CODE
dst_start = H5VM_hyper_stride(n, size, dst_size, dst_offset, dst_stride);
src_start = H5VM_hyper_stride(n, size, src_size, src_offset, src_stride);
-#else /* NO_INLINED_CODE */
+#else /* NO_INLINED_CODE */
/* in-line version of two calls to H5VM_hyper_stride() */
{
hsize_t dst_acc; /*accumulator */
@@ -795,13 +790,9 @@ H5VM_stride_copy_s(unsigned n, hsize_t elmt_size, const hsize_t *size, const hss
*-------------------------------------------------------------------------
*/
static void
-H5VM__stride_copy2(hsize_t nelmts, hsize_t elmt_size,
-
- /* destination */
- unsigned dst_n, const hsize_t *dst_size, const hsize_t *dst_stride, void *_dst,
-
- /* source */
- unsigned src_n, const hsize_t *src_size, const hsize_t *src_stride, const void *_src)
+H5VM__stride_copy2(hsize_t nelmts, hsize_t elmt_size, unsigned dst_n, const hsize_t *dst_size,
+ const hsize_t *dst_stride, void *_dst, unsigned src_n, const hsize_t *src_size,
+ const hsize_t *src_stride, const void *_src)
{
uint8_t * dst = (uint8_t *)_dst;
const uint8_t *src = (const uint8_t *)_src;
diff --git a/src/H5Z.c b/src/H5Z.c
index 65b9821..7f7a450 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -47,7 +47,7 @@ typedef struct H5Z_object_t {
#ifdef H5_HAVE_PARALLEL
hbool_t
sanity_checked; /* Whether the sanity check for collectively calling H5Zunregister has been done */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
} H5Z_object_t;
/* Enumerated type for dataset creation prelude callbacks */
@@ -181,7 +181,7 @@ next:
} /* end for */
} /* end for */
} /* end if */
-#endif /* H5Z_DEBUG */
+#endif /* H5Z_DEBUG */
/* Free the table of filters */
if (H5Z_table_g) {
@@ -255,11 +255,11 @@ H5Zregister(const void *cls)
/* Set cls_real to point to the translated structure */
cls_real = &cls_new;
-#else /* H5_NO_DEPRECATED_SYMBOLS */
+#else /* H5_NO_DEPRECATED_SYMBOLS */
/* Deprecated symbols not allowed, throw an error */
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid H5Z_class_t version number");
#endif /* H5_NO_DEPRECATED_SYMBOLS */
- } /* end if */
+ } /* end if */
if (cls_real->id < 0 || cls_real->id > H5Z_FILTER_MAX)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid filter identification number")
@@ -327,7 +327,7 @@ H5Z_register(const H5Z_class2_t *cls)
#ifdef H5Z_DEBUG
HDmemset(H5Z_stat_table_g + i, 0, sizeof(H5Z_stats_t));
#endif /* H5Z_DEBUG */
- } /* end if */
+ } /* end if */
/* Filter already registered */
else {
/* Replace old contents */
@@ -582,12 +582,12 @@ done:
*-------------------------------------------------------------------------
*/
static int
-H5Z__flush_file_cb(void *obj_ptr, hid_t H5_ATTR_UNUSED obj_id, void *key H5_ATTR_PARALLEL_USED)
+H5Z__flush_file_cb(void *obj_ptr, hid_t H5_ATTR_UNUSED obj_id, void H5_ATTR_PARALLEL_USED *key)
{
H5F_t *f = (H5F_t *)obj_ptr; /* File object for operations */
#ifdef H5_HAVE_PARALLEL
H5Z_object_t *object = (H5Z_object_t *)key;
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
int ret_value = FALSE; /* Return value */
FUNC_ENTER_STATIC
@@ -632,7 +632,7 @@ H5Z__flush_file_cb(void *obj_ptr, hid_t H5_ATTR_UNUSED obj_id, void *key H5_ATTR
if (H5P_USER_TRUE == coll_md_read)
H5CX_set_coll_metadata_read(TRUE);
} /* end if */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
/* Call the flush routine for mounted file hierarchies */
if (H5F_flush_mounts((H5F_t *)obj_ptr) < 0)
diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h
index 709e5fd..56047ae 100644
--- a/src/H5Zpublic.h
+++ b/src/H5Zpublic.h
@@ -36,49 +36,49 @@ typedef int H5Z_filter_t;
/**
* no filter
*/
-#define H5Z_FILTER_ERROR (-1)
+#define H5Z_FILTER_ERROR (-1)
/**
* reserved indefinitely
-*/
-#define H5Z_FILTER_NONE 0
+ */
+#define H5Z_FILTER_NONE 0
/**
* deflation like gzip
*/
-#define H5Z_FILTER_DEFLATE 1
+#define H5Z_FILTER_DEFLATE 1
/**
* shuffle the data
*/
-#define H5Z_FILTER_SHUFFLE 2
+#define H5Z_FILTER_SHUFFLE 2
/**
* fletcher32 checksum of EDC
-*/
-#define H5Z_FILTER_FLETCHER32 3
+ */
+#define H5Z_FILTER_FLETCHER32 3
/**
* szip compression
*/
-#define H5Z_FILTER_SZIP 4
+#define H5Z_FILTER_SZIP 4
/**
* nbit compression
*/
-#define H5Z_FILTER_NBIT 5
+#define H5Z_FILTER_NBIT 5
/**
* scale+offset compression
*/
-#define H5Z_FILTER_SCALEOFFSET 6
+#define H5Z_FILTER_SCALEOFFSET 6
/**
* filter ids below this value are reserved for library use
*/
-#define H5Z_FILTER_RESERVED 256
+#define H5Z_FILTER_RESERVED 256
/**
* maximum filter id
*/
-#define H5Z_FILTER_MAX 65535
+#define H5Z_FILTER_MAX 65535
/* General macros */
/**
* Symbol to remove all filters in H5Premove_filter()
*/
-#define H5Z_FILTER_ALL 0
+#define H5Z_FILTER_ALL 0
/**
* Maximum number of filters allowed in a pipeline
*
@@ -86,35 +86,35 @@ typedef int H5Z_filter_t;
* currently each filter uses a bit in a 32-bit field, so the format
* would have to be changed to accommodate that)
*/
-#define H5Z_MAX_NFILTERS 32
+#define H5Z_MAX_NFILTERS 32
/* Flags for filter definition (stored) */
/**
* definition flag mask
*/
-#define H5Z_FLAG_DEFMASK 0x00ff
+#define H5Z_FLAG_DEFMASK 0x00ff
/**
* filter is mandatory
*/
-#define H5Z_FLAG_MANDATORY 0x0000
+#define H5Z_FLAG_MANDATORY 0x0000
/**
* filter is optional
*/
-#define H5Z_FLAG_OPTIONAL 0x0001
+#define H5Z_FLAG_OPTIONAL 0x0001
/* Additional flags for filter invocation (not stored) */
/**
* invocation flag mask
*/
-#define H5Z_FLAG_INVMASK 0xff00
+#define H5Z_FLAG_INVMASK 0xff00
/**
* reverse direction; read
*/
-#define H5Z_FLAG_REVERSE 0x0100
+#define H5Z_FLAG_REVERSE 0x0100
/**
* skip EDC filters for read
*/
-#define H5Z_FLAG_SKIP_EDC 0x0200
+#define H5Z_FLAG_SKIP_EDC 0x0200
/* Special parameters for szip compression */
/* [These are aliases for the similar definitions in szlib.h, which we can't
@@ -122,78 +122,77 @@ typedef int H5Z_filter_t;
* header file] */
/**
* \ingroup SZIP */
-#define H5_SZIP_ALLOW_K13_OPTION_MASK 1
+#define H5_SZIP_ALLOW_K13_OPTION_MASK 1
/**
* \ingroup SZIP */
-#define H5_SZIP_CHIP_OPTION_MASK 2
+#define H5_SZIP_CHIP_OPTION_MASK 2
/**
* \ingroup SZIP */
-#define H5_SZIP_EC_OPTION_MASK 4
+#define H5_SZIP_EC_OPTION_MASK 4
/**
* \ingroup SZIP */
-#define H5_SZIP_NN_OPTION_MASK 32
+#define H5_SZIP_NN_OPTION_MASK 32
/**
* \ingroup SZIP */
-#define H5_SZIP_MAX_PIXELS_PER_BLOCK 32
+#define H5_SZIP_MAX_PIXELS_PER_BLOCK 32
/* Macros for the shuffle filter */
/**
* \ingroup SHUFFLE
* Number of parameters that users can set for the shuffle filter
-*/
-#define H5Z_SHUFFLE_USER_NPARMS 0
+ */
+#define H5Z_SHUFFLE_USER_NPARMS 0
/**
* \ingroup SHUFFLE
* Total number of parameters for the shuffle filter
*/
-#define H5Z_SHUFFLE_TOTAL_NPARMS 1
+#define H5Z_SHUFFLE_TOTAL_NPARMS 1
/* Macros for the szip filter */
/**
* \ingroup SZIP
* Number of parameters that users can set for SZIP
*/
-#define H5Z_SZIP_USER_NPARMS 2
+#define H5Z_SZIP_USER_NPARMS 2
/**
* \ingroup SZIP
* Total number of parameters for SZIP filter
*/
-#define H5Z_SZIP_TOTAL_NPARMS 4
+#define H5Z_SZIP_TOTAL_NPARMS 4
/**
* \ingroup SZIP
* "User" parameter for option mask
*/
-#define H5Z_SZIP_PARM_MASK 0
+#define H5Z_SZIP_PARM_MASK 0
/**
* \ingroup SZIP
* "User" parameter for pixels-per-block
*/
-#define H5Z_SZIP_PARM_PPB 1
+#define H5Z_SZIP_PARM_PPB 1
/**
* \ingroup SZIP
* "Local" parameter for bits-per-pixel
*/
-#define H5Z_SZIP_PARM_BPP 2
+#define H5Z_SZIP_PARM_BPP 2
/**
* \ingroup SZIP
* "Local" parameter for pixels-per-scanline
*/
-#define H5Z_SZIP_PARM_PPS 3
+#define H5Z_SZIP_PARM_PPS 3
/* Macros for the nbit filter */
/**
* \ingroup NBIT
* Number of parameters that users can set for the N-bit filter
*/
-#define H5Z_NBIT_USER_NPARMS 0 /* Number of parameters that users can set */
+#define H5Z_NBIT_USER_NPARMS 0 /* Number of parameters that users can set */
/* Macros for the scale offset filter */
/**
* \ingroup SCALEOFFSET
* Number of parameters that users can set for the scale-offset filter
*/
-#define H5Z_SCALEOFFSET_USER_NPARMS 2
-
+#define H5Z_SCALEOFFSET_USER_NPARMS 2
/* Special parameters for ScaleOffset filter*/
/**
@@ -240,15 +239,14 @@ typedef enum H5Z_cb_return_t {
/**
* Filter callback function definition
*/
-typedef H5Z_cb_return_t (*H5Z_filter_func_t)(H5Z_filter_t filter, void* buf,
- size_t buf_size, void* op_data);
+typedef H5Z_cb_return_t (*H5Z_filter_func_t)(H5Z_filter_t filter, void *buf, size_t buf_size, void *op_data);
/**
* Structure for filter callback property
*/
typedef struct H5Z_cb_t {
- H5Z_filter_func_t func;
- void *op_data;
+ H5Z_filter_func_t func;
+ void * op_data;
} H5Z_cb_t;
#ifdef __cplusplus
@@ -333,14 +331,14 @@ typedef size_t (*H5Z_func_t)(unsigned int flags, size_t cd_nelmts, const unsigne
*/
//! [H5Z_class2_t_snip]
typedef struct H5Z_class2_t {
- int version; /**< Version number of the H5Z_class_t struct */
- H5Z_filter_t id; /**< Filter ID number */
- unsigned encoder_present; /**< Does this filter have an encoder? */
- unsigned decoder_present; /**< Does this filter have a decoder? */
- const char *name; /**< Comment for debugging */
- H5Z_can_apply_func_t can_apply; /**< The "can apply" callback for a filter */
- H5Z_set_local_func_t set_local; /**< The "set local" callback for a filter */
- H5Z_func_t filter; /**< The actual filter function */
+ int version; /**< Version number of the H5Z_class_t struct */
+ H5Z_filter_t id; /**< Filter ID number */
+ unsigned encoder_present; /**< Does this filter have an encoder? */
+ unsigned decoder_present; /**< Does this filter have a decoder? */
+ const char * name; /**< Comment for debugging */
+ H5Z_can_apply_func_t can_apply; /**< The "can apply" callback for a filter */
+ H5Z_set_local_func_t set_local; /**< The "set local" callback for a filter */
+ H5Z_func_t filter; /**< The actual filter function */
} H5Z_class2_t;
//! [H5Z_class2_t_snip]
@@ -639,11 +637,11 @@ H5_DLL herr_t H5Zget_filter_info(H5Z_filter_t filter, unsigned int *filter_confi
*/
//! [H5Z_class1_t_snip]
typedef struct H5Z_class1_t {
- H5Z_filter_t id; /**< Filter ID number */
- const char *name; /**< Comment for debugging */
+ H5Z_filter_t id; /**< Filter ID number */
+ const char * name; /**< Comment for debugging */
H5Z_can_apply_func_t can_apply; /**< The "can apply" callback for a filter */
H5Z_set_local_func_t set_local; /**< The "set local" callback for a filter */
- H5Z_func_t filter; /**< The actual filter function */
+ H5Z_func_t filter; /**< The actual filter function */
} H5Z_class1_t;
//! [H5Z_class1_t_snip]
diff --git a/src/H5Zshuffle.c b/src/H5Zshuffle.c
index 2e3ff97..354d4df 100644
--- a/src/H5Zshuffle.c
+++ b/src/H5Zshuffle.c
@@ -123,7 +123,7 @@ H5Z__filter_shuffle(unsigned flags, size_t cd_nelmts, const unsigned cd_values[]
size_t i; /* Local index variables */
#ifdef NO_DUFFS_DEVICE
size_t j; /* Local index variable */
-#endif /* NO_DUFFS_DEVICE */
+#endif /* NO_DUFFS_DEVICE */
size_t leftover; /* Extra bytes at end of buffer */
size_t ret_value = 0; /* Return value */
@@ -165,7 +165,7 @@ H5Z__filter_shuffle(unsigned flags, size_t cd_nelmts, const unsigned cd_values[]
j--;
} /* end for */
-#else /* NO_DUFFS_DEVICE */
+#else /* NO_DUFFS_DEVICE */
{
size_t duffs_index; /* Counting index for Duff's device */
@@ -208,7 +208,7 @@ H5Z__filter_shuffle(unsigned flags, size_t cd_nelmts, const unsigned cd_values[]
} while (--duffs_index > 0);
} /* end switch */
}
-#endif /* NO_DUFFS_DEVICE */
+#endif /* NO_DUFFS_DEVICE */
#undef DUFF_GUTS
} /* end for */
@@ -236,7 +236,7 @@ H5Z__filter_shuffle(unsigned flags, size_t cd_nelmts, const unsigned cd_values[]
j--;
} /* end for */
-#else /* NO_DUFFS_DEVICE */
+#else /* NO_DUFFS_DEVICE */
{
size_t duffs_index; /* Counting index for Duff's device */
@@ -279,7 +279,7 @@ H5Z__filter_shuffle(unsigned flags, size_t cd_nelmts, const unsigned cd_values[]
} while (--duffs_index > 0);
} /* end switch */
}
-#endif /* NO_DUFFS_DEVICE */
+#endif /* NO_DUFFS_DEVICE */
#undef DUFF_GUTS
} /* end for */
diff --git a/src/H5Ztrans.c b/src/H5Ztrans.c
index a61a52d..cde1862 100644
--- a/src/H5Ztrans.c
+++ b/src/H5Ztrans.c
@@ -1033,7 +1033,7 @@ H5Z_xform_eval(H5Z_data_xform_t *data_xform_prop, void *array, size_t array_size
#if CHAR_MIN >= 0
else if (array_type == H5T_NATIVE_SCHAR)
H5Z_XFORM_DO_OP5(signed char, array_size)
-#else /* CHAR_MIN >= 0 */
+#else /* CHAR_MIN >= 0 */
else if (array_type == H5T_NATIVE_UCHAR)
H5Z_XFORM_DO_OP5(unsigned char, array_size)
#endif /* CHAR_MIN >= 0 */
diff --git a/src/H5detect.c b/src/H5detect.c
index 973cd97..e383d9b 100644
--- a/src/H5detect.c
+++ b/src/H5detect.c
@@ -1140,7 +1140,7 @@ print_header(void)
#ifdef H5_HAVE_GETPWUID
struct passwd *pwd = NULL;
#else
- int pwd = 1;
+ int pwd = 1;
#endif
static const char *month_name[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
diff --git a/src/H5make_libsettings.c b/src/H5make_libsettings.c
index 617d1f5..2afa531 100644
--- a/src/H5make_libsettings.c
+++ b/src/H5make_libsettings.c
@@ -144,7 +144,7 @@ print_header(void)
#ifdef H5_HAVE_GETPWUID
struct passwd *pwd = NULL;
#else
- int pwd = 1;
+ int pwd = 1;
#endif
static const char *month_name[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
diff --git a/src/H5module.h b/src/H5module.h
index f6884b1..2b7d858 100644
--- a/src/H5module.h
+++ b/src/H5module.h
@@ -22,9 +22,9 @@
* reporting macros.
*/
#define H5_MODULE
-#define H5_MY_PKG H5
-#define H5_MY_PKG_ERR H5E_LIB
-#define H5_MY_PKG_INIT YES
+#define H5_MY_PKG H5
+#define H5_MY_PKG_ERR H5E_LIB
+#define H5_MY_PKG_INIT YES
/**\defgroup H5 H5
* \brief General Library Functions
diff --git a/src/H5private.h b/src/H5private.h
index 600089d..38742ed 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -480,11 +480,11 @@ typedef unsigned char uint8_t;
#if H5_SIZEOF_INT16_T >= 2
#elif H5_SIZEOF_SHORT >= 2
-typedef short int16_t;
+typedef short int16_t;
#undef H5_SIZEOF_INT16_T
#define H5_SIZEOF_INT16_T H5_SIZEOF_SHORT
#elif H5_SIZEOF_INT >= 2
-typedef int int16_t;
+typedef int int16_t;
#undef H5_SIZEOF_INT16_T
#define H5_SIZEOF_INT16_T H5_SIZEOF_INT
#else
@@ -506,11 +506,11 @@ typedef unsigned uint16_t;
#if H5_SIZEOF_INT32_T >= 4
#elif H5_SIZEOF_SHORT >= 4
-typedef short int32_t;
+typedef short int32_t;
#undef H5_SIZEOF_INT32_T
#define H5_SIZEOF_INT32_T H5_SIZEOF_SHORT
#elif H5_SIZEOF_INT >= 4
-typedef int int32_t;
+typedef int int32_t;
#undef H5_SIZEOF_INT32_T
#define H5_SIZEOF_INT32_T H5_SIZEOF_INT
#elif H5_SIZEOF_LONG >= 4
@@ -682,7 +682,7 @@ typedef struct {
#endif /* HDabs */
#ifndef HDaccept
#define HDaccept(A, B, C) accept((A), (B), (C)) /* mirror VFD */
-#endif /* HDaccept */
+#endif /* HDaccept */
#ifndef HDaccess
#define HDaccess(F, M) access(F, M)
#endif /* HDaccess */
@@ -709,7 +709,7 @@ typedef struct {
#endif /* HDasin */
#ifndef HDasprintf
#define HDasprintf asprintf /*varargs*/
-#endif /* HDasprintf */
+#endif /* HDasprintf */
#ifndef HDassert
#define HDassert(X) assert(X)
#endif /* HDassert */
@@ -736,7 +736,7 @@ typedef struct {
#endif /* HDatol */
#ifndef HDbind
#define HDbind(A, B, C) bind((A), (B), (C)) /* mirror VFD */
-#endif /* HDbind */
+#endif /* HDbind */
#ifndef HDbsearch
#define HDbsearch(K, B, N, Z, F) bsearch(K, B, N, Z, F)
#endif /* HDbsearch */
@@ -784,7 +784,7 @@ typedef struct {
#endif /* HDclosedir */
#ifndef HDconnect
#define HDconnect(A, B, C) connect((A), (B), (C)) /* mirror VFD */
-#endif /* HDconnect */
+#endif /* HDconnect */
#ifndef HDcos
#define HDcos(X) cos(X)
#endif /* HDcos */
@@ -1033,7 +1033,7 @@ typedef off_t h5_stat_size_t;
#endif /* HDgetgroups */
#ifndef HDgethostbyaddr
#define HDgethostbyaddr(A, B, C) gethostbyaddr((A), (B), (C)) /* mirror VFD */
-#endif /* HDgethostbyaddr */
+#endif /* HDgethostbyaddr */
#ifndef HDgethostname
#define HDgethostname(N, L) gethostname(N, L)
#endif /* HDgethostname */
@@ -1075,55 +1075,55 @@ typedef off_t h5_stat_size_t;
#endif /* HDgmtime */
#ifndef HDhtonl
#define HDhtonl(X) htonl((X)) /* mirror VFD */
-#endif /* HDhtonl */
+#endif /* HDhtonl */
#ifndef HDhtons
#define HDhtons(X) htons((X)) /* mirror VFD */
-#endif /* HDhtons */
+#endif /* HDhtons */
#ifndef HDinet_addr
#define HDinet_addr(C) inet_addr((C)) /* mirror VFD */
-#endif /* HDinet_addr */
+#endif /* HDinet_addr */
#ifndef HDinet_ntoa
#define HDinet_ntoa(C) inet_ntoa((C)) /* mirror VFD */
-#endif /* HDinet_ntoa */
+#endif /* HDinet_ntoa */
#ifndef HDisalnum
#define HDisalnum(C) isalnum((int)(C)) /*cast for solaris warning*/
-#endif /* HDisalnum */
+#endif /* HDisalnum */
#ifndef HDisalpha
#define HDisalpha(C) isalpha((int)(C)) /*cast for solaris warning*/
-#endif /* HDisalpha */
+#endif /* HDisalpha */
#ifndef HDisatty
#define HDisatty(F) isatty(F)
#endif /* HDisatty */
#ifndef HDiscntrl
#define HDiscntrl(C) iscntrl((int)(C)) /*cast for solaris warning*/
-#endif /* HDiscntrl */
+#endif /* HDiscntrl */
#ifndef HDisdigit
#define HDisdigit(C) isdigit((int)(C)) /*cast for solaris warning*/
-#endif /* HDisdigit */
+#endif /* HDisdigit */
#ifndef HDisgraph
#define HDisgraph(C) isgraph((int)(C)) /*cast for solaris warning*/
-#endif /* HDisgraph */
+#endif /* HDisgraph */
#ifndef HDislower
#define HDislower(C) islower((int)(C)) /*cast for solaris warning*/
-#endif /* HDislower */
+#endif /* HDislower */
#ifndef HDisnan
#define HDisnan(X) isnan(X)
#endif /* HDisnan */
#ifndef HDisprint
#define HDisprint(C) isprint((int)(C)) /*cast for solaris warning*/
-#endif /* HDisprint */
+#endif /* HDisprint */
#ifndef HDispunct
#define HDispunct(C) ispunct((int)(C)) /*cast for solaris warning*/
-#endif /* HDispunct */
+#endif /* HDispunct */
#ifndef HDisspace
#define HDisspace(C) isspace((int)(C)) /*cast for solaris warning*/
-#endif /* HDisspace */
+#endif /* HDisspace */
#ifndef HDisupper
#define HDisupper(C) isupper((int)(C)) /*cast for solaris warning*/
-#endif /* HDisupper */
+#endif /* HDisupper */
#ifndef HDisxdigit
#define HDisxdigit(C) isxdigit((int)(C)) /*cast for solaris warning*/
-#endif /* HDisxdigit */
+#endif /* HDisxdigit */
#ifndef HDkill
#define HDkill(P, S) kill(P, S)
#endif /* HDkill */
@@ -1141,7 +1141,7 @@ typedef off_t h5_stat_size_t;
#endif /* HDlink */
#ifndef HDlisten
#define HDlisten(A, B) listen((A), (B)) /* mirror VFD */
-#endif /* HDlisten */
+#endif /* HDlisten */
#ifndef HDllround
#define HDllround(V) llround(V)
#endif /* HDround */
@@ -1225,10 +1225,10 @@ typedef off_t h5_stat_size_t;
#endif /* HDnanosleep */
#ifndef HDntohl
#define HDntohl(A) ntohl((A)) /* mirror VFD */
-#endif /* HDntohl */
+#endif /* HDntohl */
#ifndef HDntohs
#define HDntohs(A) ntohs((A)) /* mirror VFD */
-#endif /* HDntohs */
+#endif /* HDntohs */
#ifndef HDopen
#define HDopen(F, ...) open(F, __VA_ARGS__)
#endif /* HDopen */
@@ -1300,7 +1300,7 @@ H5_DLL void HDsrand(unsigned int seed);
#ifndef HDsrandom
#define HDsrandom(S) srandom(S)
#endif /* HDsrandom */
-#else /* H5_HAVE_RANDOM */
+#else /* H5_HAVE_RANDOM */
#ifndef HDrand
#define HDrand() rand()
#endif /* HDrand */
@@ -1378,7 +1378,7 @@ H5_DLL void HDsrand(unsigned int seed);
#endif /* HDsetsid */
#ifndef HDsetsockopt
#define HDsetsockopt(A, B, C, D, E) setsockopt((A), (B), (C), (D), (E)) /* mirror VFD */
-#endif /* HDsetsockopt */
+#endif /* HDsetsockopt */
#ifndef HDsetuid
#define HDsetuid(U) setuid(U)
#endif /* HDsetuid */
@@ -1387,7 +1387,7 @@ H5_DLL void HDsrand(unsigned int seed);
#endif /* HDsetvbuf */
#ifndef HDshutdown
#define HDshutdown(A, B) shutdown((A), (B)) /* mirror VFD */
-#endif /* HDshutdown */
+#endif /* HDshutdown */
#ifndef HDsigaction
#define HDsigaction(S, A, O) sigaction((S), (A), (O))
#endif /* HDsigaction */
@@ -1435,13 +1435,13 @@ H5_DLL void HDsrand(unsigned int seed);
#endif /* HDsleep */
#ifndef HDsnprintf
#define HDsnprintf snprintf /*varargs*/
-#endif /* HDsnprintf */
+#endif /* HDsnprintf */
#ifndef HDsocket
#define HDsocket(A, B, C) socket((A), (B), (C)) /* mirror VFD */
-#endif /* HDsocket */
+#endif /* HDsocket */
#ifndef HDsprintf
#define HDsprintf sprintf /*varargs*/
-#endif /* HDsprintf */
+#endif /* HDsprintf */
#ifndef HDsqrt
#define HDsqrt(X) sqrt(X)
#endif /* HDsqrt */
@@ -1655,7 +1655,7 @@ H5_DLL int64_t HDstrtoll(const char *s, const char **rest, int base);
* define these in terms of macros.
*/
#if !defined strdup && !defined H5_HAVE_STRDUP
-extern char * strdup(const char *s);
+extern char *strdup(const char *s);
#endif
#ifndef HDstrdup
@@ -1941,7 +1941,7 @@ extern char H5libhdf5_settings[]; /* embedded library information */
#define H5TRACE11(R, T, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10) /*void*/
#define H5TRACE12(R, T, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11) /*void*/
#define H5TRACE_RETURN(V) /*void*/
-#endif /* H5_DEBUG_API */
+#endif /* H5_DEBUG_API */
H5_DLL double H5_trace(const double *calltime, const char *func, const char *type, ...);
@@ -2071,10 +2071,10 @@ extern hbool_t H5_libterm_g; /* Is the library being shutdown? */
#define H5_PUSH_FUNC H5CS_push(FUNC);
#define H5_POP_FUNC H5CS_pop();
-#else /* H5_HAVE_CODESTACK */
+#else /* H5_HAVE_CODESTACK */
#define H5_PUSH_FUNC /* void */
#define H5_POP_FUNC /* void */
-#endif /* H5_HAVE_CODESTACK */
+#endif /* H5_HAVE_CODESTACK */
#ifdef H5_HAVE_MPE
extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */
@@ -2127,7 +2127,7 @@ H5_DLL herr_t H5CX_pop(void);
func_check = TRUE; \
} /* end if */ \
} /* end scope */
-#else /* NDEBUG */
+#else /* NDEBUG */
#define FUNC_ENTER_CHECK_NAME(asrt)
#endif /* NDEBUG */
diff --git a/src/H5public.h b/src/H5public.h
index 44e0d94..9e31cbe 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -176,15 +176,15 @@ typedef long long ssize_t;
*/
#if H5_SIZEOF_INT64_T >= 8
#elif H5_SIZEOF_INT >= 8
-typedef int int64_t;
+typedef int int64_t;
#undef H5_SIZEOF_INT64_T
#define H5_SIZEOF_INT64_T H5_SIZEOF_INT
#elif H5_SIZEOF_LONG >= 8
-typedef long int64_t;
+typedef long int64_t;
#undef H5_SIZEOF_INT64_T
#define H5_SIZEOF_INT64_T H5_SIZEOF_LONG
#elif H5_SIZEOF_LONG_LONG >= 8
-typedef long long int64_t;
+typedef long long int64_t;
#undef H5_SIZEOF_INT64_T
#define H5_SIZEOF_INT64_T H5_SIZEOF_LONG_LONG
#else
@@ -199,12 +199,12 @@ typedef long long int64_t;
#define UINT64_MAX ((uint64_t)-1)
#endif
#elif H5_SIZEOF_INT >= 8
-typedef unsigned uint64_t;
+typedef unsigned uint64_t;
#define UINT64_MAX UINT_MAX
#undef H5_SIZEOF_UINT64_T
#define H5_SIZEOF_UINT64_T H5_SIZEOF_INT
#elif H5_SIZEOF_LONG >= 8
-typedef unsigned long uint64_t;
+typedef unsigned long uint64_t;
#define UINT64_MAX ULONG_MAX
#undef H5_SIZEOF_UINT64_T
#define H5_SIZEOF_UINT64_T H5_SIZEOF_LONG
@@ -289,15 +289,15 @@ typedef unsigned long long haddr_t;
*/
#if H5_SIZEOF_UINT32_T >= 4
#elif H5_SIZEOF_SHORT >= 4
-typedef short uint32_t;
+typedef short uint32_t;
#undef H5_SIZEOF_UINT32_T
#define H5_SIZEOF_UINT32_T H5_SIZEOF_SHORT
#elif H5_SIZEOF_INT >= 4
-typedef unsigned int uint32_t;
+typedef unsigned int uint32_t;
#undef H5_SIZEOF_UINT32_T
#define H5_SIZEOF_UINT32_T H5_SIZEOF_INT
#elif H5_SIZEOF_LONG >= 4
-typedef unsigned long uint32_t;
+typedef unsigned long uint32_t;
#undef H5_SIZEOF_UINT32_T
#define H5_SIZEOF_UINT32_T H5_SIZEOF_LONG
#else
@@ -719,7 +719,7 @@ H5_DLL herr_t H5free_memory(void *mem);
* \since 1.8.15
*
*/
-H5_DLL void * H5allocate_memory(size_t size, hbool_t clear);
+H5_DLL void *H5allocate_memory(size_t size, hbool_t clear);
/**
* \ingroup H5
* \brief Resizes and, if required, re-allocates memory that will later be
@@ -793,7 +793,7 @@ H5_DLL void * H5allocate_memory(size_t size, hbool_t clear);
* \since 1.8.15
*
*/
-H5_DLL void * H5resize_memory(void *mem, size_t size);
+H5_DLL void *H5resize_memory(void *mem, size_t size);
#ifdef __cplusplus
}
diff --git a/src/H5system.c b/src/H5system.c
index a817b7c..fdc6c22 100644
--- a/src/H5system.c
+++ b/src/H5system.c
@@ -347,7 +347,7 @@ H5_make_time(struct tm *tm)
* VS 2015 is removed, with _get_timezone replacing it.
*/
long timezone = 0;
-#endif /* defined(H5_HAVE_VISUAL_STUDIO) && (_MSC_VER >= 1900) */
+#endif /* defined(H5_HAVE_VISUAL_STUDIO) && (_MSC_VER >= 1900) */
time_t ret_value = 0; /* Return value */
FUNC_ENTER_NOAPI_NOINIT
diff --git a/src/H5timer.c b/src/H5timer.c
index b53c302..b637a16 100644
--- a/src/H5timer.c
+++ b/src/H5timer.c
@@ -164,7 +164,7 @@ H5_now(void)
HDgettimeofday(&now_tv, NULL);
now = now_tv.tv_sec;
}
-#else /* H5_HAVE_GETTIMEOFDAY */
+#else /* H5_HAVE_GETTIMEOFDAY */
now = HDtime(NULL);
#endif /* H5_HAVE_GETTIMEOFDAY */
@@ -202,8 +202,8 @@ H5_now_usec(void)
HDgettimeofday(&now_tv, NULL);
now = (uint64_t)(now_tv.tv_sec * (1000 * 1000)) + (uint64_t)now_tv.tv_usec;
}
-#else /* H5_HAVE_GETTIMEOFDAY */
- now = (uint64_t)(HDtime(NULL) * (1000 * 1000));
+#else /* H5_HAVE_GETTIMEOFDAY */
+ now = (uint64_t)(HDtime(NULL) * (1000 * 1000));
#endif /* H5_HAVE_GETTIMEOFDAY */
return (now);
diff --git a/src/H5trace.c b/src/H5trace.c
index 0ffa0aa..5fc84b0 100644
--- a/src/H5trace.c
+++ b/src/H5trace.c
@@ -26,7 +26,7 @@
/* Module Setup */
/****************/
#include "H5module.h" /* This source code file is part of the H5 module */
-#define H5I_FRIEND /*suppress error about including H5Ipkg */
+#define H5I_FRIEND /*suppress error about including H5Ipkg */
/***********/
/* Headers */
@@ -3718,5 +3718,5 @@ error:
if (H5_debug_g.ttimes)
return function_times.elapsed;
else
- return 0.0F;
+ return (double)0.0F;
} /* end H5_trace() */
diff --git a/test/Makefile.am b/test/Makefile.am
index 7ebeae7..7f4edd4 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -61,7 +61,8 @@ TEST_PROG= testhdf5 \
stab gheap evict_on_close farray earray btree2 fheap \
pool accum hyperslab istore bittests dt_arith page_buffer \
dtypes dsets chunk_info cmpd_dset filter_fail extend direct_chunk \
- external efc objcopy objcopy_ref links unlink twriteorder big mtime fillval mount \
+ external efc objcopy objcopy_ref links unlink twriteorder big mtime \
+ fillval mount \
flush1 flush2 app_ref enum set_extent ttsafe enc_dec_plist \
enc_dec_plist_cross_platform getname vfd ros3 s3comms hdfs ntypes \
dangle dtransform reserved cross_read freespace mf vds file_image \
diff --git a/test/accum.c b/test/accum.c
index 0b9fbad..46015c9 100644
--- a/test/accum.c
+++ b/test/accum.c
@@ -2101,7 +2101,7 @@ test_swmr_write_big(hbool_t newest_format)
unsigned u; /* Local index variable */
#ifdef H5_HAVE_UNISTD_H
pid_t pid; /* Process ID */
-#endif /* H5_HAVE_UNISTD_H */
+#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 42f9a61..919a6ee 100644
--- a/test/btree2.c
+++ b/test/btree2.c
@@ -2690,7 +2690,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
@@ -2871,7 +2871,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 b7269ba..0e923fd 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 aa32858..87fab72 100644
--- a/test/cache_common.h
+++ b/test/cache_common.h
@@ -392,8 +392,7 @@ typedef struct test_entry_t {
int flush_dep_par_idx[MAX_FLUSH_DEP_PARS]; /* Indices of flush dependency parents */
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.) */
+ unsigned 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 b2975d1..9d0aa3e 100644
--- a/test/cache_tagging.c
+++ b/test/cache_tagging.c
@@ -444,7 +444,7 @@ check_file_creation_tags(hid_t fcpl_id, int type)
hid_t fid = -1; /* File Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose test outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = 0;
haddr_t sbe_tag = 0;
@@ -548,7 +548,7 @@ 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 */ /* end debugging functions */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag; /* Root Group Tag */
haddr_t sbe_tag; /* Sblock Extension Tag */
@@ -678,7 +678,7 @@ check_group_creation_tags(void)
hid_t gid = -1; /* Group Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#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 */
@@ -801,7 +801,7 @@ check_multi_group_creation_tags(void)
hid_t gid = -1; /* Group Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif /* NDEBUG */
char gname[16]; /* group name buffer */
int i = 0; /* iterator */
hid_t fapl = -1; /* File access prop list */
@@ -953,7 +953,7 @@ check_link_iteration_tags(void)
hid_t did = -1; /* Group Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif /* NDEBUG */
int i = 0; /* iterator */
haddr_t root_tag = 0; /* Root Group Tag Value */
char dsetname[500]; /* Name of dataset */
@@ -1095,7 +1095,7 @@ check_dense_attribute_tags(void)
hid_t dcpl = -1; /* Group Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif /* NDEBUG */
int i = 0; /* iterator */
hid_t fapl = -1; /* File access property list */
haddr_t d_tag = 0; /* Dataset tag value */
@@ -1325,7 +1325,7 @@ check_group_open_tags(void)
hid_t gid = -1; /* Group Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file output */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = HADDR_UNDEF;
haddr_t g_tag;
@@ -1456,7 +1456,7 @@ check_attribute_creation_tags(hid_t fcpl, int type)
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = 0; /* Root group tag */
haddr_t g_tag = 0;
@@ -1621,7 +1621,7 @@ check_attribute_open_tags(hid_t fcpl, int type)
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = 0;
haddr_t g_tag = 0;
@@ -1788,7 +1788,7 @@ check_attribute_rename_tags(hid_t fcpl, int type)
hid_t sid = -1; /* Dataset Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif /* NDEBUG */
int * data = NULL; /* data buffer */
int i, j, k = 0; /* iterators */
hid_t fapl = -1; /* File access prop list */
@@ -2001,7 +2001,7 @@ check_attribute_delete_tags(hid_t fcpl, int type)
hid_t sid = -1; /* Dataset Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif /* NDEBUG */
int * data = NULL; /* data buffer */
int i, j, k = 0; /* iterators */
hid_t fapl = -1; /* File access prop list */
@@ -2192,7 +2192,7 @@ check_dataset_creation_tags(hid_t fcpl, int type)
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -2352,7 +2352,7 @@ check_dataset_creation_earlyalloc_tags(hid_t fcpl, int type)
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -2518,7 +2518,7 @@ check_dataset_open_tags(void)
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -2670,7 +2670,7 @@ check_dataset_write_tags(void)
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -2837,7 +2837,7 @@ check_attribute_write_tags(hid_t fcpl, int type)
hid_t sid = -1; /* Dataset Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif /* NDEBUG */
int * data = NULL; /* data buffer */
int i, j, k = 0; /* iterators */
hid_t fapl = -1; /* File access prop list */
@@ -3023,7 +3023,7 @@ check_dataset_read_tags(void)
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -3185,7 +3185,7 @@ check_dataset_size_retrieval(void)
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -3349,7 +3349,7 @@ check_dataset_extend_tags(void)
hid_t sid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -3511,7 +3511,7 @@ check_object_info_tags(void)
hid_t gid = -1; /* Group Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file output */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = HADDR_UNDEF;
haddr_t g_tag;
@@ -3646,7 +3646,7 @@ check_object_copy_tags(void)
hid_t gid = -1; /* Group Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file output */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = HADDR_UNDEF;
haddr_t g_tag;
@@ -3796,7 +3796,7 @@ check_link_removal_tags(hid_t fcpl, int type)
hid_t gid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -3985,7 +3985,7 @@ check_link_getname_tags(void)
hid_t gid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif /* NDEBUG */
hid_t dcpl = -1; /* dataset creation pl */
hsize_t cdims[2] = {1, 1}; /* chunk dimensions */
int fillval = 0;
@@ -4162,7 +4162,7 @@ check_external_link_creation_tags(void)
hid_t gid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#endif /* NDEBUG */
hid_t fapl = -1; /* File access prop list */
haddr_t root_tag = 0;
@@ -4289,7 +4289,7 @@ check_external_link_open_tags(void)
hid_t xid = -1; /* Dataspace Identifier */
#ifndef NDEBUG
int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */ /* end debugging functions */
+#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 cc35bfe..d45e923 100644
--- a/test/chunk_info.c
+++ b/test/chunk_info.c
@@ -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 22c6828..7455752 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 a7b67ef..2e9e3db 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -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 7b2274c..49c1e8c 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 13cf6e8..e973f92 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 4ef79ee..21db0d8 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 bcb2ec4..a47fa85 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 */
@@ -511,7 +511,7 @@ error:
/*-------------------------------------------------------------------------
* Function: test_copy
*
- * Purpose: Test copyinging an error stack
+ * Purpose: Test copying an error stack
*
* Return: Success: 0
* Failure: -1
diff --git a/test/farray.c b/test/farray.c
index 46889a3..5758a3f 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 9a73cd0..f8f9d16 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -9423,9 +9423,8 @@ 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 first indirect blocks */
- unsigned row; /* Current row in indirect block */
+ 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 */
@@ -9555,8 +9554,7 @@ test_man_fill_2nd_direct_less_one_wrap_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 first indirect blocks */
+ unsigned 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 */
@@ -9701,9 +9699,8 @@ test_man_fill_direct_skip_2nd_indirect_skip_2nd_block_add_skipped(hid_t fapl, H5
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 first indirect blocks */
- unsigned row; /* Current row in indirect block */
+ 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 */
@@ -9864,8 +9861,7 @@ test_man_fill_direct_skip_indirect_two_rows_add_skipped(hid_t fapl, H5HF_create_
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 first indirect blocks */
+ unsigned 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 */
@@ -10020,8 +10016,7 @@ test_man_fill_direct_skip_indirect_two_rows_skip_indirect_row_add_skipped(hid_t
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 first indirect blocks */
+ unsigned 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 */
@@ -10477,8 +10472,7 @@ test_man_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped(h
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 first indirect blocks */
+ unsigned 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 */
@@ -10630,8 +10624,7 @@ test_man_fill_2nd_direct_fill_direct_skip2_3rd_indirect_start_block_add_skipped(
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 first indirect blocks */
+ unsigned 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 */
@@ -10787,8 +10780,7 @@ test_man_fill_3rd_direct_less_one_fill_direct_wrap_start_block_add_skipped(hid_t
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 first indirect blocks */
+ unsigned 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 */
@@ -10951,8 +10943,7 @@ test_man_fill_1st_row_3rd_direct_fill_2nd_direct_less_one_wrap_start_block_add_s
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 first indirect blocks */
+ unsigned 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 */
@@ -11119,8 +11110,7 @@ test_man_fill_3rd_direct_fill_direct_skip_start_block_add_skipped(hid_t fapl, H5
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 first indirect blocks */
+ unsigned 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 */
@@ -11282,8 +11272,7 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_blo
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 first indirect blocks */
+ unsigned 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 */
@@ -11465,8 +11454,7 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_two_rows_
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 first indirect blocks */
+ unsigned 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 */
@@ -11685,8 +11673,7 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_star
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 first indirect blocks */
+ unsigned 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 */
@@ -11885,8 +11872,7 @@ test_man_fill_4th_direct_less_one_fill_2nd_direct_fill_direct_skip_3rd_indirect_
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 first indirect blocks */
+ unsigned 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 */
@@ -12416,8 +12402,7 @@ test_man_frag_2nd_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *
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 first indirect blocks */
+ unsigned 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 */
@@ -13827,7 +13812,6 @@ test_filtered_huge(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam
if (reopen_heap(f, &fh, fh_addr, tparam) < 0)
TEST_ERROR
-/* QAK */
#ifdef QAK
/* Close the fractal heap */
if (H5HF_close(fh) < 0)
@@ -13854,7 +13838,6 @@ test_filtered_huge(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam
if (NULL == (fh = H5HF_open(f, fh_addr)))
FAIL_STACK_ERROR
#endif /* QAK */
- /* QAK */
/* Check up on heap... */
state.huge_size = obj_size;
@@ -14954,7 +14937,7 @@ test_filtered_man_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para
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 */
+#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 */
@@ -15127,7 +15110,7 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa
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 */
+#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 7956ab3..cf2272c 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 ca635a1..641beac 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 b21adeb..ad85898 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 030cc65..28ddf54 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 f0932dc..055e1dc 100644
--- a/test/links.c
+++ b/test/links.c
@@ -12316,7 +12316,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)")
@@ -12570,7 +12570,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");
@@ -19183,7 +19183,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u
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 */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
herr_t ret; /* Generic return value */
/* Iterate over links in group */
@@ -19291,7 +19291,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 */
@@ -19671,7 +19671,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links
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 */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
herr_t ret; /* Generic return value */
/* Iterate over links in group */
@@ -19779,7 +19779,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 */
@@ -22502,12 +22502,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 */
+#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 395a19a..5d345a8 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 876e7de..31744af 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 c6173fd..f3e96b5 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 */
/*----------------------------------------------------------------------------
@@ -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 2ad4fd5..672d5ff 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 739a1ba..e68c000 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 61d312b..ded0115 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_remove_reader.c b/test/swmr_remove_reader.c
index 9017793..1700ece 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 4706b7a..14eef3d 100644
--- a/test/swmr_sparse_writer.c
+++ b/test/swmr_sparse_writer.c
@@ -150,7 +150,7 @@ add_records(hid_t fid, unsigned verbose, unsigned long nrecords, unsigned long f
unsigned long rec_to_flush; /* # of records left to write before flush */
#ifdef OUT
volatile int dummy; /* Dummy varialbe for busy sleep */
-#endif /* OUT */
+#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 7bc215d..ad669a1 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -5436,7 +5436,7 @@ 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 */
+#endif /* LATER */
unsigned curr_dset; /* Current dataset to work on */
unsigned u; /* Local index variable */
herr_t ret; /* Generic return value */
@@ -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);
@@ -6862,7 +6862,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx
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 */
+#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 3d75f9b..94b3ea3 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -7846,7 +7846,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 8b67159..c2409c1 100644
--- a/test/th5o.c
+++ b/test/th5o.c
@@ -1737,7 +1737,7 @@ 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 */
+#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/thread_id.c b/test/thread_id.c
index d8ddaf8..e39b674 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 2d842be..40a1df5 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -1256,7 +1256,7 @@ test_misc8(void)
#ifdef VERIFY_DATA
int *rdata; /* Data to read */
int *tdata2; /* Temporary pointer to data to read */
-#endif /* VERIFY_DATA */
+#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);
@@ -2963,7 +2963,7 @@ test_misc18(void)
hid_t aid; /* Attribute ID */
#ifndef H5_NO_DEPRECATED_SYMBOLS
H5O_info1_t old_oinfo; /* (deprecated) information about object */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
+#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");
@@ -5787,7 +5787,7 @@ test_misc(void)
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 */
+#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 71e42e6..872875d 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)
{
@@ -3822,7 +3822,7 @@ test_sohm(void)
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 2b98ded..6862a0b 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/ttsafe_error.c b/test/ttsafe_error.c
index f92c65e..0b44958 100644
--- a/test/ttsafe_error.c
+++ b/test/ttsafe_error.c
@@ -72,7 +72,7 @@ tts_error(void)
/* Must initialize these at runtime */
expected_g[0].maj_num = H5E_DATASET;
- expected_g[0].min_num = H5E_CANTINIT;
+ expected_g[0].min_num = H5E_CANTCREATE;
expected_g[1].maj_num = H5E_VOL;
expected_g[1].min_num = H5E_CANTCREATE;
@@ -134,7 +134,8 @@ tts_error(void)
if (error_flag_g) {
TestErrPrintf(
"At least one thread reported a value that was different from the expected value\n");
- HDprintf("(Update this test if the error stack changed!)\n");
+ HDprintf(
+ "(Update the expected_g[] array in tts_error for this test if the error stack changed!)\n");
}
if (error_count_g != NUM_THREAD - 1)
@@ -241,7 +242,18 @@ walk_error_callback(unsigned n, const H5E_error2_t *err_desc, void H5_ATTR_UNUSE
return SUCCEED;
}
+ /* Unexpected error stack entry, print some info and set flag */
+ HDfprintf(stderr, "Unexpected error stack entry!\n");
+ HDfprintf(stderr, "Stack entry: %d\n", n);
+ HDfprintf(stderr,
+ "Actual: maj_num = %" PRIxHID ", min_num = %" PRIxHID
+ ", line = %u, func = '%s', file = '%s', desc = '%s'\n",
+ err_desc->maj_num, err_desc->min_num, err_desc->line, err_desc->func_name, err_desc->file_name,
+ err_desc->desc);
+ HDfprintf(stderr, "Expected: maj_num = %" PRIxHID ", min_num = %" PRIxHID "\n", expected_g[n].maj_num,
+ expected_g[n].min_num);
error_flag_g = -1;
+
return SUCCEED;
}
diff --git a/test/vds.c b/test/vds.c
index 4c5929e..a14e9c3 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 4ba0422..5bf433f 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)
diff --git a/test/vol.c b/test/vol.c
index 7d6cded..b662cb8 100644
--- a/test/vol.c
+++ b/test/vol.c
@@ -18,6 +18,7 @@
* other mechanisms.
*/
+/* Headers needed */
#include "h5test.h"
/* Filename */
@@ -90,7 +91,7 @@ static const H5VL_class_t fake_vol_g = {
/* datatype_cls */
NULL, /* commit */
NULL, /* open */
- NULL, /* get_size */
+ NULL, /* get */
NULL, /* specific */
NULL, /* optional */
NULL /* close */
diff --git a/testpar/t_2Gio.c b/testpar/t_2Gio.c
index 3e92f18..536d312 100644
--- a/testpar/t_2Gio.c
+++ b/testpar/t_2Gio.c
@@ -4220,7 +4220,7 @@ test_no_collective_cause_mode_filter(int selection_mode)
herr_t ret;
#ifdef LATER /* fletcher32 */
H5Z_filter_t filter_info;
-#endif /* LATER */
+#endif /* LATER */
char message[256];
/* Set up MPI parameters */
@@ -4248,7 +4248,7 @@ test_no_collective_cause_mode_filter(int selection_mode)
ret = H5Pset_fletcher32(dcpl);
VRFY((ret >= 0),"set filter (flecher32) succeeded");
-#endif /* LATER */
+#endif /* LATER */
}
else {
VRFY(0, "Unexpected mode, only test for TEST_FILTERS_READ.");
@@ -4290,7 +4290,7 @@ test_no_collective_cause_mode_filter(int selection_mode)
test_name = "Broken Collective I/O - Filter is required";
no_collective_cause_local_expected = H5D_MPIO_FILTERS;
no_collective_cause_global_expected = H5D_MPIO_FILTERS;
-#endif /* LATER */
+#endif /* LATER */
/* Get the file dataspace */
file_space = H5Dget_space(dataset);
@@ -4421,9 +4421,9 @@ no_collective_cause_tests(void)
test_no_collective_cause_mode(TEST_NOT_CONTIGUOUS_OR_CHUNKED_DATASET_COMPACT);
test_no_collective_cause_mode(TEST_NOT_CONTIGUOUS_OR_CHUNKED_DATASET_EXTERNAL);
#ifdef LATER /* fletcher32 */
- /* TODO: use this instead of below TEST_FILTERS_READ when H5Dcreate and
- * H5Dwrite is ready for mpio + filter feature.
- */
+ /* TODO: use this instead of below TEST_FILTERS_READ when H5Dcreate and
+ * H5Dwrite is ready for mpio + filter feature.
+ */
/* test_no_collective_cause_mode (TEST_FILTERS); */
test_no_collective_cause_mode_filter(TEST_FILTERS_READ);
#endif /* LATER */
diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index e0e03f2..3989f2e 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -2465,7 +2465,7 @@ datum_notify(H5C_notify_action_t action, void *thing)
HDfprintf(stdout, "%d:%s: Bad data in read req reply.\n", world_mpi_rank, FUNC);
}
-#if 0 /* This has been useful debugging code -- keep it for now. */
+#if 0 /* This has been useful debugging code -- keep it for now. */
if ( mssg.req != READ_REQ_REPLY_CODE ) {
HDfprintf(stdout,
@@ -6880,7 +6880,7 @@ main(int argc, char **argv)
H5open();
express_test = do_express_test();
-#if 0 /* JRM */
+#if 0 /* JRM */
express_test = 0;
#endif /* JRM */
if (express_test) {
diff --git a/testpar/t_cache_image.c b/testpar/t_cache_image.c
index 776da2e..770c1dd 100644
--- a/testpar/t_cache_image.c
+++ b/testpar/t_cache_image.c
@@ -3918,9 +3918,8 @@ main(int argc, char **argv)
* hang in the atexit post processing in which it may try to make MPI
* calls. By then, MPI calls may not work.
*/
- if (H5dont_atexit() < 0) {
+ if (H5dont_atexit() < 0)
HDprintf("%d:Failed to turn off atexit processing. Continue.\n", mpi_rank);
- };
H5open();
@@ -3932,11 +3931,8 @@ main(int argc, char **argv)
}
if (mpi_size < 2) {
-
- if (mpi_rank == 0) {
-
+ if (mpi_rank == 0)
HDprintf(" Need at least 2 processes. Exiting.\n");
- }
goto finish;
}
@@ -3991,12 +3987,11 @@ main(int argc, char **argv)
MPI_Barrier(MPI_COMM_WORLD);
nerrs += verify_cache_image_RO(0, H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY, mpi_rank);
-#if 1
nerrs += verify_cache_image_RO(1, H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED, mpi_rank);
nerrs += verify_cache_image_RW(0, H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY, mpi_rank);
nerrs += verify_cache_image_RW(1, H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED, mpi_rank);
nerrs += smoke_check_1(comm, info, mpi_rank, mpi_size);
-#endif
+
finish:
/* make sure all processes are finished before final report, cleanup
@@ -4005,19 +4000,14 @@ finish:
MPI_Barrier(MPI_COMM_WORLD);
if (mpi_rank == 0) { /* only process 0 reports */
- HDsleep(10);
HDprintf("===================================\n");
- if (nerrs > 0) {
+ if (nerrs > 0)
HDprintf("***metadata cache image tests detected %d failures***\n", nerrs);
- }
- else {
+ else
HDprintf("metadata cache image tests finished with no failures\n");
- }
HDprintf("===================================\n");
}
- /* takedown_derived_types(); */
-
/* close HDF5 library */
H5close();
diff --git a/testpar/t_dset.c b/testpar/t_dset.c
index ec1ecf7..aa51440 100644
--- a/testpar/t_dset.c
+++ b/testpar/t_dset.c
@@ -3985,9 +3985,9 @@ no_collective_cause_tests(void)
test_no_collective_cause_mode(TEST_NOT_CONTIGUOUS_OR_CHUNKED_DATASET_COMPACT);
test_no_collective_cause_mode(TEST_NOT_CONTIGUOUS_OR_CHUNKED_DATASET_EXTERNAL);
#ifdef LATER /* fletcher32 */
- /* TODO: use this instead of below TEST_FILTERS_READ when H5Dcreate and
- * H5Dwrite is ready for mpio + filter feature.
- */
+ /* TODO: use this instead of below TEST_FILTERS_READ when H5Dcreate and
+ * H5Dwrite is ready for mpio + filter feature.
+ */
/* test_no_collective_cause_mode (TEST_FILTERS); */
test_no_collective_cause_mode_filter(TEST_FILTERS_READ);
#endif /* LATER */
diff --git a/testpar/t_filter_read.c b/testpar/t_filter_read.c
index 10d6c27..a50cb24 100644
--- a/testpar/t_filter_read.c
+++ b/testpar/t_filter_read.c
@@ -346,7 +346,7 @@ test_filter_read(void)
VRFY(hrc >= 0, "H5Pclose");
}
#endif /* H5_HAVE_FILTER_SZIP */
- } /* end for */
+ } /* end for */
/*----------------------------------------------------------
* STEP 4: Test shuffling by itself.
diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c
index 1c5e875..be3f6e1 100644
--- a/testpar/t_shapesame.c
+++ b/testpar/t_shapesame.c
@@ -578,7 +578,7 @@ hs_dr_pio_test__takedown(struct hs_dr_pio_test_vars_t *tv_ptr)
{
#if HS_DR_PIO_TEST__TAKEDOWN__DEBUG
const char *fcnName = "hs_dr_pio_test__takedown()";
-#endif /* HS_DR_PIO_TEST__TAKEDOWN__DEBUG */
+#endif /* HS_DR_PIO_TEST__TAKEDOWN__DEBUG */
int mpi_rank; /* needed by the VRFY macro */
herr_t ret; /* Generic return value */
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index ec83d91..aa72998 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -692,7 +692,7 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
/* Use the asprintf() routine, since it does what we're trying to do below */
if (HDasprintf(&obj1fullname, "/%s", objname1) < 0)
H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "name buffer allocation failed");
-#else /* H5_HAVE_ASPRINTF */
+#else /* H5_HAVE_ASPRINTF */
/* (malloc 2 more for "/" and end-of-line) */
if ((obj1fullname = (char *)HDmalloc(HDstrlen(objname1) + 2)) == NULL)
H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "name buffer allocation failed");
@@ -711,7 +711,7 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
/* Use the asprintf() routine, since it does what we're trying to do below */
if (HDasprintf(&obj2fullname, "/%s", objname2) < 0)
H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "name buffer allocation failed");
-#else /* H5_HAVE_ASPRINTF */
+#else /* H5_HAVE_ASPRINTF */
/* (malloc 2 more for "/" and end-of-line) */
if ((obj2fullname = (char *)HDmalloc(HDstrlen(objname2) + 2)) == NULL)
H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "name buffer allocation failed");
@@ -1174,7 +1174,7 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, hid_t file2_id,
if (HDasprintf(&obj1_fullpath, "%s%s", grp1_path, table->objs[i].name) < 0) {
H5TOOLS_ERROR(H5DIFF_ERR, "name buffer allocation failed");
}
-#else /* H5_HAVE_ASPRINTF */
+#else /* H5_HAVE_ASPRINTF */
if ((obj1_fullpath = (char *)HDmalloc(HDstrlen(grp1_path) + HDstrlen(table->objs[i].name) + 1)) ==
NULL) {
H5TOOLS_ERROR(H5DIFF_ERR, "name buffer allocation failed");
@@ -1192,7 +1192,7 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, hid_t file2_id,
if (HDasprintf(&obj2_fullpath, "%s%s", grp2_path, table->objs[i].name) < 0) {
H5TOOLS_ERROR(H5DIFF_ERR, "name buffer allocation failed");
}
-#else /* H5_HAVE_ASPRINTF */
+#else /* H5_HAVE_ASPRINTF */
if ((obj2_fullpath = (char *)HDmalloc(HDstrlen(grp2_path) + HDstrlen(table->objs[i].name) + 1)) ==
NULL) {
H5TOOLS_ERROR(H5DIFF_ERR, "name buffer allocation failed");
@@ -1388,7 +1388,7 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, hid_t file2_id,
} /* end else */
} /* end if */
} /* end else */
-#endif /* H5_HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
if (obj1_fullpath)
HDfree(obj1_fullpath);
if (obj2_fullpath)
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index b998784..b3efeab 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -1279,7 +1279,7 @@ diff_datum(void *_mem1, void *_mem2, hsize_t elemtno, diff_opt_t *opts, hid_t co
}
nfound += diff_ldouble_element(mem1, mem2, elemtno, opts);
} /*H5T_NATIVE_LDOUBLE*/
-#endif /* H5_SIZEOF_LONG_DOUBLE */
+#endif /* H5_SIZEOF_LONG_DOUBLE */
break; /* H5T_FLOAT class */
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index 533237c..01577db 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -932,7 +932,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
h5tools_str_append(str, OPT(info->fmt_llong, fmt_llong), templlong);
}
} /* end if (sizeof(long long) == nsize) */
-#endif /* H5_SIZEOF_LONG != H5_SIZEOF_LONG_LONG */
+#endif /* H5_SIZEOF_LONG != H5_SIZEOF_LONG_LONG */
break;
case H5T_COMPOUND:
@@ -1268,7 +1268,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
for (x = 0; x < ctx->indent_level + 1; x++)
h5tools_str_append(str, "%s", OPT(info->line_indent, ""));
} /* end if */
-#endif /* LATER */
+#endif /* LATER */
ctx->indent_level++;
diff --git a/tools/libtest/h5tools_test_utils.c b/tools/libtest/h5tools_test_utils.c
index 80873fd..969dbab 100644
--- a/tools/libtest/h5tools_test_utils.c
+++ b/tools/libtest/h5tools_test_utils.c
@@ -613,7 +613,7 @@ test_populate_ros3_fa(void)
hbool_t show_progress = FALSE;
int bad_version = 0xf87a; /* arbitrarily wrong version number */
-#endif /* H5_HAVE_ROS3_VFD */
+#endif /* H5_HAVE_ROS3_VFD */
TESTING("programmatic ros3 fapl population");
@@ -1028,7 +1028,7 @@ test_set_configured_fapl(void)
"", /* user name */
2048, /* stream buffer size */
};
-#endif /* H5_HAVE_LIBHDFS */
+#endif /* H5_HAVE_LIBHDFS */
unsigned n_cases = 7; /* number of common testcases */
testcase cases[] = {
{
@@ -1279,7 +1279,7 @@ main(void)
#ifdef _H5TEST_
h5reset(); /* h5test? */
-#endif /* _H5TEST_ */
+#endif /* _H5TEST_ */
HDfprintf(stdout, "Testing h5tools_utils corpus.\n");
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst b/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
index 9e83ff8..6f586cc 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
+++ b/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
@@ -1,7 +1,7 @@
HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
#000: (file name) line (number) in H5Dcreate2(): unable to create dataset
major: Dataset
- minor: Unable to initialize object
+ minor: Unable to create file
#001: (file name) line (number) in H5VL_dataset_create(): dataset create failed
major: Virtual Object Layer
minor: Unable to create file
diff --git a/tools/test/perform/perf.c b/tools/test/perform/perf.c
index 22aca04..df4c569 100644
--- a/tools/test/perform/perf.c
+++ b/tools/test/perform/perf.c
@@ -465,7 +465,7 @@ parse_args(int argc, char **argv)
* End:
*/
-#else /* H5_HAVE_PARALLEL */
+#else /* H5_HAVE_PARALLEL */
/* dummy program since H5_HAVE_PARALLEL is not configured in */
int
main(int H5_ATTR_UNUSED argc, char H5_ATTR_UNUSED **argv)
diff --git a/tools/test/perform/pio_standalone.h b/tools/test/perform/pio_standalone.h
index d64f421..2f812d7 100644
--- a/tools/test/perform/pio_standalone.h
+++ b/tools/test/perform/pio_standalone.h
@@ -224,14 +224,14 @@ H5_DLL int Wgettimeofday(struct timeval *tv, struct timezone *tz);
#define HDisalnum(C) isalnum((int)(C)) /*cast for solaris warning*/
#define HDisalpha(C) isalpha((int)(C)) /*cast for solaris warning*/
#define HDisatty(F) isatty(F)
-#define HDiscntrl(C) iscntrl((int)(C)) /*cast for solaris warning*/
-#define HDisdigit(C) isdigit((int)(C)) /*cast for solaris warning*/
-#define HDisgraph(C) isgraph((int)(C)) /*cast for solaris warning*/
-#define HDislower(C) islower((int)(C)) /*cast for solaris warning*/
-#define HDisprint(C) isprint((int)(C)) /*cast for solaris warning*/
-#define HDispunct(C) ispunct((int)(C)) /*cast for solaris warning*/
-#define HDisspace(C) isspace((int)(C)) /*cast for solaris warning*/
-#define HDisupper(C) isupper((int)(C)) /*cast for solaris warning*/
+#define HDiscntrl(C) iscntrl((int)(C)) /*cast for solaris warning*/
+#define HDisdigit(C) isdigit((int)(C)) /*cast for solaris warning*/
+#define HDisgraph(C) isgraph((int)(C)) /*cast for solaris warning*/
+#define HDislower(C) islower((int)(C)) /*cast for solaris warning*/
+#define HDisprint(C) isprint((int)(C)) /*cast for solaris warning*/
+#define HDispunct(C) ispunct((int)(C)) /*cast for solaris warning*/
+#define HDisspace(C) isspace((int)(C)) /*cast for solaris warning*/
+#define HDisupper(C) isupper((int)(C)) /*cast for solaris warning*/
#define HDisxdigit(C) isxdigit((int)(C)) /*cast for solaris warning*/
#define HDkill(P, S) kill(P, S)
#define HDlabs(X) labs(X)
@@ -458,7 +458,7 @@ H5_DLL int c99_vsnprintf(char *str, size_t size, const char *format, va_list ap)
#else /* H5_HAVE_WIN32_API */
#if !defined strdup && !defined H5_HAVE_STRDUP
-extern char * strdup(const char *s);
+extern char *strdup(const char *s);
#endif
#define HDstrdup(S) strdup(S)
diff --git a/tools/test/perform/sio_standalone.h b/tools/test/perform/sio_standalone.h
index 4001257..c0e0793 100644
--- a/tools/test/perform/sio_standalone.h
+++ b/tools/test/perform/sio_standalone.h
@@ -239,14 +239,14 @@ H5_DLL int Wgettimeofday(struct timeval *tv, struct timezone *tz);
#define HDisalnum(C) isalnum((int)(C)) /*cast for solaris warning*/
#define HDisalpha(C) isalpha((int)(C)) /*cast for solaris warning*/
#define HDisatty(F) isatty(F)
-#define HDiscntrl(C) iscntrl((int)(C)) /*cast for solaris warning*/
-#define HDisdigit(C) isdigit((int)(C)) /*cast for solaris warning*/
-#define HDisgraph(C) isgraph((int)(C)) /*cast for solaris warning*/
-#define HDislower(C) islower((int)(C)) /*cast for solaris warning*/
-#define HDisprint(C) isprint((int)(C)) /*cast for solaris warning*/
-#define HDispunct(C) ispunct((int)(C)) /*cast for solaris warning*/
-#define HDisspace(C) isspace((int)(C)) /*cast for solaris warning*/
-#define HDisupper(C) isupper((int)(C)) /*cast for solaris warning*/
+#define HDiscntrl(C) iscntrl((int)(C)) /*cast for solaris warning*/
+#define HDisdigit(C) isdigit((int)(C)) /*cast for solaris warning*/
+#define HDisgraph(C) isgraph((int)(C)) /*cast for solaris warning*/
+#define HDislower(C) islower((int)(C)) /*cast for solaris warning*/
+#define HDisprint(C) isprint((int)(C)) /*cast for solaris warning*/
+#define HDispunct(C) ispunct((int)(C)) /*cast for solaris warning*/
+#define HDisspace(C) isspace((int)(C)) /*cast for solaris warning*/
+#define HDisupper(C) isupper((int)(C)) /*cast for solaris warning*/
#define HDisxdigit(C) isxdigit((int)(C)) /*cast for solaris warning*/
#define HDkill(P, S) kill(P, S)
#define HDlabs(X) labs(X)
@@ -473,7 +473,7 @@ H5_DLL int c99_vsnprintf(char *str, size_t size, const char *format, va_list ap)
#else /* H5_HAVE_WIN32_API */
#if !defined strdup && !defined H5_HAVE_STRDUP
-extern char * strdup(const char *s);
+extern char *strdup(const char *s);
#endif
#define HDstrdup(S) strdup(S)