summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.clang-format29
-rw-r--r--c++/examples/h5tutr_extend.cpp1
-rw-r--r--c++/test/h5cpputil.h8
-rw-r--r--c++/test/tlinks.cpp24
-rw-r--r--examples/h5_elink_unix2win.c2
-rw-r--r--hl/c++/test/ptableTest.cpp6
-rw-r--r--hl/src/H5DS.c24
-rw-r--r--hl/src/H5LD.c7
-rw-r--r--hl/src/H5LT.c16
-rw-r--r--hl/test/gen_test_ds.c10
-rw-r--r--hl/test/test_ds.c50
-rw-r--r--hl/test/test_dset_append.c16
-rw-r--r--hl/test/test_file_image.c10
-rw-r--r--hl/test/test_h5do_compat.c4
-rw-r--r--hl/test/test_image.c6
-rw-r--r--hl/test/test_ld.c20
-rw-r--r--hl/test/test_table.c2
-rw-r--r--java/src/jni/h5util.c4
-rw-r--r--src/H5Abtree2.c10
-rw-r--r--src/H5Aint.c4
-rw-r--r--src/H5B2cache.c2
-rw-r--r--src/H5B2dbg.c4
-rw-r--r--src/H5B2hdr.c8
-rw-r--r--src/H5B2int.c8
-rw-r--r--src/H5C.c2
-rw-r--r--src/H5CS.c2
-rw-r--r--src/H5Cdbg.c8
-rw-r--r--src/H5Centry.c32
-rw-r--r--src/H5Cimage.c12
-rw-r--r--src/H5Cmpio.c6
-rw-r--r--src/H5Cpkg.h30
-rw-r--r--src/H5Cquery.c4
-rw-r--r--src/H5Dbtree2.c2
-rw-r--r--src/H5Dchunk.c20
-rw-r--r--src/H5Dearray.c2
-rw-r--r--src/H5Dfarray.c2
-rw-r--r--src/H5Dint.c6
-rw-r--r--src/H5Dnone.c2
-rw-r--r--src/H5Dsingle.c2
-rw-r--r--src/H5Dvirtual.c6
-rw-r--r--src/H5EAcache.c4
-rw-r--r--src/H5ESevent.c2
-rw-r--r--src/H5Epublic.h2
-rw-r--r--src/H5FAtest.c4
-rw-r--r--src/H5FD.c2
-rw-r--r--src/H5FDfamily.c6
-rw-r--r--src/H5FDhdfs.c4
-rw-r--r--src/H5FDmirror.c10
-rw-r--r--src/H5FDmulti.c94
-rw-r--r--src/H5FDonion.c40
-rw-r--r--src/H5FDonion_header.c16
-rw-r--r--src/H5FDonion_history.c16
-rw-r--r--src/H5FDonion_index.c44
-rw-r--r--src/H5FDros3.c4
-rw-r--r--src/H5FDs3comms.c26
-rw-r--r--src/H5FDsplitter.c2
-rw-r--r--src/H5FS.c1
-rw-r--r--src/H5Fefc.c4
-rw-r--r--src/H5Fio.c6
-rw-r--r--src/H5Fmpi.c8
-rw-r--r--src/H5Fsuper.c2
-rw-r--r--src/H5Gbtree2.c8
-rw-r--r--src/H5Gdeprec.c10
-rw-r--r--src/H5Gent.c1
-rw-r--r--src/H5Glink.c2
-rw-r--r--src/H5Gname.c2
-rw-r--r--src/H5Gnode.c2
-rw-r--r--src/H5Gtest.c2
-rw-r--r--src/H5Gtraverse.c2
-rw-r--r--src/H5HFcache.c2
-rw-r--r--src/H5HFdbg.c6
-rw-r--r--src/H5HFhuge.c20
-rw-r--r--src/H5HFpkg.h8
-rw-r--r--src/H5HG.c4
-rw-r--r--src/H5HGdbg.c2
-rw-r--r--src/H5HLcache.c6
-rw-r--r--src/H5HLdblk.c2
-rw-r--r--src/H5Iint.c10
-rw-r--r--src/H5O.c10
-rw-r--r--src/H5Oainfo.c4
-rw-r--r--src/H5Oattr.c2
-rw-r--r--src/H5Ocache.c4
-rw-r--r--src/H5Ocopy.c2
-rw-r--r--src/H5Odeprec.c6
-rw-r--r--src/H5Odtype.c8
-rw-r--r--src/H5Oflush.c6
-rw-r--r--src/H5Oginfo.c16
-rw-r--r--src/H5Oint.c14
-rw-r--r--src/H5Olayout.c4
-rw-r--r--src/H5Olinfo.c6
-rw-r--r--src/H5Olink.c12
-rw-r--r--src/H5Omessage.c2
-rw-r--r--src/H5Opline.c2
-rw-r--r--src/H5Orefcount.c2
-rw-r--r--src/H5Oshared.c2
-rw-r--r--src/H5Ostab.c2
-rw-r--r--src/H5Otest.c6
-rw-r--r--src/H5PLpath.c2
-rw-r--r--src/H5Pdcpl.c12
-rw-r--r--src/H5Pdxpl.c12
-rw-r--r--src/H5Pencdec.c8
-rw-r--r--src/H5Pfcpl.c12
-rw-r--r--src/H5Pgcpl.c24
-rw-r--r--src/H5Pocpl.c12
-rw-r--r--src/H5Pocpypl.c2
-rw-r--r--src/H5Shyper.c28
-rw-r--r--src/H5Tconv.c4
-rw-r--r--src/H5VLcallback.c2
-rw-r--r--src/H5VLnative.c2
-rw-r--r--src/H5VMprivate.h12
-rw-r--r--src/H5Zscaleoffset.c129
-rw-r--r--src/H5Ztrans.c6
-rw-r--r--src/H5checksum.c8
-rw-r--r--src/H5encode.h132
-rw-r--r--src/H5private.h9
-rw-r--r--test/accum_swmr_reader.c2
-rw-r--r--test/big.c4
-rw-r--r--test/btree2.c154
-rw-r--r--test/cache_api.c32
-rw-r--r--test/cache_image.c6
-rw-r--r--test/chunk_info.c40
-rw-r--r--test/cork.c36
-rw-r--r--test/cross_read.c6
-rw-r--r--test/dangle.c18
-rw-r--r--test/direct_chunk.c58
-rw-r--r--test/dsets.c219
-rw-r--r--test/dt_arith.c26
-rw-r--r--test/dtransform.c8
-rw-r--r--test/dtypes.c174
-rw-r--r--test/earray.c40
-rw-r--r--test/enc_dec_plist.c2
-rw-r--r--test/enum.c22
-rw-r--r--test/err_compat.c2
-rw-r--r--test/error_test.c2
-rw-r--r--test/event_set.c4
-rw-r--r--test/evict_on_close.c14
-rw-r--r--test/external.c46
-rw-r--r--test/external_env.c4
-rw-r--r--test/farray.c26
-rw-r--r--test/fheap.c214
-rw-r--r--test/file_image.c12
-rw-r--r--test/fillval.c32
-rw-r--r--test/filter_fail.c8
-rw-r--r--test/filter_plugin.c10
-rw-r--r--test/flush1.c6
-rw-r--r--test/flush2.c6
-rw-r--r--test/flushrefresh.c4
-rw-r--r--test/freespace.c18
-rw-r--r--test/gen_bad_offset.c2
-rw-r--r--test/gen_bad_ohdr.c2
-rw-r--r--test/gen_bogus.c4
-rw-r--r--test/gen_bounds.c14
-rw-r--r--test/gen_cross.c24
-rw-r--r--test/gen_deflate.c2
-rw-r--r--test/gen_file_image.c2
-rw-r--r--test/gen_filespace.c2
-rw-r--r--test/gen_filters.c4
-rw-r--r--test/gen_new_fill.c2
-rw-r--r--test/gen_new_group.c2
-rw-r--r--test/gen_old_group.c2
-rw-r--r--test/getname.c8
-rw-r--r--test/gheap.c20
-rw-r--r--test/h5test.c6
-rw-r--r--test/hdfs.c35
-rw-r--r--test/lheap.c2
-rw-r--r--test/links.c466
-rw-r--r--test/links_env.c4
-rw-r--r--test/mf.c92
-rw-r--r--test/mirror_vfd.c18
-rw-r--r--test/mount.c120
-rw-r--r--test/ntypes.c34
-rw-r--r--test/objcopy.c160
-rw-r--r--test/objcopy_ref.c16
-rw-r--r--test/ohdr.c34
-rw-r--r--test/onion.c68
-rw-r--r--test/page_buffer.c28
-rw-r--r--test/ros3.c38
-rw-r--r--test/set_extent.c24
-rw-r--r--test/stab.c20
-rw-r--r--test/swmr.c164
-rw-r--r--test/tarray.c4
-rw-r--r--test/tattr.c88
-rw-r--r--test/testframe.c2
-rw-r--r--test/testhdf5.h24
-rw-r--r--test/tfile.c120
-rw-r--r--test/th5_system.c10
-rw-r--r--test/th5o.c8
-rw-r--r--test/th5s.c16
-rw-r--r--test/titerate.c16
-rw-r--r--test/tmisc.c94
-rw-r--r--test/trefer.c10
-rw-r--r--test/trefer_deprec.c10
-rw-r--r--test/tselect.c74
-rw-r--r--test/tsohm.c6
-rw-r--r--test/tvltypes.c6
-rw-r--r--test/unlink.c48
-rw-r--r--test/unregister.c6
-rw-r--r--test/vds.c16
-rw-r--r--test/vds_env.c2
-rw-r--r--test/vfd.c94
-rw-r--r--test/vfd_plugin.c8
-rw-r--r--test/vol.c48
-rw-r--r--test/vol_plugin.c8
-rw-r--r--testpar/t_file.c4
-rw-r--r--testpar/t_filters_parallel.c6
-rw-r--r--testpar/t_pflush2.c2
-rw-r--r--testpar/t_subfiling_vfd.c16
-rw-r--r--tools/lib/h5diff.c4
-rw-r--r--tools/lib/h5diff_array.c10
-rw-r--r--tools/lib/h5diff_attr.c6
-rw-r--r--tools/lib/h5diff_dset.c4
-rw-r--r--tools/lib/h5tools.c4
-rw-r--r--tools/lib/h5tools_dump.c5
-rw-r--r--tools/lib/h5tools_str.c4
-rw-r--r--tools/lib/h5trav.c4
-rw-r--r--tools/src/h5copy/h5copy.c2
-rw-r--r--tools/src/h5diff/ph5diff_main.c2
-rw-r--r--tools/src/h5dump/h5dump_ddl.c2
-rw-r--r--tools/src/h5dump/h5dump_xml.c4
-rw-r--r--tools/src/h5format_convert/h5format_convert.c3
-rw-r--r--tools/src/h5import/h5import.c12
-rw-r--r--tools/src/h5jam/h5unjam.c1
-rw-r--r--tools/src/h5repack/h5repack.c4
-rw-r--r--tools/src/h5repack/h5repack_copy.c6
-rw-r--r--tools/src/h5repack/h5repack_parse.c2
-rw-r--r--tools/src/h5repack/h5repack_refs.c10
-rw-r--r--tools/src/h5repack/h5repack_verify.c4
-rw-r--r--tools/src/misc/h5delete.c2
-rw-r--r--tools/src/misc/h5repart.c2
-rw-r--r--tools/test/h5diff/h5diffgentest.c12
-rw-r--r--tools/test/h5dump/h5dumpgentest.c16
-rw-r--r--tools/test/h5format_convert/h5fc_gentest.c8
-rw-r--r--tools/test/h5jam/h5jamgentest.c2
-rw-r--r--tools/test/h5repack/h5repacktst.c52
-rw-r--r--tools/test/h5stat/h5stat_gentest.c8
-rw-r--r--tools/test/misc/h5clear_gentest.c4
-rw-r--r--tools/test/misc/repart_test.c4
-rw-r--r--tools/test/misc/talign.c2
-rw-r--r--tools/test/perform/chunk_cache.c8
-rw-r--r--tools/test/perform/direct_write_perf.c10
-rw-r--r--utils/mirror_vfd/mirror_writer.c2
241 files changed, 2489 insertions, 2481 deletions
diff --git a/.clang-format b/.clang-format
index b51da2a..050a824 100644
--- a/.clang-format
+++ b/.clang-format
@@ -65,28 +65,35 @@ ObjCBlockIndentWidth: 4
ReflowComments: true
SortIncludes: false
StatementMacros:
+ - CATCH
+ - END_MEMBERS
- FUNC_ENTER_API
- - FUNC_LEAVE_API
+ - FUNC_ENTER_NOAPI
+ - FUNC_ENTER_NOAPI_NOERR
+ - FUNC_ENTER_NOAPI_NOINIT
- FUNC_ENTER_NOAPI_NOINIT_NOERR
+ - FUNC_ENTER_PACKAGE
+ - FUNC_LEAVE_API
- FUNC_LEAVE_NOAPI
+ - FUNC_LEAVE_NOAPI_NOFS
+ - H5E_END_TRY
+ - H5E_PRINTF
+ - H5E_THROW
- H5_BEGIN_TAG
- - HGOTO_DONE_TAG
- H5_END_TAG
- - HSYS_DONE_ERROR
- - HSYS_GOTO_ERROR
+ - H5_GCC_DIAG_OFF
+ - H5_GCC_DIAG_ON
+ - H5_LEAVE
- HDONE_ERROR
- HERROR
- - H5_LEAVE
- - H5E_PRINTF
- - H5E_THROW
- HGOTO_DONE
+ - HGOTO_DONE_TAG
- HGOTO_ERROR
- - HMPI_ERROR
- HMPI_DONE_ERROR
+ - HMPI_ERROR
- HMPI_GOTO_ERROR
- - H5_GCC_DIAG_OFF
- - H5_GCC_DIAG_ON
- - CATCH
+ - HSYS_DONE_ERROR
+ - HSYS_GOTO_ERROR
#llvm10: TypenameMacros:
#llvm10: - STACK_OF
#llvm10: - LIST
diff --git a/c++/examples/h5tutr_extend.cpp b/c++/examples/h5tutr_extend.cpp
index b725f00..ff5ddab 100644
--- a/c++/examples/h5tutr_extend.cpp
+++ b/c++/examples/h5tutr_extend.cpp
@@ -117,7 +117,6 @@ main(void)
if (H5D_CHUNKED == prop.getLayout())
rank_chunk = prop.getChunk(rank, chunk_dimsr);
cout << "rank chunk = " << rank_chunk << endl;
- ;
memspace = new DataSpace(rank, dimsr, NULL);
dataset->read(rdata, PredType::NATIVE_INT, *memspace, *filespace);
diff --git a/c++/test/h5cpputil.h b/c++/test/h5cpputil.h
index a5477b6..392382d 100644
--- a/c++/test/h5cpputil.h
+++ b/c++/test/h5cpputil.h
@@ -28,15 +28,15 @@ using std::cerr;
using std::endl;
#define MESSAGE(V, A) \
- { \
+ do { \
if (HDGetTestVerbosity() > (V)) \
print_func A; \
- }
+ } while (0)
#define SUBTEST(TEST) \
- { \
+ do { \
printf(" Subtest: %-52s", TEST); \
fflush(stdout); \
- }
+ } while (0)
int check_values(hsize_t i, hsize_t j, int apoint, int acheck);
void check_values(const char *value, const char *msg, int line, const char *file_name);
diff --git a/c++/test/tlinks.cpp b/c++/test/tlinks.cpp
index ebb457a..7017217 100644
--- a/c++/test/tlinks.cpp
+++ b/c++/test/tlinks.cpp
@@ -67,9 +67,9 @@ test_basic_links(hid_t fapl_id, hbool_t new_format)
try {
if (new_format)
- SUBTEST("Link creation (w/new group format)")
+ SUBTEST("Link creation (w/new group format)");
else
- SUBTEST("Link creation")
+ SUBTEST("Link creation");
h5_fixname(FILENAME[0], fapl_id, filename, sizeof filename);
H5File file(filename, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
@@ -174,9 +174,9 @@ test_lcpl(hid_t fapl_id, hbool_t new_format)
hsize_t dims[2];
if (new_format)
- SUBTEST("Link creation property lists (w/new group format)")
+ SUBTEST("Link creation property lists (w/new group format)");
else
- SUBTEST("Link creation property lists")
+ SUBTEST("Link creation property lists");
try {
FileAccPropList fapl(fapl_id);
@@ -254,9 +254,9 @@ test_move(hid_t fapl_id, hbool_t new_format)
char filename[1024];
if (new_format)
- SUBTEST("Group::moveLink (w/new group format)")
+ SUBTEST("Group::moveLink (w/new group format)");
else
- SUBTEST("Group::moveLink")
+ SUBTEST("Group::moveLink");
try {
FileAccPropList fapl(fapl_id);
@@ -399,9 +399,9 @@ test_copy(hid_t fapl_id, hbool_t new_format)
char filename[1024];
if (new_format)
- SUBTEST("Group::copyLink (w/new group format)")
+ SUBTEST("Group::copyLink (w/new group format)");
else
- SUBTEST("Group::copyLink")
+ SUBTEST("Group::copyLink");
try {
// Create two new files
@@ -537,9 +537,9 @@ test_num_links(hid_t fapl_id, hbool_t new_format)
char filename[NAME_BUF_SIZE];
if (new_format)
- SUBTEST("Setting number of links (w/new group format)")
+ SUBTEST("Setting number of links (w/new group format)");
else
- SUBTEST("Setting number of links")
+ SUBTEST("Setting number of links");
try {
// Use the file access template id to create a file access prop. list.
@@ -622,9 +622,9 @@ test_visit(hid_t fapl_id, hbool_t new_format)
char filename[NAME_BUF_SIZE];
if (new_format)
- SUBTEST("H5Object::visit (w/new group format)")
+ SUBTEST("H5Object::visit (w/new group format)");
else
- SUBTEST("H5Object::visit")
+ SUBTEST("H5Object::visit");
try {
// Use the file access template id to create a file access prop. list
diff --git a/examples/h5_elink_unix2win.c b/examples/h5_elink_unix2win.c
index ac5f63a..24525ff 100644
--- a/examples/h5_elink_unix2win.c
+++ b/examples/h5_elink_unix2win.c
@@ -187,7 +187,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
diff --git a/hl/c++/test/ptableTest.cpp b/hl/c++/test/ptableTest.cpp
index 1807be6..2a77a9e 100644
--- a/hl/c++/test/ptableTest.cpp
+++ b/hl/c++/test/ptableTest.cpp
@@ -194,7 +194,7 @@ error:
{
H5Tclose(dtypeID);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return 1;
@@ -576,7 +576,7 @@ error:
H5Tclose(dtypeID1);
H5Tclose(dtypeID2);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return 1;
@@ -708,7 +708,7 @@ error:
H5Tclose(compound_type);
H5Fclose(fileID);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return 1;
diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c
index 34de473..87973fa 100644
--- a/hl/src/H5DS.c
+++ b/hl/src/H5DS.c
@@ -697,7 +697,7 @@ out:
H5Tclose(ntid);
H5Tclose(tid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
}
@@ -1198,7 +1198,7 @@ out:
buf = NULL;
}
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
}
@@ -1538,7 +1538,7 @@ out:
H5Tclose(tid);
H5Tclose(ntid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (buf) {
HDfree(buf);
@@ -1700,7 +1700,7 @@ H5DSiterate_scales(hid_t did, unsigned int dim, int *ds_idx, H5DS_iterate_t visi
if ((scale_id = H5Ropen_object(&nref, H5P_DEFAULT, H5P_DEFAULT)) < 0)
goto out;
}
- H5E_END_TRY;
+ H5E_END_TRY
}
else {
/* get the reference */
@@ -1713,7 +1713,7 @@ H5DSiterate_scales(hid_t did, unsigned int dim, int *ds_idx, H5DS_iterate_t visi
if ((scale_id = H5Rdereference2(did, H5P_DEFAULT, H5R_OBJECT, &ref)) < 0)
goto out;
}
- H5E_END_TRY;
+ H5E_END_TRY
}
/* set the return IDX OUT value at current scale index */
@@ -1765,7 +1765,7 @@ out:
H5Aclose(aid);
H5Tclose(tid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
}
@@ -1965,7 +1965,7 @@ out:
H5Aclose(aid);
H5Tclose(tid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
}
@@ -2113,7 +2113,7 @@ out:
H5Aclose(aid);
H5Tclose(tid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
}
@@ -2231,7 +2231,7 @@ out:
H5Tclose(tid);
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (buf)
HDfree(buf);
return FAIL;
@@ -2343,7 +2343,7 @@ out:
H5Aclose(aid);
H5Tclose(tid);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
return is_ds;
}
@@ -2460,7 +2460,7 @@ out:
H5Aclose(aid);
H5Tclose(tid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (buf)
HDfree(buf);
@@ -2539,7 +2539,7 @@ error:
H5Tclose(tid);
H5Aclose(aid);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(buf);
diff --git a/hl/src/H5LD.c b/hl/src/H5LD.c
index 30257f6..65a15e3 100644
--- a/hl/src/H5LD.c
+++ b/hl/src/H5LD.c
@@ -194,8 +194,7 @@ H5LD_construct_vector(char *fields, H5LD_memb_t *listv[] /*OUT*/, hid_t par_tid)
switch (*fields_ptr) {
case '\0': /* end of list */
if (gotmember) { /* getting something and end of "fields" */
- *cur++ = '\0';
- ;
+ *cur++ = '\0';
memb->names[++j] = NULL;
} /* end if */
else /* getting nothing but end of list */
@@ -215,7 +214,6 @@ H5LD_construct_vector(char *fields, H5LD_memb_t *listv[] /*OUT*/, hid_t par_tid)
case '.': /* nested field separator */
*fields_ptr++ = *cur++ = '\0';
- ;
if (gotmember) {
memb->names[++j] = cur;
gotmember = FALSE;
@@ -226,7 +224,6 @@ H5LD_construct_vector(char *fields, H5LD_memb_t *listv[] /*OUT*/, hid_t par_tid)
case ',': /* field separator */
*fields_ptr++ = *cur++ = '\0';
- ;
if (gotmember) {
memb->names[++j] = NULL;
gotmember = FALSE;
@@ -308,7 +305,7 @@ done:
{
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (ret_value);
} /* H5LD_get_dset_dims() */
diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c
index 4c61aa8..657e562 100644
--- a/hl/src/H5LT.c
+++ b/hl/src/H5LT.c
@@ -535,7 +535,7 @@ out:
H5Dclose(did);
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -772,7 +772,7 @@ out:
H5Tclose(tid);
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -886,7 +886,7 @@ out:
{
H5Pclose(fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end H5LTopen_file_image() */
@@ -1121,7 +1121,7 @@ out:
H5Dclose(did);
H5Tclose(tid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -1177,7 +1177,7 @@ out:
H5Dclose(did);
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -1254,7 +1254,7 @@ out:
H5Sclose(sid);
H5Dclose(did);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -1898,7 +1898,6 @@ H5LTget_attribute_ndims(hid_t loc_id, const char *obj_name, const char *attr_nam
/* End access to the attribute */
if (H5Aclose(attr_id))
goto out;
- ;
/* Close the object */
if (H5Oclose(obj_id) < 0)
@@ -3405,7 +3404,6 @@ H5LT_get_attribute_disk(hid_t loc_id, const char *attr_name, void *attr_out)
if (H5Aclose(attr_id) < 0)
return -1;
- ;
return 0;
@@ -3493,7 +3491,7 @@ out:
H5Tclose(tid);
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
}
diff --git a/hl/test/gen_test_ds.c b/hl/test/gen_test_ds.c
index e0a3499..7b45694 100644
--- a/hl/test/gen_test_ds.c
+++ b/hl/test/gen_test_ds.c
@@ -336,7 +336,7 @@ out:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
@@ -400,7 +400,7 @@ out:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
@@ -480,7 +480,7 @@ out:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
@@ -561,7 +561,7 @@ out:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
@@ -609,7 +609,7 @@ out:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
diff --git a/hl/test/test_ds.c b/hl/test/test_ds.c
index 70af31a..9792441 100644
--- a/hl/test/test_ds.c
+++ b/hl/test/test_ds.c
@@ -1331,7 +1331,7 @@ out:
H5Dclose(dsid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
@@ -1387,7 +1387,7 @@ out:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
@@ -1467,7 +1467,7 @@ out:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
@@ -1531,7 +1531,7 @@ out:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
@@ -1591,7 +1591,7 @@ out:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
@@ -1651,7 +1651,7 @@ out:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
@@ -1715,7 +1715,7 @@ out:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
@@ -1798,7 +1798,7 @@ out:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
@@ -1862,7 +1862,7 @@ out:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
@@ -1974,7 +1974,7 @@ out:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
@@ -2054,7 +2054,7 @@ out:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
@@ -2126,7 +2126,7 @@ out:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
@@ -2198,7 +2198,7 @@ out:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
@@ -2278,7 +2278,7 @@ out:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
@@ -2327,7 +2327,7 @@ out:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
@@ -3530,7 +3530,7 @@ out:
H5Sclose(sid);
H5Gclose(gid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return FAIL;
}
@@ -3664,7 +3664,7 @@ out:
HDfree(buf);
}
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
}
@@ -3749,7 +3749,7 @@ out:
{
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
}
@@ -4189,7 +4189,7 @@ out:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return FAIL;
}
@@ -4374,7 +4374,7 @@ out:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return FAIL;
}
@@ -4583,7 +4583,7 @@ out:
H5Sclose(sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return FAIL;
}
@@ -4762,7 +4762,7 @@ out:
H5Dclose(dsid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return FAIL;
}
@@ -4920,7 +4920,7 @@ out:
H5Dclose(dsid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
if (latbuf)
@@ -5187,7 +5187,7 @@ out:
H5Dclose(dsid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return FAIL;
}
@@ -5428,7 +5428,7 @@ out:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return FAIL;
}
diff --git a/hl/test/test_dset_append.c b/hl/test/test_dset_append.c
index c4afe89..b287d25 100644
--- a/hl/test/test_dset_append.c
+++ b/hl/test/test_dset_append.c
@@ -122,7 +122,7 @@ error:
H5Dclose(did);
H5Pclose(ffapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_dataset_append_notset() */
@@ -296,7 +296,7 @@ error:
H5Dclose(did);
H5Pclose(ffapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_dataset_append_rows_columns() */
@@ -432,7 +432,7 @@ error:
H5Dclose(did);
H5Pclose(ffapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_dataset_append_rows() */
@@ -569,7 +569,7 @@ error:
H5Dclose(did);
H5Pclose(ffapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_dataset_append_columns() */
@@ -732,7 +732,7 @@ error:
H5Dclose(did);
H5Pclose(ffapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_dataset_append_BUG1() */
@@ -895,7 +895,7 @@ error:
H5Dclose(did);
H5Pclose(ffapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_dataset_append_BUG2() */
@@ -1054,7 +1054,7 @@ error:
H5Dclose(did);
H5Pclose(ffapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_dataset_append_less() */
@@ -1211,7 +1211,7 @@ error:
H5Dclose(did);
H5Pclose(ffapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_dataset_append_vary() */
diff --git a/hl/test/test_file_image.c b/hl/test/test_file_image.c
index defaab2..0a10e36 100644
--- a/hl/test/test_file_image.c
+++ b/hl/test/test_file_image.c
@@ -335,7 +335,7 @@ test_file_image(size_t open_images, size_t nflags, const unsigned *flags)
{
status1 = H5Dwrite(dset_id[i], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data1);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(status1 < 0, "H5Dwrite() should have failed");
@@ -344,7 +344,7 @@ test_file_image(size_t open_images, size_t nflags, const unsigned *flags)
{
status1 = H5Dset_extent(dset_id[i], dims4);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(status1 < 0, "H5Dset_extent() should have failed");
@@ -353,7 +353,7 @@ test_file_image(size_t open_images, size_t nflags, const unsigned *flags)
{
status1 = H5Dwrite(dset_id[i], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data4);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(status1 < 0, "H5Dwrite() should have failed");
@@ -408,13 +408,13 @@ test_file_image(size_t open_images, size_t nflags, const unsigned *flags)
status2 = H5Fflush(file_id[i], H5F_SCOPE_GLOBAL);
VERIFY(status1 < 0 || status2 < 0, "writing and flushing attr should have failed");
- } H5E_END_TRY;
+ } H5E_END_TRY
/* close attr and attr_space -- expect errors on close */
H5E_BEGIN_TRY {
H5Sclose(attr_space_id);
H5Aclose(attr_id);
- } H5E_END_TRY;
+ } H5E_END_TRY
#endif
if (H5Dclose(dset_id[i]) < 0)
FAIL_PUTS_ERROR("H5Dclose() failed");
diff --git a/hl/test/test_h5do_compat.c b/hl/test/test_h5do_compat.c
index 4a3c607..2610c33 100644
--- a/hl/test/test_h5do_compat.c
+++ b/hl/test/test_h5do_compat.c
@@ -84,7 +84,7 @@ error:
H5Sclose(sid);
H5Pclose(dcpl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return H5I_INVALID_HID;
@@ -223,7 +223,7 @@ error:
H5Sclose(mem_sid);
H5Sclose(file_sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return 1;
diff --git a/hl/test/test_image.c b/hl/test/test_image.c
index 462a3ce..8a67883 100644
--- a/hl/test/test_image.c
+++ b/hl/test/test_image.c
@@ -304,7 +304,7 @@ out:
{
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return FAIL;
}
@@ -494,7 +494,7 @@ out:
{
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return FAIL;
@@ -730,7 +730,7 @@ out:
{
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (f)
HDfclose(f);
H5_FAILED();
diff --git a/hl/test/test_ld.c b/hl/test/test_ld.c
index 11ea0e6..b056225 100644
--- a/hl/test/test_ld.c
+++ b/hl/test/test_ld.c
@@ -255,7 +255,7 @@ test_LD_dims_params(const char *file)
{
ret = H5LDget_dset_dims(invalid_id, one_cur_dims);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY_EQUAL(ret, FAIL)
/*
@@ -267,7 +267,7 @@ test_LD_dims_params(const char *file)
{
ret = H5LDget_dset_dims(did, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY_EQUAL(ret, FAIL)
if (H5Dclose(did) < 0)
FAIL_STACK_ERROR;
@@ -336,7 +336,7 @@ error:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (-1);
} /* test_LD_dims_params() */
@@ -481,7 +481,7 @@ error:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (-1);
} /* test_LD_dims() */
@@ -545,7 +545,7 @@ test_LD_size(const char *file)
{
dsize = H5LDget_dset_type_size(invalid_id, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY_EQUAL(dsize, 0)
/*
@@ -822,7 +822,7 @@ error:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (-1);
} /* test_LD_size() */
@@ -928,7 +928,7 @@ test_LD_elmts_invalid(const char *file)
{
ret = H5LDget_dset_elmts(invalid_id, prev_dims, cur_dims, NULL, tbuf);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY_EQUAL(ret, FAIL)
/* Open dataset: DSET_CMPD */
@@ -964,7 +964,7 @@ error:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (-1);
} /* test_LD_elmts_invalid() */
@@ -1122,7 +1122,7 @@ error:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (-1);
} /* test_LD_elmts_one() */
@@ -1336,7 +1336,7 @@ error:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (-1);
} /* test_LD_elmts_two() */
diff --git a/hl/test/test_table.c b/hl/test/test_table.c
index 3c8246a..7bef41d 100644
--- a/hl/test/test_table.c
+++ b/hl/test/test_table.c
@@ -823,7 +823,7 @@ test_table(hid_t fid, int do_write)
nrecords = 3;
if (H5TBdelete_record(fid, "table", start, nrecords) < 0)
goto out;
- ;
+
/* Get table info */
if (H5TBget_table_info(fid, "table", &nfields_out, &nrecords_out) < 0)
goto out;
diff --git a/java/src/jni/h5util.c b/java/src/jni/h5util.c
index 56708a8..d651173 100644
--- a/java/src/jni/h5util.c
+++ b/java/src/jni/h5util.c
@@ -1654,7 +1654,7 @@ h5str_dump_region_blocks(JNIEnv *env, h5str_t *str, hid_t region_space, hid_t re
{
nblocks = H5Sget_select_hyper_nblocks(region_space);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (nblocks <= 0) {
ret_value = SUCCEED;
@@ -1831,7 +1831,7 @@ h5str_dump_region_points(JNIEnv *env, h5str_t *str, hid_t region_space, hid_t re
{
npoints = H5Sget_select_elem_npoints(region_space);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (npoints <= 0) {
ret_value = SUCCEED;
diff --git a/src/H5Abtree2.c b/src/H5Abtree2.c
index 788aab7..18518fd 100644
--- a/src/H5Abtree2.c
+++ b/src/H5Abtree2.c
@@ -306,8 +306,8 @@ H5A__dense_btree2_name_encode(uint8_t *raw, const void *_nrecord, void H5_ATTR_U
H5MM_memcpy(raw, nrecord->id.id, (size_t)H5O_FHEAP_ID_LEN);
raw += H5O_FHEAP_ID_LEN;
*raw++ = nrecord->flags;
- UINT32ENCODE(raw, nrecord->corder)
- UINT32ENCODE(raw, nrecord->hash)
+ UINT32ENCODE(raw, nrecord->corder);
+ UINT32ENCODE(raw, nrecord->hash);
FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5A__dense_btree2_name_encode() */
@@ -336,8 +336,8 @@ H5A__dense_btree2_name_decode(const uint8_t *raw, void *_nrecord, void H5_ATTR_U
H5MM_memcpy(nrecord->id.id, raw, (size_t)H5O_FHEAP_ID_LEN);
raw += H5O_FHEAP_ID_LEN;
nrecord->flags = *raw++;
- UINT32DECODE(raw, nrecord->corder)
- UINT32DECODE(raw, nrecord->hash)
+ UINT32DECODE(raw, nrecord->corder);
+ UINT32DECODE(raw, nrecord->hash);
FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5A__dense_btree2_name_decode() */
@@ -459,7 +459,7 @@ H5A__dense_btree2_corder_encode(uint8_t *raw, const void *_nrecord, void H5_ATTR
H5MM_memcpy(raw, nrecord->id.id, (size_t)H5O_FHEAP_ID_LEN);
raw += H5O_FHEAP_ID_LEN;
*raw++ = nrecord->flags;
- UINT32ENCODE(raw, nrecord->corder)
+ UINT32ENCODE(raw, nrecord->corder);
FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5A__dense_btree2_corder_encode() */
diff --git a/src/H5Aint.c b/src/H5Aint.c
index a36836b..ad6e076 100644
--- a/src/H5Aint.c
+++ b/src/H5Aint.c
@@ -1935,7 +1935,7 @@ H5A__attr_iterate_table(const H5A_attr_table_t *atable, hsize_t skip, hsize_t *l
*last_attr = skip;
/* Iterate over attribute messages */
- H5_CHECKED_ASSIGN(u, size_t, skip, hsize_t)
+ H5_CHECKED_ASSIGN(u, size_t, skip, hsize_t);
for (; u < atable->nattrs && !ret_value; u++) {
/* Check which type of callback to make */
switch (attr_op->op_type) {
@@ -2566,7 +2566,7 @@ H5A__dense_post_copy_file_cb(const H5A_t *attr_src, void *_udata)
HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to reset attribute sharing")
/* Set COPIED tag for destination object's metadata */
- H5_BEGIN_TAG(H5AC__COPIED_TAG);
+ H5_BEGIN_TAG(H5AC__COPIED_TAG)
/* Insert attribute into dense storage */
if (H5A__dense_insert(udata->file, udata->ainfo, attr_dst) < 0)
diff --git a/src/H5B2cache.c b/src/H5B2cache.c
index 539606b..e29d0c7 100644
--- a/src/H5B2cache.c
+++ b/src/H5B2cache.c
@@ -697,7 +697,7 @@ H5B2__cache_int_deserialize(const void *_image, size_t H5_ATTR_UNUSED len, void
H5_CHECKED_ASSIGN(int_node_ptr->node_nrec, uint16_t, node_nrec, int);
if (udata->depth > 1)
UINT64DECODE_VAR(image, int_node_ptr->all_nrec,
- udata->hdr->node_info[udata->depth - 1].cum_max_nrec_size)
+ udata->hdr->node_info[udata->depth - 1].cum_max_nrec_size);
else
int_node_ptr->all_nrec = int_node_ptr->node_nrec;
diff --git a/src/H5B2dbg.c b/src/H5B2dbg.c
index e482086..9effa74 100644
--- a/src/H5B2dbg.c
+++ b/src/H5B2dbg.c
@@ -192,7 +192,7 @@ H5B2__int_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, co
*/
H5_CHECK_OVERFLOW(depth, unsigned, uint16_t);
node_ptr.addr = addr;
- H5_CHECKED_ASSIGN(node_ptr.node_nrec, uint16_t, nrec, unsigned)
+ H5_CHECKED_ASSIGN(node_ptr.node_nrec, uint16_t, nrec, unsigned);
if (NULL == (internal = H5B2__protect_internal(hdr, NULL, &node_ptr, (uint16_t)depth, FALSE,
H5AC__READ_ONLY_FLAG)))
HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree internal node")
@@ -293,7 +293,7 @@ H5B2__leaf_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, c
*/
H5_CHECK_OVERFLOW(nrec, unsigned, uint16_t);
node_ptr.addr = addr;
- H5_CHECKED_ASSIGN(node_ptr.node_nrec, uint16_t, nrec, unsigned)
+ H5_CHECKED_ASSIGN(node_ptr.node_nrec, uint16_t, nrec, unsigned);
if (NULL == (leaf = H5B2__protect_leaf(hdr, NULL, &node_ptr, FALSE, H5AC__READ_ONLY_FLAG)))
HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
diff --git a/src/H5B2hdr.c b/src/H5B2hdr.c
index 68f1f3d..30a40e9 100644
--- a/src/H5B2hdr.c
+++ b/src/H5B2hdr.c
@@ -142,7 +142,7 @@ H5B2__hdr_init(H5B2_hdr_t *hdr, const H5B2_create_t *cparam, void *ctx_udata, ui
/* Initialize leaf node info */
sz_max_nrec = H5B2_NUM_LEAF_REC(hdr->node_size, hdr->rrec_size);
- H5_CHECKED_ASSIGN(hdr->node_info[0].max_nrec, unsigned, sz_max_nrec, size_t)
+ H5_CHECKED_ASSIGN(hdr->node_info[0].max_nrec, unsigned, sz_max_nrec, size_t);
hdr->node_info[0].split_nrec = (hdr->node_info[0].max_nrec * hdr->split_percent) / 100;
hdr->node_info[0].merge_nrec = (hdr->node_info[0].max_nrec * hdr->merge_percent) / 100;
hdr->node_info[0].cum_max_nrec = hdr->node_info[0].max_nrec;
@@ -165,14 +165,14 @@ H5B2__hdr_init(H5B2_hdr_t *hdr, const H5B2_create_t *cparam, void *ctx_udata, ui
/* Compute size to store # of records in each node */
/* (uses leaf # of records because its the largest) */
u_max_nrec_size = H5VM_limit_enc_size((uint64_t)hdr->node_info[0].max_nrec);
- H5_CHECKED_ASSIGN(hdr->max_nrec_size, uint8_t, u_max_nrec_size, unsigned)
+ H5_CHECKED_ASSIGN(hdr->max_nrec_size, uint8_t, u_max_nrec_size, unsigned);
HDassert(hdr->max_nrec_size <= H5B2_SIZEOF_RECORDS_PER_NODE);
/* Initialize internal node info */
if (depth > 0) {
for (u = 1; u < (unsigned)(depth + 1); u++) {
sz_max_nrec = H5B2_NUM_INT_REC(hdr, u);
- H5_CHECKED_ASSIGN(hdr->node_info[u].max_nrec, unsigned, sz_max_nrec, size_t)
+ H5_CHECKED_ASSIGN(hdr->node_info[u].max_nrec, unsigned, sz_max_nrec, size_t);
HDassert(hdr->node_info[u].max_nrec <= hdr->node_info[u - 1].max_nrec);
hdr->node_info[u].split_nrec = (hdr->node_info[u].max_nrec * hdr->split_percent) / 100;
@@ -182,7 +182,7 @@ H5B2__hdr_init(H5B2_hdr_t *hdr, const H5B2_create_t *cparam, void *ctx_udata, ui
((hdr->node_info[u].max_nrec + 1) * hdr->node_info[u - 1].cum_max_nrec) +
hdr->node_info[u].max_nrec;
u_max_nrec_size = H5VM_limit_enc_size((uint64_t)hdr->node_info[u].cum_max_nrec);
- H5_CHECKED_ASSIGN(hdr->node_info[u].cum_max_nrec_size, uint8_t, u_max_nrec_size, unsigned)
+ H5_CHECKED_ASSIGN(hdr->node_info[u].cum_max_nrec_size, uint8_t, u_max_nrec_size, unsigned);
if (NULL == (hdr->node_info[u].nat_rec_fac =
H5FL_fac_init(hdr->cls->nrec_size * hdr->node_info[u].max_nrec)))
diff --git a/src/H5B2int.c b/src/H5B2int.c
index 6b5f88e..3ce3e15 100644
--- a/src/H5B2int.c
+++ b/src/H5B2int.c
@@ -362,14 +362,14 @@ H5B2__split_root(H5B2_hdr_t *hdr)
/* Update node info for new depth of tree */
sz_max_nrec = H5B2_NUM_INT_REC(hdr, hdr->depth);
- H5_CHECKED_ASSIGN(hdr->node_info[hdr->depth].max_nrec, unsigned, sz_max_nrec, size_t)
+ H5_CHECKED_ASSIGN(hdr->node_info[hdr->depth].max_nrec, unsigned, sz_max_nrec, size_t);
hdr->node_info[hdr->depth].split_nrec = (hdr->node_info[hdr->depth].max_nrec * hdr->split_percent) / 100;
hdr->node_info[hdr->depth].merge_nrec = (hdr->node_info[hdr->depth].max_nrec * hdr->merge_percent) / 100;
hdr->node_info[hdr->depth].cum_max_nrec =
((hdr->node_info[hdr->depth].max_nrec + 1) * hdr->node_info[hdr->depth - 1].cum_max_nrec) +
hdr->node_info[hdr->depth].max_nrec;
u_max_nrec_size = H5VM_limit_enc_size((uint64_t)hdr->node_info[hdr->depth].cum_max_nrec);
- H5_CHECKED_ASSIGN(hdr->node_info[hdr->depth].cum_max_nrec_size, uint8_t, u_max_nrec_size, unsigned)
+ H5_CHECKED_ASSIGN(hdr->node_info[hdr->depth].cum_max_nrec_size, uint8_t, u_max_nrec_size, unsigned);
if (NULL == (hdr->node_info[hdr->depth].nat_rec_fac =
H5FL_fac_init(hdr->cls->nrec_size * hdr->node_info[hdr->depth].max_nrec)))
HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't create node native key block factory")
@@ -546,7 +546,7 @@ H5B2__redistribute2(H5B2_hdr_t *hdr, uint16_t depth, H5B2_internal_t *internal,
/* Count the number of records being moved */
for (u = 0; u < move_nrec; u++)
moved_nrec += right_node_ptrs[u].all_nrec;
- H5_CHECKED_ASSIGN(left_moved_nrec, hssize_t, moved_nrec, hsize_t)
+ H5_CHECKED_ASSIGN(left_moved_nrec, hssize_t, moved_nrec, hsize_t);
right_moved_nrec -= (hssize_t)moved_nrec;
/* Copy node pointers from right node to left */
@@ -619,7 +619,7 @@ H5B2__redistribute2(H5B2_hdr_t *hdr, uint16_t depth, H5B2_internal_t *internal,
for (u = 0; u < move_nrec; u++)
moved_nrec += right_node_ptrs[u].all_nrec;
left_moved_nrec -= (hssize_t)moved_nrec;
- H5_CHECKED_ASSIGN(right_moved_nrec, hssize_t, moved_nrec, hsize_t)
+ H5_CHECKED_ASSIGN(right_moved_nrec, hssize_t, moved_nrec, hsize_t);
} /* end if */
/* Update flush dependencies for grandchildren, if using SWMR */
diff --git a/src/H5C.c b/src/H5C.c
index 3f9b2ad..b85a545 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -1132,7 +1132,7 @@ H5C_set_slist_enabled(H5C_t *cache_ptr, hbool_t slist_enabled, hbool_t clear_sli
entry_ptr = cache_ptr->il_head;
while (entry_ptr != NULL) {
if (entry_ptr->is_dirty)
- H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
+ H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL);
entry_ptr = entry_ptr->il_next;
}
diff --git a/src/H5CS.c b/src/H5CS.c
index c4a8862..a532d9c 100644
--- a/src/H5CS.c
+++ b/src/H5CS.c
@@ -225,7 +225,7 @@ H5CS_pop(void)
/* Pop the function. */
fstack->nused--;
- FUNC_LEAVE_NOAPI_NOFS(SUCCEED);
+ FUNC_LEAVE_NOAPI_NOFS(SUCCEED)
} /* end H5CS_pop() */
/*-------------------------------------------------------------------------
diff --git a/src/H5Cdbg.c b/src/H5Cdbg.c
index 4d8429e..1311f63 100644
--- a/src/H5Cdbg.c
+++ b/src/H5Cdbg.c
@@ -834,8 +834,8 @@ H5C_flush_dependency_exists(H5C_t *cache_ptr, haddr_t parent_addr, haddr_t child
HDassert(H5_addr_defined(child_addr));
HDassert(fd_exists_ptr);
- H5C__SEARCH_INDEX(cache_ptr, parent_addr, parent_ptr, FAIL)
- H5C__SEARCH_INDEX(cache_ptr, child_addr, child_ptr, FAIL)
+ H5C__SEARCH_INDEX(cache_ptr, parent_addr, parent_ptr, FAIL);
+ H5C__SEARCH_INDEX(cache_ptr, child_addr, child_ptr, FAIL);
if (parent_ptr && child_ptr) {
if (child_ptr->flush_dep_nparents > 0) {
@@ -1024,7 +1024,7 @@ H5C_get_entry_ptr_from_addr(H5C_t *cache_ptr, haddr_t addr, void **entry_ptr_ptr
HDassert(H5_addr_defined(addr));
HDassert(entry_ptr_ptr);
- H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL)
+ H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL);
if (entry_ptr == NULL)
/* the entry doesn't exist in the cache -- report this
@@ -1152,7 +1152,7 @@ H5C_verify_entry_type(H5C_t *cache_ptr, haddr_t addr, const H5C_class_t *expecte
HDassert(in_cache_ptr);
HDassert(type_ok_ptr);
- H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL)
+ H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL);
if (entry_ptr == NULL)
/* the entry doesn't exist in the cache -- report this
diff --git a/src/H5Centry.c b/src/H5Centry.c
index 2b90310..46f3dd6 100644
--- a/src/H5Centry.c
+++ b/src/H5Centry.c
@@ -698,7 +698,7 @@ H5C__flush_single_entry(H5F_t *f, H5C_cache_entry_t *entry_ptr, unsigned flags)
* Finally, if the destroy_entry flag is set, discard the
* entry.
*/
- H5C__DELETE_FROM_INDEX(cache_ptr, entry_ptr, FAIL)
+ H5C__DELETE_FROM_INDEX(cache_ptr, entry_ptr, FAIL);
if (entry_ptr->in_slist && del_from_slist_on_destroy)
H5C__REMOVE_ENTRY_FROM_SLIST(cache_ptr, entry_ptr, during_flush, FAIL)
@@ -2038,11 +2038,11 @@ H5C__deserialize_prefetched_entry(H5F_t *f, H5C_t *cache_ptr, H5C_cache_entry_t
#endif
/* Insert the deserialized entry into the cache. */
- H5C__INSERT_IN_INDEX(cache_ptr, ds_entry_ptr, FAIL)
+ H5C__INSERT_IN_INDEX(cache_ptr, ds_entry_ptr, FAIL);
HDassert(!ds_entry_ptr->in_slist);
if (ds_entry_ptr->is_dirty)
- H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, ds_entry_ptr, FAIL)
+ H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, ds_entry_ptr, FAIL);
H5C__UPDATE_RP_FOR_INSERTION(cache_ptr, ds_entry_ptr, FAIL)
@@ -2342,12 +2342,12 @@ H5C_insert_entry(H5F_t *f, const H5C_class_t *type, haddr_t addr, void *thing, u
HGOTO_ERROR(H5E_CACHE, H5E_CANTINS, FAIL, "H5C__make_space_in_cache failed")
} /* end if */
- H5C__INSERT_IN_INDEX(cache_ptr, entry_ptr, FAIL)
+ H5C__INSERT_IN_INDEX(cache_ptr, entry_ptr, FAIL);
/* New entries are presumed to be dirty */
HDassert(entry_ptr->is_dirty);
entry_ptr->flush_marker = set_flush_marker;
- H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
+ H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL);
H5C__UPDATE_RP_FOR_INSERTION(cache_ptr, entry_ptr, FAIL)
#ifdef H5C_DO_EXTREME_SANITY_CHECKS
@@ -2472,7 +2472,7 @@ H5C_mark_entry_dirty(void *thing)
if (was_clean)
H5C__UPDATE_INDEX_FOR_ENTRY_DIRTY(cache_ptr, entry_ptr, FAIL)
if (!entry_ptr->in_slist)
- H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
+ H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL);
/* Update stats for entry being marked dirty */
H5C__UPDATE_STATS_FOR_DIRTY_PIN(cache_ptr, entry_ptr)
@@ -2751,7 +2751,7 @@ H5C_move_entry(H5C_t *cache_ptr, const H5C_class_t *type, haddr_t old_addr, hadd
* don't mark it as dirty either, lest we confuse the flush call back.
*/
if (!entry_ptr->destroy_in_progress) {
- H5C__DELETE_FROM_INDEX(cache_ptr, entry_ptr, FAIL)
+ H5C__DELETE_FROM_INDEX(cache_ptr, entry_ptr, FAIL);
if (entry_ptr->in_slist) {
HDassert(cache_ptr->slist_ptr);
@@ -2780,13 +2780,13 @@ H5C_move_entry(H5C_t *cache_ptr, const H5C_class_t *type, haddr_t old_addr, hadd
} /* end if */
/* Modify cache data structures */
- H5C__INSERT_IN_INDEX(cache_ptr, entry_ptr, FAIL)
- H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
+ H5C__INSERT_IN_INDEX(cache_ptr, entry_ptr, FAIL);
+ H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL);
/* Skip some actions if we're in the middle of flushing the entry */
if (!entry_ptr->flush_in_progress) {
/* Update the replacement policy for the entry */
- H5C__UPDATE_RP_FOR_MOVE(cache_ptr, entry_ptr, was_dirty, FAIL)
+ H5C__UPDATE_RP_FOR_MOVE(cache_ptr, entry_ptr, was_dirty, FAIL);
/* Check for entry changing status and do notifications, etc. */
if (!was_dirty) {
@@ -2924,7 +2924,7 @@ H5C_resize_entry(void *thing, size_t new_size)
entry_ptr->size = new_size;
if (!entry_ptr->in_slist)
- H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
+ H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL);
if (entry_ptr->is_pinned)
H5C__UPDATE_STATS_FOR_DIRTY_PIN(cache_ptr, entry_ptr)
@@ -3289,9 +3289,9 @@ H5C_protect(H5F_t *f, const H5C_class_t *type, haddr_t addr, void *udata, unsign
*/
entry_ptr->flush_me_last = flush_last;
- H5C__INSERT_IN_INDEX(cache_ptr, entry_ptr, NULL)
+ H5C__INSERT_IN_INDEX(cache_ptr, entry_ptr, NULL);
if (entry_ptr->is_dirty && !entry_ptr->in_slist)
- H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, NULL)
+ H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, NULL);
/* insert the entry in the data structures used by the replacement
* policy. We are just going to take it out again when we update
@@ -3688,7 +3688,7 @@ H5C_unprotect(H5F_t *f, haddr_t addr, void *thing, unsigned flags)
/* H5C__UPDATE_RP_FOR_UNPROTECT will place the unprotected entry on
* the pinned entry list if entry_ptr->is_pinned is TRUE.
*/
- H5C__UPDATE_RP_FOR_UNPROTECT(cache_ptr, entry_ptr, FAIL)
+ H5C__UPDATE_RP_FOR_UNPROTECT(cache_ptr, entry_ptr, FAIL);
entry_ptr->is_protected = FALSE;
@@ -3699,7 +3699,7 @@ H5C_unprotect(H5F_t *f, haddr_t addr, void *thing, unsigned flags)
entry_ptr->flush_marker |= set_flush_marker;
if (!entry_ptr->in_slist)
/* this is a no-op if cache_ptr->slist_enabled is FALSE */
- H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
+ H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL);
} /* end if */
/* This implementation of the "deleted" option is a bit inefficient, as
@@ -4252,7 +4252,7 @@ H5C_remove_entry(void *_entry)
* 4) Remove it from the tag list for this object
*/
- H5C__DELETE_FROM_INDEX(cache, entry, FAIL)
+ H5C__DELETE_FROM_INDEX(cache, entry, FAIL);
#ifdef H5_HAVE_PARALLEL
/* Check for collective read access flag */
diff --git a/src/H5Cimage.c b/src/H5Cimage.c
index 4188e10..69def29 100644
--- a/src/H5Cimage.c
+++ b/src/H5Cimage.c
@@ -2482,16 +2482,16 @@ H5C__reconstruct_cache_contents(H5F_t *f, H5C_t *cache_ptr)
*/
/* Insert the prefetched entry in the index */
- H5C__INSERT_IN_INDEX(cache_ptr, pf_entry_ptr, FAIL)
+ H5C__INSERT_IN_INDEX(cache_ptr, pf_entry_ptr, FAIL);
/* If dirty, insert the entry into the slist. */
if (pf_entry_ptr->is_dirty)
- H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, pf_entry_ptr, FAIL)
+ H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, pf_entry_ptr, FAIL);
/* Append the entry to the LRU */
- H5C__UPDATE_RP_FOR_INSERT_APPEND(cache_ptr, pf_entry_ptr, FAIL)
+ H5C__UPDATE_RP_FOR_INSERT_APPEND(cache_ptr, pf_entry_ptr, FAIL);
- H5C__UPDATE_STATS_FOR_PREFETCH(cache_ptr, pf_entry_ptr->is_dirty)
+ H5C__UPDATE_STATS_FOR_PREFETCH(cache_ptr, pf_entry_ptr->is_dirty);
/* If the prefetched entry is the child in one or more flush
* dependency relationships, recreate those flush dependencies.
@@ -2503,7 +2503,7 @@ H5C__reconstruct_cache_contents(H5F_t *f, H5C_t *cache_ptr)
/* Find the parent entry */
parent_ptr = NULL;
- H5C__SEARCH_INDEX(cache_ptr, pf_entry_ptr->fd_parent_addrs[v], parent_ptr, FAIL)
+ H5C__SEARCH_INDEX(cache_ptr, pf_entry_ptr->fd_parent_addrs[v], parent_ptr, FAIL);
if (parent_ptr == NULL)
HGOTO_ERROR(H5E_CACHE, H5E_NOTFOUND, FAIL, "fd parent not in cache?!?")
@@ -2522,7 +2522,7 @@ H5C__reconstruct_cache_contents(H5F_t *f, H5C_t *cache_ptr)
HGOTO_ERROR(H5E_CACHE, H5E_CANTDEPEND, FAIL, "Can't restore flush dependency")
/* And now unprotect */
- H5C__UPDATE_RP_FOR_UNPROTECT(cache_ptr, parent_ptr, FAIL)
+ H5C__UPDATE_RP_FOR_UNPROTECT(cache_ptr, parent_ptr, FAIL);
parent_ptr->is_protected = FALSE;
} /* end for */
} /* end for */
diff --git a/src/H5Cmpio.c b/src/H5Cmpio.c
index 2b8527e..46f1ba7 100644
--- a/src/H5Cmpio.c
+++ b/src/H5Cmpio.c
@@ -292,7 +292,7 @@ H5C_apply_candidate_list(H5F_t *f, H5C_t *cache_ptr, unsigned num_candidates, ha
last_addr = addr;
#endif /* H5C_DO_SANITY_CHECKS */
- H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL)
+ H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL);
if (entry_ptr == NULL)
HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "listed candidate entry not in cache?!?!?")
if (!entry_ptr->is_dirty)
@@ -680,7 +680,7 @@ H5C_mark_entries_as_clean(H5F_t *f, unsigned ce_array_len, haddr_t *ce_array_ptr
HDassert(H5_addr_defined(addr));
- H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL)
+ H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL);
if (entry_ptr == NULL) {
#ifdef H5C_DO_SANITY_CHECKS
@@ -990,7 +990,7 @@ done:
if (H5CX_set_io_xfer_mode(orig_xfer_mode) < 0)
HDONE_ERROR(H5E_CACHE, H5E_CANTSET, FAIL, "can't set MPI-I/O transfer mode")
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5C__collective_write() */
/*-------------------------------------------------------------------------
diff --git a/src/H5Cpkg.h b/src/H5Cpkg.h
index 1801341..a6204c5 100644
--- a/src/H5Cpkg.h
+++ b/src/H5Cpkg.h
@@ -815,7 +815,7 @@ if ((cache_ptr)->index_size != ((cache_ptr)->clean_index_size + (cache_ptr)->dir
#define H5C__INSERT_IN_INDEX(cache_ptr, entry_ptr, fail_val) \
-{ \
+do { \
int k; \
H5C__PRE_HT_INSERT_SC(cache_ptr, entry_ptr, fail_val) \
k = H5C__HASH_FCN((entry_ptr)->addr); \
@@ -844,10 +844,10 @@ if ((cache_ptr)->index_size != ((cache_ptr)->clean_index_size + (cache_ptr)->dir
(cache_ptr)->il_size, fail_val) \
H5C__UPDATE_STATS_FOR_HT_INSERTION(cache_ptr) \
H5C__POST_HT_INSERT_SC(cache_ptr, entry_ptr, fail_val) \
-}
+} while (0)
#define H5C__DELETE_FROM_INDEX(cache_ptr, entry_ptr, fail_val) \
-{ \
+do { \
int k; \
H5C__PRE_HT_REMOVE_SC(cache_ptr, entry_ptr, fail_val) \
k = H5C__HASH_FCN((entry_ptr)->addr); \
@@ -879,7 +879,7 @@ if ((cache_ptr)->index_size != ((cache_ptr)->clean_index_size + (cache_ptr)->dir
(cache_ptr)->il_size, fail_val) \
H5C__UPDATE_STATS_FOR_HT_DELETION(cache_ptr) \
H5C__POST_HT_REMOVE_SC(cache_ptr, entry_ptr, fail_val) \
-}
+} while (0)
#define H5C__SEARCH_INDEX(cache_ptr, entry_addr, entry_ptr, fail_val) \
{ \
@@ -958,7 +958,7 @@ if ((cache_ptr)->index_size != ((cache_ptr)->clean_index_size + (cache_ptr)->dir
(old_size), (new_size), (fail_val)) \
H5C__POST_HT_ENTRY_SIZE_CHANGE_SC(cache_ptr, old_size, new_size, \
entry_ptr, fail_val) \
-}
+} while (0)
/**************************************************************************
@@ -1022,7 +1022,7 @@ if ((cache_ptr)->index_size != ((cache_ptr)->clean_index_size + (cache_ptr)->dir
*/
#define H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, fail_val) \
-{ \
+do { \
HDassert(cache_ptr); \
\
if((cache_ptr)->slist_enabled) { \
@@ -1056,7 +1056,7 @@ if ((cache_ptr)->index_size != ((cache_ptr)->clean_index_size + (cache_ptr)->dir
HDassert((cache_ptr)->slist_len == 0); \
HDassert((cache_ptr)->slist_size == 0); \
} \
-} /* H5C__INSERT_ENTRY_IN_SLIST */
+} while (0) /* H5C__INSERT_ENTRY_IN_SLIST */
/*-------------------------------------------------------------------------
@@ -1124,7 +1124,7 @@ if ((cache_ptr)->index_size != ((cache_ptr)->clean_index_size + (cache_ptr)->dir
*/
#define H5C__UPDATE_SLIST_FOR_SIZE_CHANGE(cache_ptr, old_size, new_size) \
-{ \
+do { \
HDassert(cache_ptr); \
\
if((cache_ptr)->slist_enabled) { \
@@ -1158,7 +1158,7 @@ if ((cache_ptr)->index_size != ((cache_ptr)->clean_index_size + (cache_ptr)->dir
HDassert((cache_ptr)->slist_len == 0); \
HDassert((cache_ptr)->slist_size == 0); \
} \
-} /* H5C__UPDATE_SLIST_FOR_SIZE_CHANGE */
+} while (0) /* H5C__UPDATE_SLIST_FOR_SIZE_CHANGE */
/**************************************************************************
@@ -1461,7 +1461,7 @@ if ((cache_ptr)->index_size != ((cache_ptr)->clean_index_size + (cache_ptr)->dir
*/
#define H5C__UPDATE_RP_FOR_INSERT_APPEND(cache_ptr, entry_ptr, fail_val) \
-{ \
+do { \
HDassert(cache_ptr); \
HDassert(entry_ptr); \
HDassert(!(entry_ptr)->is_protected); \
@@ -1484,7 +1484,7 @@ if ((cache_ptr)->index_size != ((cache_ptr)->clean_index_size + (cache_ptr)->dir
/* Maintain the clean & dirty LRU lists, if enabled */ \
H5C__UPDATE_RP_FOR_INSERT_APPEND_CD_LRU(cache_ptr, entry_ptr, fail_val) \
} \
-}
+} while (0)
/*-------------------------------------------------------------------------
@@ -1592,7 +1592,7 @@ if ((cache_ptr)->index_size != ((cache_ptr)->clean_index_size + (cache_ptr)->dir
*/
#define H5C__UPDATE_RP_FOR_MOVE(cache_ptr, entry_ptr, was_dirty, fail_val) \
-{ \
+do { \
HDassert(cache_ptr); \
HDassert(entry_ptr); \
HDassert(!(entry_ptr)->is_read_only); \
@@ -1615,7 +1615,7 @@ if ((cache_ptr)->index_size != ((cache_ptr)->clean_index_size + (cache_ptr)->dir
/* Maintain the clean & dirty LRU lists, if enabled */ \
H5C__UPDATE_RP_FOR_MOVE_CD_LRU(cache_ptr, entry_ptr, was_dirty, fail_val) \
} \
-} /* H5C__UPDATE_RP_FOR_MOVE */
+} while (0) /* H5C__UPDATE_RP_FOR_MOVE */
/*-------------------------------------------------------------------------
@@ -1751,7 +1751,7 @@ if ((cache_ptr)->index_size != ((cache_ptr)->clean_index_size + (cache_ptr)->dir
*/
#define H5C__UPDATE_RP_FOR_UNPROTECT(cache_ptr, entry_ptr, fail_val) \
-{ \
+do { \
HDassert(cache_ptr); \
HDassert(entry_ptr); \
HDassert((entry_ptr)->is_protected); \
@@ -1779,7 +1779,7 @@ if ((cache_ptr)->index_size != ((cache_ptr)->clean_index_size + (cache_ptr)->dir
/* Maintain the clean & dirty LRU lists, if enabled */ \
H5C__UPDATE_RP_FOR_UNPROTECT_CD_LRU(cache_ptr, entry_ptr, fail_val) \
} \
-} /* H5C__UPDATE_RP_FOR_UNPROTECT */
+} while (0) /* H5C__UPDATE_RP_FOR_UNPROTECT */
#ifdef H5_HAVE_PARALLEL
diff --git a/src/H5Cquery.c b/src/H5Cquery.c
index 0b62a1a..c25668b 100644
--- a/src/H5Cquery.c
+++ b/src/H5Cquery.c
@@ -250,7 +250,7 @@ H5C_get_entry_status(const H5F_t *f, haddr_t addr, size_t *size_ptr, hbool_t *in
if (cache_ptr == NULL)
HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr on entry.")
- H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL)
+ H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL);
if (entry_ptr == NULL) {
/* the entry doesn't exist in the cache -- report this
@@ -372,7 +372,7 @@ H5C_get_entry_ring(const H5F_t *f, haddr_t addr, H5C_ring_t *ring)
HDassert(H5_addr_defined(addr));
/* Locate the entry at the address */
- H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL)
+ H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL);
if (entry_ptr == NULL)
HGOTO_ERROR(H5E_CACHE, H5E_NOTFOUND, FAIL, "can't find entry in index")
diff --git a/src/H5Dbtree2.c b/src/H5Dbtree2.c
index 9cb464a..135c564 100644
--- a/src/H5Dbtree2.c
+++ b/src/H5Dbtree2.c
@@ -1321,7 +1321,7 @@ H5D__bt2_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src, const H5D_chk_id
HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't open v2 B-tree")
/* Set copied metadata tag */
- H5_BEGIN_TAG(H5AC__COPIED_TAG);
+ H5_BEGIN_TAG(H5AC__COPIED_TAG)
/* Create v2 B-tree that describes the chunked dataset in the destination file */
if (H5D__bt2_idx_create(idx_info_dst) < 0)
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index 1dd827e..840b1ce 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -79,13 +79,14 @@
/* Sanity check on chunk index types: commonly used by a lot of routines in this file */
#define H5D_CHUNK_STORAGE_INDEX_CHK(storage) \
- HDassert((H5D_CHUNK_IDX_EARRAY == (storage)->idx_type && H5D_COPS_EARRAY == (storage)->ops) || \
- (H5D_CHUNK_IDX_FARRAY == (storage)->idx_type && H5D_COPS_FARRAY == (storage)->ops) || \
- (H5D_CHUNK_IDX_BT2 == (storage)->idx_type && H5D_COPS_BT2 == (storage)->ops) || \
- (H5D_CHUNK_IDX_BTREE == (storage)->idx_type && H5D_COPS_BTREE == (storage)->ops) || \
- (H5D_CHUNK_IDX_SINGLE == (storage)->idx_type && H5D_COPS_SINGLE == (storage)->ops) || \
- (H5D_CHUNK_IDX_NONE == (storage)->idx_type && H5D_COPS_NONE == (storage)->ops));
-
+ do { \
+ HDassert((H5D_CHUNK_IDX_EARRAY == (storage)->idx_type && H5D_COPS_EARRAY == (storage)->ops) || \
+ (H5D_CHUNK_IDX_FARRAY == (storage)->idx_type && H5D_COPS_FARRAY == (storage)->ops) || \
+ (H5D_CHUNK_IDX_BT2 == (storage)->idx_type && H5D_COPS_BT2 == (storage)->ops) || \
+ (H5D_CHUNK_IDX_BTREE == (storage)->idx_type && H5D_COPS_BTREE == (storage)->ops) || \
+ (H5D_CHUNK_IDX_SINGLE == (storage)->idx_type && H5D_COPS_SINGLE == (storage)->ops) || \
+ (H5D_CHUNK_IDX_NONE == (storage)->idx_type && H5D_COPS_NONE == (storage)->ops)); \
+ } while (0)
/*
* Feature: If this constant is defined then every cache preemption and load
* causes a character to be printed on the standard error stream:
@@ -3824,8 +3825,7 @@ H5D__chunk_lookup(const H5D_t *dset, const hsize_t *scaled, H5D_chunk_ud_t *udat
udata->idx_hint = idx;
udata->chunk_block.offset = ent->chunk_block.offset;
udata->chunk_block.length = ent->chunk_block.length;
- ;
- udata->chunk_idx = ent->chunk_idx;
+ udata->chunk_idx = ent->chunk_idx;
} /* end if */
else {
/* Invalidate idx_hint, to signal that the chunk is not in cache */
@@ -6885,7 +6885,7 @@ H5D__chunk_copy_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, H5_ITER_ERROR, "unable to write raw data to file")
/* Set metadata tag in API context */
- H5_BEGIN_TAG(H5AC__COPIED_TAG);
+ H5_BEGIN_TAG(H5AC__COPIED_TAG)
/* Insert chunk record into index */
if (need_insert && udata->idx_info_dst->storage->ops->insert)
diff --git a/src/H5Dearray.c b/src/H5Dearray.c
index 5662c08..36c3dbc 100644
--- a/src/H5Dearray.c
+++ b/src/H5Dearray.c
@@ -1577,7 +1577,7 @@ H5D__earray_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src, const H5D_chk
HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't open extensible array")
/* Set copied metadata tag */
- H5_BEGIN_TAG(H5AC__COPIED_TAG);
+ H5_BEGIN_TAG(H5AC__COPIED_TAG)
/* Create the extensible array that describes chunked storage in the dest. file */
if (H5D__earray_idx_create(idx_info_dst) < 0)
diff --git a/src/H5Dfarray.c b/src/H5Dfarray.c
index bcb4106..e215230 100644
--- a/src/H5Dfarray.c
+++ b/src/H5Dfarray.c
@@ -1435,7 +1435,7 @@ H5D__farray_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src, const H5D_chk
HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't open fixed array")
/* Set copied metadata tag */
- H5_BEGIN_TAG(H5AC__COPIED_TAG);
+ H5_BEGIN_TAG(H5AC__COPIED_TAG)
/* Create the fixed array that describes chunked storage in the dest. file */
if (H5D__farray_idx_create(idx_info_dst) < 0)
diff --git a/src/H5Dint.c b/src/H5Dint.c
index 2c3586e..3c5dbe6 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -668,7 +668,7 @@ H5D__use_minimized_dset_headers(H5F_t *file, hbool_t *minimize)
done:
if (FAIL == ret_value)
*minimize = FALSE;
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* H5D__use_minimized_dset_headers */
/*-------------------------------------------------------------------------
@@ -788,7 +788,7 @@ H5D__calculate_minimum_header_size(H5F_t *file, H5D_t *dset, H5O_t *ohdr)
}
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* H5D__calculate_minimum_header_size */
/*-------------------------------------------------------------------------
@@ -830,7 +830,7 @@ H5D__prepare_minimized_oh(H5F_t *file, H5D_t *dset, H5O_loc_t *oloc)
HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL, "can't apply object header to file")
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* H5D__prepare_minimized_oh */
/*-------------------------------------------------------------------------
diff --git a/src/H5Dnone.c b/src/H5Dnone.c
index f4a6b26e..eb2a137 100644
--- a/src/H5Dnone.c
+++ b/src/H5Dnone.c
@@ -385,7 +385,7 @@ H5D__none_idx_copy_setup(const H5D_chk_idx_info_t H5_ATTR_NDEBUG_UNUSED *idx_inf
HDassert(idx_info_dst->storage);
/* Set copied metadata tag */
- H5_BEGIN_TAG(H5AC__COPIED_TAG);
+ H5_BEGIN_TAG(H5AC__COPIED_TAG)
/* Allocate dataset chunks in the dest. file */
if (H5D__none_idx_create(idx_info_dst) < 0)
diff --git a/src/H5Dsingle.c b/src/H5Dsingle.c
index 8c144e8..9566a5c 100644
--- a/src/H5Dsingle.c
+++ b/src/H5Dsingle.c
@@ -442,7 +442,7 @@ H5D__single_idx_copy_setup(const H5D_chk_idx_info_t H5_ATTR_NDEBUG_UNUSED *idx_i
HDassert(idx_info_dst->storage);
/* Set copied metadata tag */
- H5_BEGIN_TAG(H5AC__COPIED_TAG);
+ H5_BEGIN_TAG(H5AC__COPIED_TAG)
/* Set up information at the destination file */
if (H5D__single_idx_create(idx_info_dst) < 0)
diff --git a/src/H5Dvirtual.c b/src/H5Dvirtual.c
index 6695c02..f850e1c 100644
--- a/src/H5Dvirtual.c
+++ b/src/H5Dvirtual.c
@@ -496,7 +496,7 @@ H5D__virtual_store_layout(H5F_t *f, H5O_layout_t *layout)
/* Number of entries */
tmp_nentries = (hsize_t)virt->list_nused;
- H5F_ENCODE_LENGTH(f, heap_block_p, tmp_nentries)
+ H5F_ENCODE_LENGTH(f, heap_block_p, tmp_nentries);
/* Encode each entry */
for (i = 0; i < virt->list_nused; i++) {
@@ -520,7 +520,7 @@ H5D__virtual_store_layout(H5F_t *f, H5O_layout_t *layout)
/* Checksum */
chksum = H5_checksum_metadata(heap_block, block_size - (size_t)4, 0);
- UINT32ENCODE(heap_block_p, chksum)
+ UINT32ENCODE(heap_block_p, chksum);
/* Insert block into global heap */
if (H5HG_insert(f, block_size, heap_block, &(virt->serial_list_hobjid)) < 0)
@@ -1117,7 +1117,7 @@ H5D__virtual_str_append(const char *src, size_t src_len, char **p, char **buf, s
**p = '\0';
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__virtual_str_append() */
/*-------------------------------------------------------------------------
diff --git a/src/H5EAcache.c b/src/H5EAcache.c
index bd96179..b006ecb 100644
--- a/src/H5EAcache.c
+++ b/src/H5EAcache.c
@@ -270,7 +270,7 @@ H5EA__cache_hdr_verify_chksum(const void *_image, size_t len, void H5_ATTR_UNUSE
if (stored_chksum != computed_chksum)
ret_value = FALSE;
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5EA__cache_hdr_verify_chksum() */
/*-------------------------------------------------------------------------
@@ -1631,7 +1631,7 @@ done:
if (dblock && H5EA__dblock_dest(dblock) < 0)
HDONE_ERROR(H5E_EARRAY, H5E_CANTFREE, NULL, "unable to destroy extensible array data block")
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5EA__cache_dblock_deserialize() */
/*-------------------------------------------------------------------------
diff --git a/src/H5ESevent.c b/src/H5ESevent.c
index abd7fbf..2edb61d 100644
--- a/src/H5ESevent.c
+++ b/src/H5ESevent.c
@@ -114,7 +114,7 @@ H5ES__event_new(H5VL_t *connector, void *token)
ret_value = ev;
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5ES__event_new() */
/*-------------------------------------------------------------------------
diff --git a/src/H5Epublic.h b/src/H5Epublic.h
index 50ae941..1d7d7b5 100644
--- a/src/H5Epublic.h
+++ b/src/H5Epublic.h
@@ -79,7 +79,7 @@ H5_DLLVAR hid_t H5E_ERR_CLS_g;
* easier just to use this macro like:
* H5E_BEGIN_TRY {
* ...stuff here that's likely to fail...
- * } H5E_END_TRY;
+ * } H5E_END_TRY
*
* Warning: don't break, return, or longjmp() from the body of the loop or
* the error reporting won't be properly restored!
diff --git a/src/H5FAtest.c b/src/H5FAtest.c
index ffd064d..d841b32 100644
--- a/src/H5FAtest.c
+++ b/src/H5FAtest.c
@@ -341,7 +341,7 @@ H5FA__test_crt_dbg_context(H5F_t H5_ATTR_UNUSED *f, haddr_t H5_ATTR_UNUSED obj_a
ret_value = ctx;
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FA__test_crt_dbg_context() */
/*-------------------------------------------------------------------------
@@ -369,7 +369,7 @@ H5FA__get_cparam_test(const H5FA_t *fa, H5FA_create_t *cparam)
cparam->raw_elmt_size = fa->hdr->cparam.raw_elmt_size;
cparam->nelmts = fa->hdr->cparam.nelmts;
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FA__get_cparam_test() */
/*-------------------------------------------------------------------------
diff --git a/src/H5FD.c b/src/H5FD.c
index bfeef36..dee74ee 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -929,7 +929,7 @@ H5FD_cmp(const H5FD_t *f1, const H5FD_t *f2)
{
int ret_value = -1; /* Return value */
- FUNC_ENTER_NOAPI_NOERR; /* return value is arbitrary */
+ FUNC_ENTER_NOAPI_NOERR /* return value is arbitrary */
if ((!f1 || !f1->cls) && (!f2 || !f2->cls))
HGOTO_DONE(0)
diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c
index 82c65ec..9a01e7f 100644
--- a/src/H5FDfamily.c
+++ b/src/H5FDfamily.c
@@ -813,7 +813,7 @@ H5FD__family_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxad
file->memb[file->nmembs] =
H5FDopen(memb_name, (0 == file->nmembs ? flags : t_flags), file->memb_fapl_id, HADDR_UNDEF);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (!file->memb[file->nmembs]) {
if (0 == file->nmembs)
HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to open member file")
@@ -1074,7 +1074,7 @@ H5FD__family_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t abs_eoa)
file->memb[u] = H5FDopen(memb_name, file->flags | H5F_ACC_CREAT, file->memb_fapl_id,
(haddr_t)file->memb_size);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (NULL == file->memb[u])
HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, FAIL, "unable to open member file")
} /* end if */
@@ -1566,7 +1566,7 @@ H5FD__family_delete(const char *filename, hid_t fapl_id)
{
delete_error = H5FD_delete(member_name, memb_fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (FAIL == delete_error) {
if (0 == current_member)
HGOTO_ERROR(H5E_VFL, H5E_CANTDELETEFILE, FAIL, "unable to delete member file")
diff --git a/src/H5FDhdfs.c b/src/H5FDhdfs.c
index 2c64237..4b1a64f 100644
--- a/src/H5FDhdfs.c
+++ b/src/H5FDhdfs.c
@@ -815,7 +815,7 @@ hdfs__reset_stats(H5FD_hdfs_t *file)
}
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* hdfs__reset_stats */
#endif /* HDFS_STATS */
@@ -1162,7 +1162,7 @@ hdfs__fprint_stats(FILE *stream, const H5FD_hdfs_t *file)
}
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* hdfs__fprint_stats */
#endif /* HDFS_STATS */
diff --git a/src/H5FDmirror.c b/src/H5FDmirror.c
index 8c222d3..6f6ae8f 100644
--- a/src/H5FDmirror.c
+++ b/src/H5FDmirror.c
@@ -1146,7 +1146,7 @@ done:
if (xmit_buf)
xmit_buf = H5FL_BLK_FREE(xmit, xmit_buf);
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__mirror_verify_reply() */
/* -------------------------------------------------------------------------
@@ -1549,7 +1549,7 @@ done:
static herr_t
H5FD__mirror_query(const H5FD_t H5_ATTR_UNUSED *_file, unsigned long *flags)
{
- FUNC_ENTER_PACKAGE_NOERR;
+ FUNC_ENTER_PACKAGE_NOERR
LOG_OP_CALL(__func__);
@@ -1566,7 +1566,7 @@ H5FD__mirror_query(const H5FD_t H5_ATTR_UNUSED *_file, unsigned long *flags)
H5FD_FEAT_AGGREGATE_SMALLDATA | H5FD_FEAT_POSIX_COMPAT_HANDLE | H5FD_FEAT_SUPPORTS_SWMR_IO |
H5FD_FEAT_DEFAULT_VFD_COMPATIBLE;
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD__mirror_query() */
/*-------------------------------------------------------------------------
@@ -1862,7 +1862,7 @@ done:
if (xmit_buf)
xmit_buf = H5FL_BLK_FREE(xmit, xmit_buf);
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__mirror_lock */
/*-------------------------------------------------------------------------
@@ -1906,7 +1906,7 @@ done:
if (xmit_buf)
xmit_buf = H5FL_BLK_FREE(xmit, xmit_buf);
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__mirror_unlock */
#endif /* H5_HAVE_MIRROR_VFD */
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index 7885add..371942d 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -439,7 +439,7 @@ H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map /*out*/, hid_t *memb_fapl
{
fa = (const H5FD_multi_fapl_t *)H5Pget_driver_info(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (!fa || (H5P_FILE_ACCESS_DEFAULT == fapl_id)) {
if (H5FD_multi_populate_config(NULL, NULL, NULL, NULL, TRUE, &default_fa) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_VFL, H5E_CANTSET, "can't setup default driver configuration",
@@ -509,7 +509,7 @@ H5FD_split_populate_config(const char *meta_ext, hid_t meta_plist_id, const char
_memb_name[mt] = NULL;
_memb_addr[mt] = HADDR_UNDEF;
}
- END_MEMBERS;
+ END_MEMBERS
/* The file access properties */
_memb_fapl[H5FD_MEM_SUPER] = meta_plist_id;
@@ -573,7 +573,7 @@ H5FD_split_populate_config(const char *meta_ext, hid_t meta_plist_id, const char
if (!_memb_name[mmt] || !_memb_name[mmt][0])
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "file resource type not set", -1);
}
- END_MEMBERS;
+ END_MEMBERS
/*
* Initialize driver specific information. No need to copy it into the FA
@@ -595,7 +595,7 @@ H5FD_split_populate_config(const char *meta_ext, hid_t meta_plist_id, const char
"can't set sec2 driver on member FAPL", -1);
}
}
- END_MEMBERS;
+ END_MEMBERS
return ret_value;
}
@@ -727,7 +727,7 @@ H5FD_multi_sb_size(H5FD_t *_file)
UNIQUE_MEMBERS (file->fa.memb_map, mt) {
nseen++;
}
- END_MEMBERS;
+ END_MEMBERS
/* Addresses and EOA markers */
nbytes += nseen * 2 * 8;
@@ -737,7 +737,7 @@ H5FD_multi_sb_size(H5FD_t *_file)
size_t n = strlen(file->fa.memb_name[mt]) + 1;
nbytes += (n + 7) & ~((size_t)0x0007);
}
- END_MEMBERS;
+ END_MEMBERS
return nbytes;
}
@@ -808,7 +808,7 @@ H5FD_multi_sb_encode(H5FD_t *_file, char *name /*out*/, unsigned char *buf /*out
p += sizeof(haddr_t);
nseen++;
}
- END_MEMBERS;
+ END_MEMBERS
if (H5Tconvert(H5T_NATIVE_HADDR, H5T_STD_U64LE, nseen * 2, buf + 8, NULL, H5P_DEFAULT) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1);
@@ -821,7 +821,7 @@ H5FD_multi_sb_encode(H5FD_t *_file, char *name /*out*/, unsigned char *buf /*out
for (i = n; i % 8; i++)
*p++ = '\0';
}
- END_MEMBERS;
+ END_MEMBERS
return 0;
} /* end H5FD_multi_sb_encode() */
@@ -875,7 +875,7 @@ H5FD_multi_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf)
memb_eoa[mt] = HADDR_UNDEF;
memb_name[mt] = NULL;
}
- END_MEMBERS;
+ END_MEMBERS
/*
* Read the map and count the unique members.
@@ -891,7 +891,7 @@ H5FD_multi_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf)
UNIQUE_MEMBERS (map, mt) {
nseen++;
}
- END_MEMBERS;
+ END_MEMBERS
buf += 8;
/* Decode Address and EOA values */
@@ -906,7 +906,7 @@ H5FD_multi_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf)
memb_addr[_unmapped] = *ap++;
memb_eoa[_unmapped] = *ap++;
}
- END_MEMBERS;
+ END_MEMBERS
/* Decode name templates */
UNIQUE_MEMBERS (map, mt) {
@@ -914,7 +914,7 @@ H5FD_multi_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf)
memb_name[_unmapped] = (const char *)buf;
buf += (n + 7) & ~((unsigned)0x0007);
}
- END_MEMBERS;
+ END_MEMBERS
/*
* Use the mapping saved in the superblock in preference to the one
@@ -927,14 +927,14 @@ H5FD_multi_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf)
ALL_MEMBERS (mt) {
file->fa.memb_map[mt] = map[mt];
}
- END_MEMBERS;
+ END_MEMBERS
/* Close files which are unused now */
memset(in_use, 0, sizeof in_use);
UNIQUE_MEMBERS (map, mt) {
in_use[mt] = TRUE;
}
- END_MEMBERS;
+ END_MEMBERS
ALL_MEMBERS (mt) {
if (!in_use[mt] && file->memb[mt]) {
(void)H5FDclose(file->memb[mt]);
@@ -942,7 +942,7 @@ H5FD_multi_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf)
}
file->fa.memb_map[mt] = map[mt];
}
- END_MEMBERS;
+ END_MEMBERS
}
/* Commit member starting addresses and name templates */
@@ -954,7 +954,7 @@ H5FD_multi_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf)
file->fa.memb_name[mt] = my_strdup(memb_name[mt]);
}
}
- END_MEMBERS;
+ END_MEMBERS
if (compute_next(file) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "compute_next() failed", -1);
@@ -972,7 +972,7 @@ H5FD_multi_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf)
*/
file->memb_eoa[mt] = memb_eoa[mt];
}
- END_MEMBERS;
+ END_MEMBERS
return 0;
} /* end H5FD_multi_sb_decode() */
@@ -1049,7 +1049,7 @@ H5FD_multi_fapl_copy(const void *_old_fa)
}
}
}
- END_MEMBERS;
+ END_MEMBERS
if (nerrors) {
ALL_MEMBERS (mt) {
@@ -1058,7 +1058,7 @@ H5FD_multi_fapl_copy(const void *_old_fa)
if (new_fa->memb_name[mt])
free(new_fa->memb_name[mt]);
}
- END_MEMBERS;
+ END_MEMBERS
free(new_fa);
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "can't release object on error", NULL);
}
@@ -1095,7 +1095,7 @@ H5FD_multi_fapl_free(void *_fa)
if (fa->memb_name[mt])
free(fa->memb_name[mt]);
}
- END_MEMBERS;
+ END_MEMBERS
free(fa);
return 0;
@@ -1147,7 +1147,7 @@ H5FD_multi_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
{
fa = (const H5FD_multi_fapl_t *)H5Pget_driver_info(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (!fa || (H5P_FILE_ACCESS_DEFAULT == fapl_id) || (H5FD_MULTI != H5Pget_driver(fapl_id))) {
char *env = getenv(HDF5_DRIVER);
@@ -1175,7 +1175,7 @@ H5FD_multi_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
else
file->fa.memb_name[mt] = NULL;
}
- END_MEMBERS;
+ END_MEMBERS
file->fa.relax = fa->relax;
file->flags = flags;
file->name = my_strdup(name);
@@ -1208,7 +1208,7 @@ error:
if (file->fa.memb_name[mt])
free(file->fa.memb_name[mt]);
}
- END_MEMBERS;
+ END_MEMBERS
if (file->name)
free(file->name);
free(file);
@@ -1253,7 +1253,7 @@ H5FD_multi_close(H5FD_t *_file)
}
}
}
- END_MEMBERS;
+ END_MEMBERS
if (nerrors)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "error closing member files", -1);
@@ -1264,7 +1264,7 @@ H5FD_multi_close(H5FD_t *_file)
if (file->fa.memb_name[mt])
free(file->fa.memb_name[mt]);
}
- END_MEMBERS;
+ END_MEMBERS
free(file->name);
free(file);
@@ -1311,7 +1311,7 @@ H5FD_multi_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
cmp = 1;
}
}
- END_MEMBERS;
+ END_MEMBERS
assert(cmp || out_mt < H5FD_MEM_NTYPES);
if (out_mt >= H5FD_MEM_NTYPES)
return cmp;
@@ -1418,7 +1418,7 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
{
memb_eoa = H5FDget_eoa(file->memb[mt], mt);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (HADDR_UNDEF == memb_eoa)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file has unknown eoa",
@@ -1441,7 +1441,7 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
if (memb_eoa > eoa)
eoa = memb_eoa;
}
- END_MEMBERS;
+ END_MEMBERS
}
else {
H5FD_mem_t mmt = file->fa.memb_map[type];
@@ -1454,7 +1454,7 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
{
eoa = H5FDget_eoa(file->memb[mmt], mmt);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (HADDR_UNDEF == eoa)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file has unknown eoa",
@@ -1535,7 +1535,7 @@ H5FD_multi_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t eoa)
{
status = H5FDset_eoa(file->memb[mmt], mmt, (eoa - file->fa.memb_addr[mmt]));
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_BADVALUE, "member H5FDset_eoa failed", -1);
@@ -1579,7 +1579,7 @@ H5FD_multi_get_eof(const H5FD_t *_file, H5FD_mem_t type)
{
tmp_eof = H5FDget_eof(file->memb[mt], type);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (HADDR_UNDEF == tmp_eof)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file has unknown eof",
@@ -1601,7 +1601,7 @@ H5FD_multi_get_eof(const H5FD_t *_file, H5FD_mem_t type)
if (tmp_eof > eof)
eof = tmp_eof;
}
- END_MEMBERS;
+ END_MEMBERS
}
else {
H5FD_mem_t mmt = file->fa.memb_map[type];
@@ -1615,7 +1615,7 @@ H5FD_multi_get_eof(const H5FD_t *_file, H5FD_mem_t type)
{
eof = H5FDget_eof(file->memb[mmt], mmt);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (HADDR_UNDEF == eof)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file has unknown eof",
@@ -1702,7 +1702,7 @@ H5FD_multi_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
if (file->memb[mt])
file->memb[mt]->paged_aggr = file->pub.paged_aggr;
}
- END_MEMBERS;
+ END_MEMBERS
}
if (HADDR_UNDEF == (addr = H5FDalloc(file->memb[mmt], mmt, dxpl_id, size)))
@@ -1916,7 +1916,7 @@ H5FD_multi_flush(H5FD_t *_file, hid_t dxpl_id, hbool_t closing)
if (H5FDflush(file->memb[mt], dxpl_id, closing) < 0)
nerrors++;
}
- H5E_END_TRY;
+ H5E_END_TRY
}
}
if (nerrors)
@@ -1957,7 +1957,7 @@ H5FD_multi_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing)
if (H5FDtruncate(file->memb[mt], dxpl_id, closing) < 0)
nerrors++;
}
- H5E_END_TRY;
+ H5E_END_TRY
}
}
if (nerrors)
@@ -2003,10 +2003,10 @@ H5FD_multi_lock(H5FD_t *_file, hbool_t rw)
break;
} /* end if */
}
- H5E_END_TRY;
+ H5E_END_TRY
} /* end if */
}
- END_MEMBERS;
+ END_MEMBERS
/* Try to unlock the member files that are locked before error is encountered */
if (nerrors) {
@@ -2018,7 +2018,7 @@ H5FD_multi_lock(H5FD_t *_file, hbool_t rw)
if (H5FDunlock(file->memb[k]) < 0)
nerrors++;
}
- H5E_END_TRY;
+ H5E_END_TRY
} /* end for */
} /* end if */
@@ -2057,7 +2057,7 @@ H5FD_multi_unlock(H5FD_t *_file)
if (H5FDunlock(file->memb[mt]) < 0)
nerrors++;
}
- END_MEMBERS;
+ END_MEMBERS
if (nerrors)
H5Epush_ret(func, H5E_ERR_CLS, H5E_VFL, H5E_CANTUNLOCKFILE, "error unlocking member files", -1);
@@ -2089,7 +2089,7 @@ compute_next(H5FD_multi_t *file)
ALL_MEMBERS (mt) {
file->memb_next[mt] = HADDR_UNDEF;
}
- END_MEMBERS;
+ END_MEMBERS
UNIQUE_MEMBERS (file->fa.memb_map, mt1) {
UNIQUE_MEMBERS2(file->fa.memb_map, mt2)
@@ -2099,12 +2099,12 @@ compute_next(H5FD_multi_t *file)
file->memb_next[mt1] = file->fa.memb_addr[mt2];
}
}
- END_MEMBERS;
+ END_MEMBERS
if (HADDR_UNDEF == file->memb_next[mt1]) {
file->memb_next[mt1] = HADDR_MAX; /*last member*/
}
}
- END_MEMBERS;
+ END_MEMBERS
return 0;
}
@@ -2155,13 +2155,13 @@ open_members(H5FD_multi_t *file)
{
file->memb[mt] = H5FDopen(tmp, file->flags, file->fa.memb_fapl[mt], HADDR_UNDEF);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (!file->memb[mt]) {
if (!file->fa.relax || (file->flags & H5F_ACC_RDWR))
nerrors++;
}
}
- END_MEMBERS;
+ END_MEMBERS
if (nerrors)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "error opening member files", -1);
@@ -2198,7 +2198,7 @@ H5FD_multi_delete(const char *filename, hid_t fapl_id)
{
fa = (const H5FD_multi_fapl_t *)H5Pget_driver_info(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (!fa) {
char *env = getenv(HDF5_DRIVER);
@@ -2228,7 +2228,7 @@ H5FD_multi_delete(const char *filename, hid_t fapl_id)
if (H5FDdelete(full_filename, fa->memb_fapl[mt]) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_VFL, H5E_BADVALUE, "error deleting member files", -1);
}
- END_MEMBERS;
+ END_MEMBERS
return 0;
} /* end H5FD_multi_delete() */
diff --git a/src/H5FDonion.c b/src/H5FDonion.c
index 1c81870..c4ffe4c 100644
--- a/src/H5FDonion.c
+++ b/src/H5FDonion.c
@@ -259,7 +259,7 @@ H5FD__onion_term(void)
/* Reset VFL ID */
H5FD_ONION_g = 0;
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD__onion_term() */
@@ -535,7 +535,7 @@ done:
H5MM_xfree(buf);
H5MM_xfree(new_list);
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__onion_commit_new_revision_record() */
/*-----------------------------------------------------------------------------
@@ -624,7 +624,7 @@ H5FD__onion_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
{
const H5FD_onion_t *file = (const H5FD_onion_t *)_file;
- FUNC_ENTER_PACKAGE_NOERR;
+ FUNC_ENTER_PACKAGE_NOERR
FUNC_LEAVE_NOAPI(file->logical_eoa)
} /* end H5FD__onion_get_eoa() */
@@ -642,7 +642,7 @@ H5FD__onion_get_eof(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
{
const H5FD_onion_t *file = (const H5FD_onion_t *)_file;
- FUNC_ENTER_PACKAGE_NOERR;
+ FUNC_ENTER_PACKAGE_NOERR
FUNC_LEAVE_NOAPI(file->logical_eof)
} /* end H5FD__onion_get_eof() */
@@ -693,7 +693,7 @@ H5FD__onion_create_truncate_onion(H5FD_onion_t *file, const char *filename, cons
size_t size = 0;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_PACKAGE;
+ FUNC_ENTER_PACKAGE
HDassert(file != NULL);
@@ -772,7 +772,7 @@ done:
if (FAIL == ret_value)
HDremove(recovery_file_nameery); /* destroy new temp file, if 'twas created */
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__onion_create_truncate_onion() */
static herr_t
@@ -780,7 +780,7 @@ H5FD__onion_remove_unused_symbols(char *s)
{
char *d = s;
- FUNC_ENTER_PACKAGE_NOERR;
+ FUNC_ENTER_PACKAGE_NOERR
do {
while (*d == '{' || *d == '}' || *d == ' ') {
@@ -788,7 +788,7 @@ H5FD__onion_remove_unused_symbols(char *s)
}
} while ((*s++ = *d++));
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
}
static herr_t
@@ -797,7 +797,7 @@ H5FD__onion_parse_config_str(const char *config_str, H5FD_onion_fapl_info_t *fa)
char *config_str_copy = NULL;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_PACKAGE;
+ FUNC_ENTER_PACKAGE
if (!HDstrcmp(config_str, ""))
HGOTO_ERROR(H5E_VFL, H5E_BADVALUE, FAIL, "configure string can't be empty")
@@ -891,7 +891,7 @@ H5FD__onion_parse_config_str(const char *config_str, H5FD_onion_fapl_info_t *fa)
done:
H5MM_free(config_str_copy);
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
}
/*-----------------------------------------------------------------------------
@@ -1028,7 +1028,7 @@ H5FD__onion_open(const char *filename, unsigned flags, hid_t fapl_id, haddr_t ma
{
file->onion_file = H5FD_open(name_onion, flags, backing_fapl_id, maxaddr);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* If that didn't work, create a new onion file */
/* TODO: Move to a new function */
@@ -1237,7 +1237,7 @@ done:
H5MM_xfree(new_fa);
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__onion_open() */
/*-----------------------------------------------------------------------------
@@ -1261,7 +1261,7 @@ H5FD__onion_open_rw(H5FD_onion_t *file, unsigned int flags, haddr_t maxaddr, boo
uint32_t checksum = 0;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_PACKAGE;
+ FUNC_ENTER_PACKAGE
/* Guard against simultaneous write-open.
* TODO: support recovery open with force-write-open flag in FAPL info.
@@ -1321,7 +1321,7 @@ done:
H5MM_xfree(buf);
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__onion_open_rw() */
/*-----------------------------------------------------------------------------
@@ -1424,7 +1424,7 @@ H5FD__onion_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, h
HDassert(0 == bytes_to_read);
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__onion_read() */
/*-----------------------------------------------------------------------------
@@ -1440,11 +1440,11 @@ H5FD__onion_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
{
H5FD_onion_t *file = (H5FD_onion_t *)_file;
- FUNC_ENTER_PACKAGE_NOERR;
+ FUNC_ENTER_PACKAGE_NOERR
file->logical_eoa = addr;
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD__onion_set_eoa() */
/*-----------------------------------------------------------------------------
@@ -1600,7 +1600,7 @@ H5FD__onion_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id,
done:
H5MM_xfree(page_buf);
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__onion_write() */
/*-------------------------------------------------------------------------
@@ -1741,7 +1741,7 @@ H5FD__onion_write_final_history(H5FD_onion_t *file)
size_t size = 0;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_PACKAGE;
+ FUNC_ENTER_PACKAGE
/* TODO: history EOF may not be correct (under what circumstances?) */
if (0 == (size = H5FD__onion_write_history(&(file->history), file->onion_file, file->onion_eof,
@@ -1757,5 +1757,5 @@ H5FD__onion_write_final_history(H5FD_onion_t *file)
file->onion_eof += size;
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__onion_write_final_history() */
diff --git a/src/H5FDonion_header.c b/src/H5FDonion_header.c
index 1287c2e..3b087fa 100644
--- a/src/H5FDonion_header.c
+++ b/src/H5FDonion_header.c
@@ -44,7 +44,7 @@ H5FD__onion_ingest_header(H5FD_onion_header_t *hdr_out, H5FD_t *raw_file, haddr_
haddr_t size = (haddr_t)H5FD_ONION_ENCODED_SIZE_HEADER;
uint32_t sum = 0;
- FUNC_ENTER_PACKAGE;
+ FUNC_ENTER_PACKAGE
if (H5FD_get_eof(raw_file, H5FD_MEM_DRAW) < (addr + size))
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "header indicates history beyond EOF")
@@ -68,7 +68,7 @@ H5FD__onion_ingest_header(H5FD_onion_header_t *hdr_out, H5FD_t *raw_file, haddr_
done:
H5MM_xfree(buf);
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__onion_ingest_header() */
/*-------------------------------------------------------------------------
@@ -88,7 +88,7 @@ H5FD__onion_write_header(H5FD_onion_header_t *header, H5FD_t *file)
unsigned char *buf = NULL;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_PACKAGE;
+ FUNC_ENTER_PACKAGE
if (NULL == (buf = H5MM_malloc(H5FD_ONION_ENCODED_SIZE_HEADER)))
HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, FAIL, "can't allocate buffer for updated history header")
@@ -102,7 +102,7 @@ H5FD__onion_write_header(H5FD_onion_header_t *header, H5FD_t *file)
done:
H5MM_xfree(buf);
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__onion_write_header()*/
/*-----------------------------------------------------------------------------
@@ -128,7 +128,7 @@ H5FD__onion_header_decode(unsigned char *buf, H5FD_onion_header_t *header)
unsigned char *ptr = NULL;
size_t ret_value = 0;
- FUNC_ENTER_PACKAGE;
+ FUNC_ENTER_PACKAGE
HDassert(buf != NULL);
HDassert(header != NULL);
@@ -180,7 +180,7 @@ H5FD__onion_header_decode(unsigned char *buf, H5FD_onion_header_t *header)
ret_value = (size_t)(ptr - buf);
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__onion_header_decode() */
/*-----------------------------------------------------------------------------
@@ -206,7 +206,7 @@ H5FD__onion_header_encode(H5FD_onion_header_t *header, unsigned char *buf, uint3
unsigned char *ptr = buf;
size_t ret_value = 0;
- FUNC_ENTER_PACKAGE_NOERR;
+ FUNC_ENTER_PACKAGE_NOERR
HDassert(buf != NULL);
HDassert(checksum != NULL);
@@ -228,5 +228,5 @@ H5FD__onion_header_encode(H5FD_onion_header_t *header, unsigned char *buf, uint3
UINT32ENCODE(ptr, *checksum);
ret_value = (size_t)(ptr - buf);
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__onion_header_encode() */
diff --git a/src/H5FDonion_history.c b/src/H5FDonion_history.c
index 9a3aa15..567ac07 100644
--- a/src/H5FDonion_history.c
+++ b/src/H5FDonion_history.c
@@ -43,7 +43,7 @@ H5FD__onion_ingest_history(H5FD_onion_history_t *history_out, H5FD_t *raw_file,
uint32_t sum = 0;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_PACKAGE;
+ FUNC_ENTER_PACKAGE
HDassert(history_out);
HDassert(raw_file);
@@ -83,7 +83,7 @@ done:
if (ret_value < 0)
H5MM_xfree(history_out->record_locs);
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__onion_ingest_history() */
/*-----------------------------------------------------------------------------
@@ -104,7 +104,7 @@ H5FD__onion_write_history(H5FD_onion_history_t *history, H5FD_t *file, haddr_t o
unsigned char *buf = NULL;
uint64_t ret_value = 0;
- FUNC_ENTER_PACKAGE;
+ FUNC_ENTER_PACKAGE
if (NULL == (buf = H5MM_malloc(H5FD_ONION_ENCODED_SIZE_HISTORY +
(H5FD_ONION_ENCODED_SIZE_RECORD_POINTER * history->n_revisions))))
@@ -124,7 +124,7 @@ H5FD__onion_write_history(H5FD_onion_history_t *history, H5FD_t *file, haddr_t o
done:
H5MM_xfree(buf);
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__onion_write_history() */
/*-----------------------------------------------------------------------------
@@ -166,7 +166,7 @@ H5FD__onion_history_decode(unsigned char *buf, H5FD_onion_history_t *history)
unsigned char *ptr = NULL;
size_t ret_value = 0;
- FUNC_ENTER_PACKAGE;
+ FUNC_ENTER_PACKAGE
HDassert(buf != NULL);
HDassert(history != NULL);
@@ -239,7 +239,7 @@ H5FD__onion_history_decode(unsigned char *buf, H5FD_onion_history_t *history)
ret_value = (size_t)(ptr - buf);
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__onion_history_decode() */
/*-----------------------------------------------------------------------------
@@ -268,7 +268,7 @@ H5FD__onion_history_encode(H5FD_onion_history_t *history, unsigned char *buf, ui
unsigned char *ptr = buf;
size_t vers_u32 = (uint32_t)history->version; /* pad out unused bytes */
- FUNC_ENTER_PACKAGE_NOERR;
+ FUNC_ENTER_PACKAGE_NOERR
HDassert(history != NULL);
HDassert(H5FD_ONION_HISTORY_VERSION_CURR == history->version);
@@ -302,5 +302,5 @@ H5FD__onion_history_encode(H5FD_onion_history_t *history, unsigned char *buf, ui
*checksum = H5_checksum_fletcher32(buf, (size_t)(ptr - buf));
UINT32ENCODE(ptr, *checksum);
- FUNC_LEAVE_NOAPI((size_t)(ptr - buf));
+ FUNC_LEAVE_NOAPI((size_t)(ptr - buf))
} /* end H5FD__onion_history_encode() */
diff --git a/src/H5FDonion_index.c b/src/H5FDonion_index.c
index 48aa89a..0ed1afe 100644
--- a/src/H5FDonion_index.c
+++ b/src/H5FDonion_index.c
@@ -52,7 +52,7 @@ H5FD__onion_ingest_revision_record(H5FD_onion_revision_record_t *r_out, H5FD_t *
haddr_t addr = 0;
size_t size = 0;
- FUNC_ENTER_PACKAGE;
+ FUNC_ENTER_PACKAGE
HDassert(r_out);
HDassert(raw_file);
@@ -162,7 +162,7 @@ done:
H5MM_xfree(r_out->archival_index.list);
}
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__onion_ingest_revision_record() */
/*-----------------------------------------------------------------------------
@@ -184,7 +184,7 @@ H5FD__onion_archival_index_is_valid(const H5FD_onion_archival_index_t *aix)
{
hbool_t ret_value = TRUE;
- FUNC_ENTER_PACKAGE_NOERR;
+ FUNC_ENTER_PACKAGE_NOERR
HDassert(aix);
@@ -200,7 +200,7 @@ H5FD__onion_archival_index_is_valid(const H5FD_onion_archival_index_t *aix)
HGOTO_DONE(FALSE)
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__onion_archival_index_is_valid() */
/*-----------------------------------------------------------------------------
@@ -228,7 +228,7 @@ H5FD__onion_archival_index_find(const H5FD_onion_archival_index_t *aix, uint64_t
H5FD_onion_index_entry_t *x = NULL;
int ret_value = 0;
- FUNC_ENTER_PACKAGE_NOERR;
+ FUNC_ENTER_PACKAGE_NOERR
HDassert(aix);
HDassert(H5FD_ONION_ARCHIVAL_INDEX_VERSION_CURR == aix->version);
@@ -276,7 +276,7 @@ H5FD__onion_archival_index_find(const H5FD_onion_archival_index_t *aix, uint64_t
}
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__onion_archival_index_find() */
/*-----------------------------------------------------------------------------
@@ -292,7 +292,7 @@ H5FD__onion_revision_index_destroy(H5FD_onion_revision_index_t *rix)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_PACKAGE_NOERR;
+ FUNC_ENTER_PACKAGE_NOERR
HDassert(rix);
HDassert(H5FD_ONION_REVISION_INDEX_VERSION_CURR == rix->version);
@@ -315,7 +315,7 @@ H5FD__onion_revision_index_destroy(H5FD_onion_revision_index_t *rix)
H5MM_xfree(rix->_hash_table);
H5MM_xfree(rix);
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__onion_revision_index_destroy() */
/*-----------------------------------------------------------------------------
@@ -336,7 +336,7 @@ H5FD__onion_revision_index_init(uint32_t page_size)
H5FD_onion_revision_index_t *rix = NULL;
H5FD_onion_revision_index_t *ret_value = NULL;
- FUNC_ENTER_PACKAGE;
+ FUNC_ENTER_PACKAGE
HDassert(0 != page_size);
HDassert(POWER_OF_TWO(page_size));
@@ -364,7 +364,7 @@ done:
if (NULL == ret_value)
H5MM_xfree(rix);
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__onion_revision_index_init() */
/*-----------------------------------------------------------------------------
@@ -390,7 +390,7 @@ H5FD__onion_revision_index_resize(H5FD_onion_revision_index_t *rix)
uint64_t new_n_keys_populated = 0;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_PACKAGE;
+ FUNC_ENTER_PACKAGE
HDassert(rix);
HDassert(H5FD_ONION_REVISION_INDEX_VERSION_CURR == rix->version);
@@ -428,7 +428,7 @@ H5FD__onion_revision_index_resize(H5FD_onion_revision_index_t *rix)
rix->_hash_table = new_table;
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__onion_revision_index_resize() */
/*-----------------------------------------------------------------------------
@@ -452,7 +452,7 @@ H5FD__onion_revision_index_insert(H5FD_onion_revision_index_t *rix, const H5FD_o
H5FD_onion_revision_index_hash_chain_node_t **append_dest = NULL;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_PACKAGE;
+ FUNC_ENTER_PACKAGE
HDassert(rix);
HDassert(H5FD_ONION_REVISION_INDEX_VERSION_CURR == rix->version);
@@ -502,7 +502,7 @@ H5FD__onion_revision_index_insert(H5FD_onion_revision_index_t *rix, const H5FD_o
}
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__onion_revision_index_insert() */
/*-----------------------------------------------------------------------------
@@ -525,7 +525,7 @@ H5FD__onion_revision_index_find(const H5FD_onion_revision_index_t *rix, uint64_t
uint64_t key = 0;
int ret_value = 0;
- FUNC_ENTER_PACKAGE_NOERR;
+ FUNC_ENTER_PACKAGE_NOERR
HDassert(rix);
HDassert(H5FD_ONION_REVISION_INDEX_VERSION_CURR == rix->version);
@@ -547,7 +547,7 @@ H5FD__onion_revision_index_find(const H5FD_onion_revision_index_t *rix, uint64_t
}
}
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__onion_revision_index_find() */
/*-----------------------------------------------------------------------------
@@ -597,7 +597,7 @@ H5FD__onion_revision_record_decode(unsigned char *buf, H5FD_onion_revision_recor
unsigned char *ptr = NULL;
size_t ret_value = 0;
- FUNC_ENTER_PACKAGE;
+ FUNC_ENTER_PACKAGE
HDassert(buf != NULL);
HDassert(record != NULL);
@@ -723,7 +723,7 @@ H5FD__onion_revision_record_decode(unsigned char *buf, H5FD_onion_revision_recor
ret_value = (size_t)(ptr - buf);
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__onion_revision_record_decode() */
/*-----------------------------------------------------------------------------
@@ -754,7 +754,7 @@ H5FD__onion_revision_record_encode(H5FD_onion_revision_record_t *record, unsigne
uint32_t vers_u32 = (uint32_t)record->version; /* pad out unused bytes */
uint32_t page_size = 0;
- FUNC_ENTER_PACKAGE_NOERR;
+ FUNC_ENTER_PACKAGE_NOERR
HDassert(checksum != NULL);
HDassert(buf != NULL);
@@ -805,7 +805,7 @@ H5FD__onion_revision_record_encode(H5FD_onion_revision_record_t *record, unsigne
*checksum = H5_checksum_fletcher32(buf, (size_t)(ptr - buf));
UINT32ENCODE(ptr, *checksum);
- FUNC_LEAVE_NOAPI((size_t)(ptr - buf));
+ FUNC_LEAVE_NOAPI((size_t)(ptr - buf))
} /* end H5FD__onion_revision_record_encode() */
/*-----------------------------------------------------------------------------
@@ -854,7 +854,7 @@ H5FD__onion_merge_revision_index_into_archival_index(const H5FD_onion_revision_i
};
herr_t ret_value = SUCCEED;
- FUNC_ENTER_PACKAGE;
+ FUNC_ENTER_PACKAGE
HDassert(rix);
HDassert(aix);
@@ -932,5 +932,5 @@ done:
H5MM_xfree(kept_list);
H5MM_xfree(new_aix.list);
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__onion_merge_revision_index_into_archival_index() */
diff --git a/src/H5FDros3.c b/src/H5FDros3.c
index 9a529d6..465117f 100644
--- a/src/H5FDros3.c
+++ b/src/H5FDros3.c
@@ -649,7 +649,7 @@ ros3_reset_stats(H5FD_ros3_t *file)
}
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end ros3_reset_stats() */
#endif /* ROS3_STATS */
@@ -1052,7 +1052,7 @@ ros3_fprint_stats(FILE *stream, const H5FD_ros3_t *file)
}
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* ros3_fprint_stats */
#endif /* ROS3_STATS */
diff --git a/src/H5FDs3comms.c b/src/H5FDs3comms.c
index 628c55a..d91d3b9 100644
--- a/src/H5FDs3comms.c
+++ b/src/H5FDs3comms.c
@@ -561,7 +561,7 @@ done:
}
}
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_s3comms_hrb_node_set() */
/*----------------------------------------------------------------------------
@@ -980,7 +980,7 @@ done:
H5MM_xfree(headerresponse);
sds.magic += 1; /* set to bad magic */
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* H5FD_s3comms_s3r_getsize */
/*----------------------------------------------------------------------------
@@ -1526,7 +1526,7 @@ done:
HDONE_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "cannot unset CURLOPT_HTTPHEADER")
}
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* H5FD_s3comms_s3r_read */
/****************************************************************************
@@ -1698,7 +1698,7 @@ H5FD_s3comms_aws_canonical_request(char *canonical_request_dest, int _cr_size, c
HDstrcat(canonical_request_dest, EMPTY_SHA256);
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_s3comms_aws_canonical_request() */
/*----------------------------------------------------------------------------
@@ -1757,7 +1757,7 @@ H5FD_s3comms_bytes_to_hex(char *dest, const unsigned char *msg, size_t msg_len,
}
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_s3comms_bytes_to_hex() */
/*----------------------------------------------------------------------------
@@ -1860,7 +1860,7 @@ H5FD_s3comms_HMAC_SHA256(const unsigned char *key, size_t key_len, const char *m
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "could not convert to hex string.");
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* H5FD_s3comms_HMAC_SHA256 */
/*-----------------------------------------------------------------------------
@@ -2010,7 +2010,7 @@ H5FD__s3comms_load_aws_creds_from_file(FILE *file, const char *profile_name, cha
} while (found_setting);
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__s3comms_load_aws_creds_from_file() */
/*----------------------------------------------------------------------------
@@ -2106,7 +2106,7 @@ done:
if (HDfclose(credfile) == EOF)
HDONE_ERROR(H5E_ARGS, H5E_ARGS, FAIL, "problem error-closing aws configuration file")
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_s3comms_load_aws_profile() */
/*----------------------------------------------------------------------------
@@ -2158,7 +2158,7 @@ H5FD_s3comms_nlowercase(char *dest, const char *s, size_t len)
}
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_s3comms_nlowercase() */
/*----------------------------------------------------------------------------
@@ -2203,7 +2203,7 @@ H5FD_s3comms_parse_url(const char *str, parsed_url_t **_purl)
unsigned int i = 0;
herr_t ret_value = FAIL;
- FUNC_ENTER_NOAPI_NOINIT;
+ FUNC_ENTER_NOAPI_NOINIT
#if S3COMMS_DEBUG
HDprintf("called H5FD_s3comms_parse_url.\n");
@@ -2366,7 +2366,7 @@ done:
if (ret_value == FAIL)
H5FD_s3comms_free_purl(purl);
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_s3comms_parse_url() */
/*----------------------------------------------------------------------------
@@ -2515,7 +2515,7 @@ H5FD_s3comms_percent_encode_char(char *repr, const unsigned char c, size_t *repr
*(repr + *repr_len) = '\0';
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* H5FD_s3comms_percent_encode_char */
/*----------------------------------------------------------------------------
@@ -2608,7 +2608,7 @@ H5FD_s3comms_signing_key(unsigned char *md, const char *secret, const char *regi
done:
H5MM_xfree(AWS4_secret);
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_s3comms_signing_key() */
/*----------------------------------------------------------------------------
diff --git a/src/H5FDsplitter.c b/src/H5FDsplitter.c
index 448f11b..e6f0969 100644
--- a/src/H5FDsplitter.c
+++ b/src/H5FDsplitter.c
@@ -267,7 +267,7 @@ H5FD__copy_plist(hid_t fapl_id, hid_t *id_out_ptr)
HGOTO_ERROR(H5E_VFL, H5E_BADTYPE, -1, "unable to copy file access property list");
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__copy_plist() */
/*-------------------------------------------------------------------------
diff --git a/src/H5FS.c b/src/H5FS.c
index 8e8cb63..4cea930 100644
--- a/src/H5FS.c
+++ b/src/H5FS.c
@@ -922,7 +922,6 @@ H5FS_free(H5F_t *f, H5FS_t *fspace, hbool_t free_file_space)
HDassert(fspace);
cache_flags = H5AC__DELETED_FLAG | H5AC__TAKE_OWNERSHIP_FLAG;
- ;
/* Free space for section info */
if (H5_addr_defined(fspace->sect_addr)) {
diff --git a/src/H5Fefc.c b/src/H5Fefc.c
index e7de395..ea9a279 100644
--- a/src/H5Fefc.c
+++ b/src/H5Fefc.c
@@ -473,7 +473,7 @@ H5F__efc_release_real(H5F_efc_t *efc)
efc->tag = H5F_EFC_TAG_DEFAULT;
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F__efc_release_real() */
/*-------------------------------------------------------------------------
@@ -557,7 +557,7 @@ H5F__efc_destroy(H5F_efc_t *efc)
(void)H5FL_FREE(H5F_efc_t, efc);
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F__efc_destroy() */
/*-------------------------------------------------------------------------
diff --git a/src/H5Fio.c b/src/H5Fio.c
index f6a8500..e258d71 100644
--- a/src/H5Fio.c
+++ b/src/H5Fio.c
@@ -438,7 +438,7 @@ H5F_flush_tagged_metadata(H5F_t *f, haddr_t tag)
HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "low level flush failed")
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F_flush_tagged_metadata */
/*-------------------------------------------------------------------------
@@ -465,7 +465,7 @@ H5F_evict_tagged_metadata(H5F_t *f, haddr_t tag)
HGOTO_ERROR(H5E_CACHE, H5E_CANTEXPUNGE, FAIL, "unable to evict tagged metadata")
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F_evict_tagged_metadata */
/*-------------------------------------------------------------------------
@@ -518,7 +518,7 @@ H5F__evict_cache_entries(H5F_t *f)
#endif /* NDEBUG */
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F__evict_cache_entries() */
/*-------------------------------------------------------------------------
diff --git a/src/H5Fmpi.c b/src/H5Fmpi.c
index 8936dfc..c5368d8 100644
--- a/src/H5Fmpi.c
+++ b/src/H5Fmpi.c
@@ -221,7 +221,7 @@ H5F__set_mpi_atomicity(H5F_t *file, hbool_t flag)
HGOTO_ERROR(H5E_FILE, H5E_CANTSET, FAIL, "can't set atomicity flag");
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F__set_mpi_atomicity() */
/*-------------------------------------------------------------------------
@@ -245,7 +245,7 @@ H5Fset_mpi_atomicity(hid_t file_id, hbool_t flag)
H5VL_native_file_optional_args_t file_opt_args; /* Arguments for optional operation */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ib", file_id, flag);
/* Get the file object */
@@ -295,7 +295,7 @@ H5F__get_mpi_atomicity(const H5F_t *file, hbool_t *flag)
HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't get atomicity flag");
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F__get_mpi_atomicity() */
/*-------------------------------------------------------------------------
@@ -319,7 +319,7 @@ H5Fget_mpi_atomicity(hid_t file_id, hbool_t *flag /*out*/)
H5VL_native_file_optional_args_t file_opt_args; /* Arguments for optional operation */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ix", file_id, flag);
/* Get the file object */
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index d66c99d..40c3e99 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -380,7 +380,7 @@ H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, hbool_t initial_read)
{
status = H5FD_locate_signature(file, &super_addr);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Set superblock address to undefined on error */
if (status < 0)
diff --git a/src/H5Gbtree2.c b/src/H5Gbtree2.c
index 62e4070..e23c772 100644
--- a/src/H5Gbtree2.c
+++ b/src/H5Gbtree2.c
@@ -280,7 +280,7 @@ H5G__dense_btree2_name_encode(uint8_t *raw, const void *_nrecord, void H5_ATTR_U
FUNC_ENTER_PACKAGE_NOERR
/* Encode the record's fields */
- UINT32ENCODE(raw, nrecord->hash)
+ UINT32ENCODE(raw, nrecord->hash);
H5MM_memcpy(raw, nrecord->id, (size_t)H5G_DENSE_FHEAP_ID_LEN);
FUNC_LEAVE_NOAPI(SUCCEED)
@@ -307,7 +307,7 @@ H5G__dense_btree2_name_decode(const uint8_t *raw, void *_nrecord, void H5_ATTR_U
FUNC_ENTER_PACKAGE_NOERR
/* Decode the record's fields */
- UINT32DECODE(raw, nrecord->hash)
+ UINT32DECODE(raw, nrecord->hash);
H5MM_memcpy(nrecord->id, raw, (size_t)H5G_DENSE_FHEAP_ID_LEN);
FUNC_LEAVE_NOAPI(SUCCEED)
@@ -428,7 +428,7 @@ H5G__dense_btree2_corder_encode(uint8_t *raw, const void *_nrecord, void H5_ATTR
FUNC_ENTER_PACKAGE_NOERR
/* Encode the record's fields */
- INT64ENCODE(raw, nrecord->corder)
+ INT64ENCODE(raw, nrecord->corder);
H5MM_memcpy(raw, nrecord->id, (size_t)H5G_DENSE_FHEAP_ID_LEN);
FUNC_LEAVE_NOAPI(SUCCEED)
@@ -455,7 +455,7 @@ H5G__dense_btree2_corder_decode(const uint8_t *raw, void *_nrecord, void H5_ATTR
FUNC_ENTER_PACKAGE_NOERR
/* Decode the record's fields */
- INT64DECODE(raw, nrecord->corder)
+ INT64DECODE(raw, nrecord->corder);
H5MM_memcpy(nrecord->id, raw, (size_t)H5G_DENSE_FHEAP_ID_LEN);
FUNC_LEAVE_NOAPI(SUCCEED)
diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c
index 6075ab8..fd729e6 100644
--- a/src/H5Gdeprec.c
+++ b/src/H5Gdeprec.c
@@ -955,7 +955,7 @@ H5Gget_objinfo(hid_t loc_id, const char *name, hbool_t follow_link, H5G_stat_t *
H5VL_native_group_optional_args_t grp_opt_args; /* Arguments for optional operation */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*sbx", loc_id, name, follow_link, statbuf);
/* Check arguments */
@@ -1071,7 +1071,7 @@ done:
* location for the object */
*own_loc = H5G_OWN_NONE;
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5G__get_objinfo_cb() */
/*-------------------------------------------------------------------------
@@ -1096,7 +1096,7 @@ H5G__get_objinfo(const H5G_loc_t *loc, const char *name, hbool_t follow_link, H5
H5G_trav_goi_t udata; /* User data for callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_PACKAGE;
+ FUNC_ENTER_PACKAGE
/* Sanity checks */
HDassert(loc);
@@ -1128,7 +1128,7 @@ H5G__get_objinfo(const H5G_loc_t *loc, const char *name, hbool_t follow_link, H5
{
ret = H5L_get_info(loc, name, &linfo);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0 && linfo.type != H5L_TYPE_HARD) {
statbuf->linklen = linfo.u.val_size;
@@ -1144,7 +1144,7 @@ H5G__get_objinfo(const H5G_loc_t *loc, const char *name, hbool_t follow_link, H5
}
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5G__get_objinfo() */
/*-------------------------------------------------------------------------
diff --git a/src/H5Gent.c b/src/H5Gent.c
index 096e13e..6ca9408 100644
--- a/src/H5Gent.c
+++ b/src/H5Gent.c
@@ -329,7 +329,6 @@ H5G__ent_copy(H5G_entry_t *dst, H5G_entry_t *src, H5_copy_depth_t depth)
/* Deep copy the names */
if (depth == H5_COPY_DEEP) {
/* Nothing currently */
- ;
}
else if (depth == H5_COPY_SHALLOW) {
H5G__ent_reset(src);
diff --git a/src/H5Glink.c b/src/H5Glink.c
index fcdbca3..f3bf53e 100644
--- a/src/H5Glink.c
+++ b/src/H5Glink.c
@@ -468,7 +468,7 @@ H5G__link_iterate_table(const H5G_link_table_t *ltable, hsize_t skip, hsize_t *l
*last_lnk += skip;
/* Iterate over link messages */
- H5_CHECKED_ASSIGN(u, size_t, skip, hsize_t)
+ H5_CHECKED_ASSIGN(u, size_t, skip, hsize_t);
for (; u < ltable->nlinks && !ret_value; u++) {
/* Make the callback */
ret_value = (op)(&(ltable->lnks[u]), op_data);
diff --git a/src/H5Gname.c b/src/H5Gname.c
index ccb5253..5b72e89 100644
--- a/src/H5Gname.c
+++ b/src/H5Gname.c
@@ -917,7 +917,7 @@ H5G__name_replace_cb(void *obj_ptr, hid_t obj_id, void *key)
} /* end switch */
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5G__name_replace_cb() */
/*-------------------------------------------------------------------------
diff --git a/src/H5Gnode.c b/src/H5Gnode.c
index 2b67860..101604f 100644
--- a/src/H5Gnode.c
+++ b/src/H5Gnode.c
@@ -1300,7 +1300,7 @@ H5G__node_copy(H5F_t *f, const void H5_ATTR_UNUSED *_lt_key, haddr_t addr, const
HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, H5_ITER_ERROR, "unable to get source object name")
/* Set copied metadata tag */
- H5_BEGIN_TAG(H5AC__COPIED_TAG);
+ H5_BEGIN_TAG(H5AC__COPIED_TAG)
/* Insert the new object in the destination file's group */
/* (Don't increment the link count - that's already done above for hard links) */
diff --git a/src/H5Gtest.c b/src/H5Gtest.c
index fb78775..2299fdc 100644
--- a/src/H5Gtest.c
+++ b/src/H5Gtest.c
@@ -424,7 +424,7 @@ H5G__new_dense_info_test(hid_t gid, hsize_t *name_count, hsize_t *corder_count)
api_ctx_pushed = TRUE;
/* Set metadata tag in API context */
- H5_BEGIN_TAG(grp->oloc.addr);
+ H5_BEGIN_TAG(grp->oloc.addr)
/* Get the link info */
if (H5G__obj_get_linfo(&(grp->oloc), &linfo) < 0)
diff --git a/src/H5Gtraverse.c b/src/H5Gtraverse.c
index 1e6fe20..24a9cb8 100644
--- a/src/H5Gtraverse.c
+++ b/src/H5Gtraverse.c
@@ -829,7 +829,7 @@ H5G_traverse(const H5G_loc_t *loc, const char *name, unsigned target, H5G_traver
* shouldn't be during the traversal. Note that for best tagging assertion
* coverage, setting H5C_DO_TAGGING_SANITY_CHECKS is advised.
*/
- H5_BEGIN_TAG(H5AC__INVALID_TAG);
+ H5_BEGIN_TAG(H5AC__INVALID_TAG)
/* Go perform "real" traversal */
if (H5G__traverse_real(loc, name, target, op, op_data) < 0)
diff --git a/src/H5HFcache.c b/src/H5HFcache.c
index 3a3232b..704d55a 100644
--- a/src/H5HFcache.c
+++ b/src/H5HFcache.c
@@ -1668,7 +1668,7 @@ H5HF__cache_dblock_verify_chksum(const void *_image, size_t len, void *_udata)
computed_chksum = H5_checksum_metadata(read_buf, len, 0);
/* Restore the checksum */
- UINT32ENCODE(chk_p, stored_chksum)
+ UINT32ENCODE(chk_p, stored_chksum);
/* Verify checksum */
if (stored_chksum != computed_chksum)
diff --git a/src/H5HFdbg.c b/src/H5HFdbg.c
index ffb0b9c..63f6a70 100644
--- a/src/H5HFdbg.c
+++ b/src/H5HFdbg.c
@@ -407,11 +407,11 @@ H5HF_dblock_debug_cb(H5FS_section_info_t *_sect, void *_udata)
if (sect_start < dblock_start)
start = 0;
else
- H5_CHECKED_ASSIGN(start, size_t, (sect_start - dblock_start), hsize_t)
+ H5_CHECKED_ASSIGN(start, size_t, (sect_start - dblock_start), hsize_t);
if (sect_end > dblock_end)
- H5_CHECKED_ASSIGN(end, size_t, udata->dblock_size, hsize_t)
+ H5_CHECKED_ASSIGN(end, size_t, udata->dblock_size, hsize_t);
else
- H5_CHECKED_ASSIGN(end, size_t, ((sect_end - dblock_start) + 1), hsize_t)
+ H5_CHECKED_ASSIGN(end, size_t, ((sect_end - dblock_start) + 1), hsize_t);
/* Calculate the length */
len = end - start;
diff --git a/src/H5HFhuge.c b/src/H5HFhuge.c
index 23c3330..d4bfb21 100644
--- a/src/H5HFhuge.c
+++ b/src/H5HFhuge.c
@@ -442,7 +442,7 @@ H5HF__huge_insert(H5HF_hdr_t *hdr, size_t obj_size, void *obj, void *_id)
/* Encode ID for user */
*id++ = H5HF_ID_VERS_CURR | H5HF_ID_TYPE_HUGE;
- UINT64ENCODE_VAR(id, new_id, hdr->huge_id_size)
+ UINT64ENCODE_VAR(id, new_id, hdr->huge_id_size);
} /* end else */
/* Update statistics about heap */
@@ -520,7 +520,7 @@ H5HF__huge_get_obj_len(H5HF_hdr_t *hdr, const uint8_t *id, size_t *obj_len_p)
H5HF_huge_bt2_filt_indir_rec_t search_rec; /* Record for searching for object */
/* Get ID for looking up 'huge' object in v2 B-tree */
- UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size)
+ UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size);
/* Look up object in v2 B-tree */
if (H5B2_find(hdr->huge_bt2, &search_rec, &found, H5HF__huge_bt2_filt_indir_found, &found_rec) <
@@ -537,7 +537,7 @@ H5HF__huge_get_obj_len(H5HF_hdr_t *hdr, const uint8_t *id, size_t *obj_len_p)
H5HF_huge_bt2_indir_rec_t search_rec; /* Record for searching for object */
/* Get ID for looking up 'huge' object in v2 B-tree */
- UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size)
+ UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size);
/* Look up object in v2 B-tree */
if (H5B2_find(hdr->huge_bt2, &search_rec, &found, H5HF__huge_bt2_indir_found, &found_rec) < 0)
@@ -609,7 +609,7 @@ H5HF__huge_get_obj_off(H5HF_hdr_t *hdr, const uint8_t *id, hsize_t *obj_off_p)
H5HF_huge_bt2_filt_indir_rec_t search_rec; /* Record for searching for object */
/* Get ID for looking up 'huge' object in v2 B-tree */
- UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size)
+ UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size);
/* Look up object in v2 B-tree */
if (H5B2_find(hdr->huge_bt2, &search_rec, &found, H5HF__huge_bt2_filt_indir_found, &found_rec) <
@@ -626,7 +626,7 @@ H5HF__huge_get_obj_off(H5HF_hdr_t *hdr, const uint8_t *id, hsize_t *obj_off_p)
H5HF_huge_bt2_indir_rec_t search_rec; /* Record for searching for object */
/* Get ID for looking up 'huge' object in v2 B-tree */
- UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size)
+ UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size);
/* Look up object in v2 B-tree */
if (H5B2_find(hdr->huge_bt2, &search_rec, &found, H5HF__huge_bt2_indir_found, &found_rec) < 0)
@@ -708,7 +708,7 @@ H5HF__huge_op_real(H5HF_hdr_t *hdr, const uint8_t *id, hbool_t is_read, H5HF_ope
H5HF_huge_bt2_filt_indir_rec_t search_rec; /* Record for searching for object */
/* Get ID for looking up 'huge' object in v2 B-tree */
- UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size)
+ UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size);
/* Look up object in v2 B-tree */
if (H5B2_find(hdr->huge_bt2, &search_rec, &found, H5HF__huge_bt2_filt_indir_found, &found_rec) <
@@ -727,7 +727,7 @@ H5HF__huge_op_real(H5HF_hdr_t *hdr, const uint8_t *id, hbool_t is_read, H5HF_ope
H5HF_huge_bt2_indir_rec_t search_rec; /* Record for searching for object */
/* Get ID for looking up 'huge' object in v2 B-tree */
- UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size)
+ UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size);
/* Look up object in v2 B-tree */
if (H5B2_find(hdr->huge_bt2, &search_rec, &found, H5HF__huge_bt2_indir_found, &found_rec) < 0)
@@ -855,7 +855,7 @@ H5HF__huge_write(H5HF_hdr_t *hdr, const uint8_t *id, const void *obj)
}
/* Get ID for looking up 'huge' object in v2 B-tree */
- UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size)
+ UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size);
/* Look up object in v2 B-tree */
if (H5B2_find(hdr->huge_bt2, &search_rec, &found, H5HF__huge_bt2_indir_found, &found_rec) < 0)
@@ -1020,7 +1020,7 @@ H5HF__huge_remove(H5HF_hdr_t *hdr, const uint8_t *id)
H5HF_huge_bt2_filt_indir_rec_t search_rec; /* Record for searching for object */
/* Get ID for looking up 'huge' object in v2 B-tree */
- UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size)
+ UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size);
/* Remove the record for tracking the 'huge' object from the v2 B-tree */
/* (space in the file for the object is freed in the 'remove' callback) */
@@ -1031,7 +1031,7 @@ H5HF__huge_remove(H5HF_hdr_t *hdr, const uint8_t *id)
H5HF_huge_bt2_indir_rec_t search_rec; /* Record for searching for object */
/* Get ID for looking up 'huge' object in v2 B-tree */
- UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size)
+ UINT64DECODE_VAR(id, search_rec.id, hdr->huge_id_size);
/* Remove the record for tracking the 'huge' object from the v2 B-tree */
/* (space in the file for the object is freed in the 'remove' callback) */
diff --git a/src/H5HFpkg.h b/src/H5HFpkg.h
index 83fda1f..e036cf0 100644
--- a/src/H5HFpkg.h
+++ b/src/H5HFpkg.h
@@ -154,9 +154,11 @@
/* Decode a "managed" heap ID */
#define H5HF_MAN_ID_DECODE(i, h, f, o, l) \
- f = *(uint8_t *)i++; \
- UINT64DECODE_VAR((i), (o), (h)->heap_off_size); \
- UINT64DECODE_VAR((i), (l), (h)->heap_len_size)
+ do { \
+ f = *(uint8_t *)i++; \
+ UINT64DECODE_VAR((i), (o), (h)->heap_off_size); \
+ UINT64DECODE_VAR((i), (l), (h)->heap_len_size); \
+ } while (0)
/* Free space section types for fractal heap */
/* (values stored in free space data structures in file) */
diff --git a/src/H5HG.c b/src/H5HG.c
index 07b23a9..c6c3c8d 100644
--- a/src/H5HG.c
+++ b/src/H5HG.c
@@ -380,7 +380,7 @@ H5HG__alloc(H5F_t *f, H5HG_heap_t *heap, size_t size, unsigned *heap_flags_ptr)
ret_value = idx;
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5HG__alloc() */
/*-------------------------------------------------------------------------
@@ -823,7 +823,7 @@ done:
if (heap && H5AC_unprotect(f, H5AC_GHEAP, hobj->addr, heap, flags) < 0)
HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
- FUNC_LEAVE_NOAPI_TAG(ret_value);
+ FUNC_LEAVE_NOAPI_TAG(ret_value)
} /* end H5HG_remove() */
/*-------------------------------------------------------------------------
diff --git a/src/H5HGdbg.c b/src/H5HGdbg.c
index 9cdf47b..e2a8a90 100644
--- a/src/H5HGdbg.c
+++ b/src/H5HGdbg.c
@@ -149,5 +149,5 @@ done:
if (h && H5AC_unprotect(f, H5AC_GHEAP, addr, h, H5AC__NO_FLAGS_SET) < 0)
HDONE_ERROR(H5E_HEAP, H5E_PROTECT, FAIL, "unable to release object header");
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5HG_debug() */
diff --git a/src/H5HLcache.c b/src/H5HLcache.c
index bdce190..fcf93d1 100644
--- a/src/H5HLcache.c
+++ b/src/H5HLcache.c
@@ -298,11 +298,11 @@ H5HL__fl_serialize(const H5HL_t *heap)
image = heap->dblk_image + fl->offset;
if (fl->next)
- H5_ENCODE_LENGTH_LEN(image, fl->next->offset, heap->sizeof_size)
+ H5_ENCODE_LENGTH_LEN(image, fl->next->offset, heap->sizeof_size);
else
- H5_ENCODE_LENGTH_LEN(image, H5HL_FREE_NULL, heap->sizeof_size)
+ H5_ENCODE_LENGTH_LEN(image, H5HL_FREE_NULL, heap->sizeof_size);
- H5_ENCODE_LENGTH_LEN(image, fl->size, heap->sizeof_size)
+ H5_ENCODE_LENGTH_LEN(image, fl->size, heap->sizeof_size);
}
FUNC_LEAVE_NOAPI_VOID
diff --git a/src/H5HLdblk.c b/src/H5HLdblk.c
index 6a938f4..73aa9b6 100644
--- a/src/H5HLdblk.c
+++ b/src/H5HLdblk.c
@@ -112,7 +112,7 @@ done:
/* H5FL_FREE always returns NULL so we can't check for errors */
dblk = H5FL_FREE(H5HL_dblk_t, dblk);
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5HL__dblk_new() */
/*-------------------------------------------------------------------------
diff --git a/src/H5Iint.c b/src/H5Iint.c
index 8a6b7ae..6bf32d7 100644
--- a/src/H5Iint.c
+++ b/src/H5Iint.c
@@ -480,9 +480,9 @@ H5I__destroy_type(H5I_type_t type)
}
H5E_END_TRY /* don't care about errors */
- /* Check if we should release the ID class */
- if (type_info->cls->flags & H5I_CLASS_IS_APPLICATION)
- type_info->cls = H5MM_xfree_const(type_info->cls);
+ /* Check if we should release the ID class */
+ if (type_info->cls->flags & H5I_CLASS_IS_APPLICATION)
+ type_info->cls = H5MM_xfree_const(type_info->cls);
HASH_CLEAR(hh, type_info->hash_table);
type_info->hash_table = NULL;
@@ -827,7 +827,7 @@ H5I_is_file_object(hid_t id)
H5I_type_t type = H5I_get_type(id);
htri_t ret_value = FAIL;
- FUNC_ENTER_NOAPI(FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
/* Fail if the ID type is out of range */
if (type < 1 || type >= H5I_NTYPES)
@@ -851,7 +851,7 @@ H5I_is_file_object(hid_t id)
ret_value = FALSE;
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* H5I_is_file_object() */
/*-------------------------------------------------------------------------
diff --git a/src/H5O.c b/src/H5O.c
index c92f4ae..f782152 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -2093,7 +2093,7 @@ H5O__disable_mdc_flushes(H5O_loc_t *oloc)
HGOTO_ERROR(H5E_OHDR, H5E_CANTCORK, FAIL, "unable to cork object");
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* H5O__disable_mdc_flushes() */
/*-------------------------------------------------------------------------
@@ -2118,7 +2118,7 @@ H5Odisable_mdc_flushes(hid_t object_id)
H5VL_loc_params_t loc_params; /* Location parameters */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", object_id);
/* Make sure the ID is a file object */
@@ -2166,7 +2166,7 @@ H5O__enable_mdc_flushes(H5O_loc_t *oloc)
HGOTO_ERROR(H5E_OHDR, H5E_CANTUNCORK, FAIL, "unable to uncork object");
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* H5O__enable_mdc_flushes() */
/*-------------------------------------------------------------------------
@@ -2191,7 +2191,7 @@ H5Oenable_mdc_flushes(hid_t object_id)
H5VL_loc_params_t loc_params; /* Location parameters */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", object_id);
/* Make sure the ID is a file object */
@@ -2270,7 +2270,7 @@ H5Oare_mdc_flushes_disabled(hid_t object_id, hbool_t *are_disabled)
H5VL_loc_params_t loc_params; /* Location parameters */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*b", object_id, are_disabled);
/* Sanity check */
diff --git a/src/H5Oainfo.c b/src/H5Oainfo.c
index 6d0261d..b5e21ef 100644
--- a/src/H5Oainfo.c
+++ b/src/H5Oainfo.c
@@ -131,7 +131,7 @@ H5O__ainfo_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNUS
if (ainfo->track_corder) {
if (H5_IS_BUFFER_OVERFLOW(p, 2, p_end))
HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL, "ran off end of input buffer while decoding");
- UINT16DECODE(p, ainfo->max_crt_idx)
+ UINT16DECODE(p, ainfo->max_crt_idx);
}
else
ainfo->max_crt_idx = H5O_MAX_CRT_ORDER_IDX;
@@ -428,7 +428,7 @@ H5O__ainfo_copy_file(H5F_t H5_ATTR_NDEBUG_UNUSED *file_src, void *mesg_src, H5F_
/* Prepare to copy dense attributes - actual copy in post_copy */
/* Set copied metadata tag */
- H5_BEGIN_TAG(H5AC__COPIED_TAG);
+ H5_BEGIN_TAG(H5AC__COPIED_TAG)
if (H5A__dense_create(file_dst, ainfo_dst) < 0)
HGOTO_ERROR_TAG(H5E_OHDR, H5E_CANTINIT, NULL, "unable to create dense storage for attributes")
diff --git a/src/H5Oattr.c b/src/H5Oattr.c
index 1d48a78..20eeae3 100644
--- a/src/H5Oattr.c
+++ b/src/H5Oattr.c
@@ -408,7 +408,7 @@ H5O__attr_encode(H5F_t *f, uint8_t *p, const void *mesg)
HDmemset(p, 0, attr->shared->data_size);
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5O__attr_encode() */
/*--------------------------------------------------------------------------
diff --git a/src/H5Ocache.c b/src/H5Ocache.c
index da200b0..48de673 100644
--- a/src/H5Ocache.c
+++ b/src/H5Ocache.c
@@ -456,7 +456,7 @@ H5O__cache_serialize(const H5F_t *f, void *image, size_t len, void *_thing)
/* Number of messages */
#ifdef H5O_ENABLE_BAD_MESG_COUNT
if (oh->store_bad_mesg_count)
- UINT16ENCODE(chunk_image, (oh->nmesgs - 1))
+ UINT16ENCODE(chunk_image, (oh->nmesgs - 1));
else
#endif /* H5O_ENABLE_BAD_MESG_COUNT */
UINT16ENCODE(chunk_image, oh->nmesgs);
@@ -1269,7 +1269,7 @@ H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t chunk_size, const uint8_t
if (oh->version == H5O_VERSION_1) {
if (H5_IS_BUFFER_OVERFLOW(chunk_image, 2, p_end))
HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, FAIL, "ran off end of input buffer while decoding");
- UINT16DECODE(chunk_image, id)
+ UINT16DECODE(chunk_image, id);
}
else {
if (H5_IS_BUFFER_OVERFLOW(chunk_image, 1, p_end))
diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c
index 8d39800..9da56c7 100644
--- a/src/H5Ocopy.c
+++ b/src/H5Ocopy.c
@@ -745,7 +745,7 @@ H5O__copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/, H5
HGOTO_ERROR(H5E_CACHE, H5E_CANTTAG, FAIL, "unable to re-tag metadata entries")
/* Set metadata tag for destination object's object header */
- H5_BEGIN_TAG(oloc_dst->addr);
+ H5_BEGIN_TAG(oloc_dst->addr)
/* Insert destination object header in cache */
if (H5AC_insert_entry(oloc_dst->file, H5AC_OHDR, oloc_dst->addr, oh_dst, H5AC__NO_FLAGS_SET) < 0)
diff --git a/src/H5Odeprec.c b/src/H5Odeprec.c
index 01cd580..81d3b38 100644
--- a/src/H5Odeprec.c
+++ b/src/H5Odeprec.c
@@ -91,14 +91,14 @@ static herr_t H5O__get_info_old(H5VL_object_t *vol_obj, H5VL_loc_params_t *loc_p
static herr_t
H5O__reset_info1(H5O_info1_t *oinfo)
{
- FUNC_ENTER_PACKAGE_NOERR;
+ FUNC_ENTER_PACKAGE_NOERR
/* Reset the passed-in info struct */
HDmemset(oinfo, 0, sizeof(H5O_info1_t));
oinfo->type = H5O_TYPE_UNKNOWN;
oinfo->addr = HADDR_UNDEF;
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5O__reset_info1() */
/*-------------------------------------------------------------------------
@@ -201,7 +201,7 @@ H5O__iterate1_adapter(hid_t obj_id, const char *name, const H5O_info2_t *oinfo2,
ret_value = (shim_data->real_op)(obj_id, name, &oinfo, shim_data->real_op_data);
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5O__iterate1_adapter() */
/*-------------------------------------------------------------------------
diff --git a/src/H5Odtype.c b/src/H5Odtype.c
index cab2eb2..db9dde5 100644
--- a/src/H5Odtype.c
+++ b/src/H5Odtype.c
@@ -384,13 +384,13 @@ H5O__dtype_decode_helper(unsigned *ioflags /*in,out*/, const uint8_t **pp, H5T_t
HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, FAIL,
"ran off end of input buffer while decoding");
UINT32DECODE_VAR(*pp, dt->shared->u.compnd.memb[dt->shared->u.compnd.nmembs].offset,
- offset_nbytes)
+ offset_nbytes);
}
else {
if (H5_IS_KNOWN_BUFFER_OVERFLOW(skip, *pp, 4, p_end))
HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, FAIL,
"ran off end of input buffer while decoding");
- UINT32DECODE(*pp, dt->shared->u.compnd.memb[dt->shared->u.compnd.nmembs].offset)
+ UINT32DECODE(*pp, dt->shared->u.compnd.memb[dt->shared->u.compnd.nmembs].offset);
}
/* Older versions of the library allowed a field to have
@@ -1141,9 +1141,9 @@ H5O__dtype_encode_helper(uint8_t **pp, const H5T_t *dt)
/* Member offset */
/* (starting with version 3 of the datatype message, use the minimum # of bytes required) */
if (dt->shared->version >= H5O_DTYPE_VERSION_3)
- UINT32ENCODE_VAR(*pp, (uint32_t)dt->shared->u.compnd.memb[i].offset, offset_nbytes)
+ UINT32ENCODE_VAR(*pp, (uint32_t)dt->shared->u.compnd.memb[i].offset, offset_nbytes);
else
- UINT32ENCODE(*pp, dt->shared->u.compnd.memb[i].offset)
+ UINT32ENCODE(*pp, dt->shared->u.compnd.memb[i].offset);
/* If we don't have any array fields, write out the old style
* member information, for better backward compatibility
diff --git a/src/H5Oflush.c b/src/H5Oflush.c
index 2348673..d7eb68c 100644
--- a/src/H5Oflush.c
+++ b/src/H5Oflush.c
@@ -269,7 +269,7 @@ done:
if (objs_incr && file)
H5F_decr_nopen_objs(file);
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5O_refresh_metadata() */
/*-------------------------------------------------------------------------
@@ -344,7 +344,7 @@ H5O__refresh_metadata_close(H5O_loc_t *oloc, H5G_loc_t *obj_loc, hid_t oid)
HGOTO_ERROR(H5E_OHDR, H5E_SYSTEM, FAIL, "unable to cork the object")
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5O__refresh_metadata_close() */
/*-------------------------------------------------------------------------
@@ -434,5 +434,5 @@ H5O_refresh_metadata_reopen(hid_t oid, hid_t apl_id, H5G_loc_t *obj_loc, H5VL_t
HGOTO_ERROR(H5E_OHDR, H5E_CANTREGISTER, FAIL, "unable to re-register object ID after refresh")
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5O_refresh_metadata_reopen() */
diff --git a/src/H5Oginfo.c b/src/H5Oginfo.c
index df45e53..59121c9 100644
--- a/src/H5Oginfo.c
+++ b/src/H5Oginfo.c
@@ -118,8 +118,8 @@ H5O__ginfo_decode(H5F_t H5_ATTR_UNUSED *f, H5O_t H5_ATTR_UNUSED *open_oh, unsign
if (ginfo->store_link_phase_change) {
if (H5_IS_BUFFER_OVERFLOW(p, 2 * 2, p_end))
HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL, "ran off end of input buffer while decoding")
- UINT16DECODE(p, ginfo->max_compact)
- UINT16DECODE(p, ginfo->min_dense)
+ UINT16DECODE(p, ginfo->max_compact);
+ UINT16DECODE(p, ginfo->min_dense);
}
else {
ginfo->max_compact = H5G_CRT_GINFO_MAX_COMPACT;
@@ -130,8 +130,8 @@ H5O__ginfo_decode(H5F_t H5_ATTR_UNUSED *f, H5O_t H5_ATTR_UNUSED *open_oh, unsign
if (ginfo->store_est_entry_info) {
if (H5_IS_BUFFER_OVERFLOW(p, 2 * 2, p_end))
HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL, "ran off end of input buffer while decoding")
- UINT16DECODE(p, ginfo->est_num_entries)
- UINT16DECODE(p, ginfo->est_name_len)
+ UINT16DECODE(p, ginfo->est_num_entries);
+ UINT16DECODE(p, ginfo->est_name_len);
}
else {
ginfo->est_num_entries = H5G_CRT_GINFO_EST_NUM_ENTRIES;
@@ -183,14 +183,14 @@ H5O__ginfo_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared
/* Store the max. # of links to store compactly & the min. # of links to store densely */
if (ginfo->store_link_phase_change) {
- UINT16ENCODE(p, ginfo->max_compact)
- UINT16ENCODE(p, ginfo->min_dense)
+ UINT16ENCODE(p, ginfo->max_compact);
+ UINT16ENCODE(p, ginfo->min_dense);
} /* end if */
/* Estimated # of entries & name lengths */
if (ginfo->store_est_entry_info) {
- UINT16ENCODE(p, ginfo->est_num_entries)
- UINT16ENCODE(p, ginfo->est_name_len)
+ UINT16ENCODE(p, ginfo->est_num_entries);
+ UINT16ENCODE(p, ginfo->est_name_len);
} /* end if */
FUNC_LEAVE_NOAPI(SUCCEED)
diff --git a/src/H5Oint.c b/src/H5Oint.c
index 621b5a0..f262545 100644
--- a/src/H5Oint.c
+++ b/src/H5Oint.c
@@ -517,7 +517,7 @@ H5O_apply_ohdr(H5F_t *f, H5O_t *oh, hid_t ocpl_id, size_t size_hint, size_t init
}
/* Set metadata tag in API context */
- H5_BEGIN_TAG(oh_addr);
+ H5_BEGIN_TAG(oh_addr)
/* Cache object header */
if (H5AC_insert_entry(f, H5AC_OHDR, oh_addr, oh, insert_flags) < 0)
@@ -537,7 +537,7 @@ H5O_apply_ohdr(H5F_t *f, H5O_t *oh, hid_t ocpl_id, size_t size_hint, size_t init
HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open object header")
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* H5O_apply_ohdr() */
/*-------------------------------------------------------------------------
@@ -2521,7 +2521,7 @@ H5O_get_oh_flags(const H5O_t *oh)
{
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(oh);
- FUNC_LEAVE_NOAPI(oh->flags); /* flags can be 0 */
+ FUNC_LEAVE_NOAPI(oh->flags) /* flags can be 0 */
} /* H5O_get_oh_flags() */
/*-------------------------------------------------------------------------
@@ -2542,7 +2542,7 @@ H5O_get_oh_mtime(const H5O_t *oh)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(oh);
HDassert(oh->mtime);
- FUNC_LEAVE_NOAPI(oh->mtime);
+ FUNC_LEAVE_NOAPI(oh->mtime)
} /* H5O_get_oh_mtime() */
/*-------------------------------------------------------------------------
@@ -2559,7 +2559,7 @@ H5O_get_oh_version(const H5O_t *oh)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(oh);
HDassert(oh->version);
- FUNC_LEAVE_NOAPI(oh->version);
+ FUNC_LEAVE_NOAPI(oh->version)
} /* H5O_get_oh_version() */
/*-------------------------------------------------------------------------
@@ -3085,12 +3085,12 @@ done:
static herr_t
H5O__reset_info2(H5O_info2_t *oinfo)
{
- FUNC_ENTER_PACKAGE_NOERR;
+ FUNC_ENTER_PACKAGE_NOERR
/* Reset the passed-in info struct */
HDmemset(oinfo, 0, sizeof(H5O_info2_t));
oinfo->type = H5O_TYPE_UNKNOWN;
oinfo->token = H5O_TOKEN_UNDEF;
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5O__reset_info2() */
diff --git a/src/H5Olayout.c b/src/H5Olayout.c
index cfe1e63..e24bfc4 100644
--- a/src/H5Olayout.c
+++ b/src/H5Olayout.c
@@ -578,7 +578,7 @@ H5O__layout_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNU
if (H5_IS_BUFFER_OVERFLOW(heap_block_p, H5F_sizeof_size(f), heap_block_p_end))
HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL,
"ran off end of input buffer while decoding")
- H5F_DECODE_LENGTH(f, heap_block_p, tmp_hsize)
+ H5F_DECODE_LENGTH(f, heap_block_p, tmp_hsize);
/* Allocate entry list */
if (NULL == (mesg->storage.u.virt.list = (H5O_storage_virtual_ent_t *)H5MM_calloc(
@@ -728,7 +728,7 @@ H5O__layout_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNU
if (H5_IS_BUFFER_OVERFLOW(heap_block_p, 4, heap_block_p_end))
HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL,
"ran off end of input buffer while decoding")
- UINT32DECODE(heap_block_p, stored_chksum)
+ UINT32DECODE(heap_block_p, stored_chksum);
/* Compute checksum */
computed_chksum = H5_checksum_metadata(heap_block, block_size - (size_t)4, 0);
diff --git a/src/H5Olinfo.c b/src/H5Olinfo.c
index e091ee6..0330f21 100644
--- a/src/H5Olinfo.c
+++ b/src/H5Olinfo.c
@@ -138,7 +138,7 @@ H5O__linfo_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNUS
if (linfo->track_corder) {
if (H5_IS_BUFFER_OVERFLOW(p, 8, p_end))
HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL, "ran off end of input buffer while decoding")
- INT64DECODE(p, linfo->max_corder)
+ INT64DECODE(p, linfo->max_corder);
}
else
linfo->max_corder = 0;
@@ -208,7 +208,7 @@ H5O__linfo_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, c
/* Max. link creation order value for the group, if tracked */
if (linfo->track_corder)
- INT64ENCODE(p, linfo->max_corder)
+ INT64ENCODE(p, linfo->max_corder);
/* Address of fractal heap to store "dense" links */
H5F_addr_encode(f, &p, linfo->fheap_addr);
@@ -458,7 +458,7 @@ H5O__linfo_post_copy_file_cb(const H5O_link_t *src_lnk, void *_udata)
dst_lnk_init = TRUE;
/* Set metadata tag in API context */
- H5_BEGIN_TAG(H5AC__COPIED_TAG);
+ H5_BEGIN_TAG(H5AC__COPIED_TAG)
/* Insert the new object in the destination file's group */
/* (Doesn't increment the link count - that's already been taken care of for hard links) */
diff --git a/src/H5Olink.c b/src/H5Olink.c
index 2c48af1..b4c34de 100644
--- a/src/H5Olink.c
+++ b/src/H5Olink.c
@@ -149,7 +149,7 @@ H5O__link_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNUSE
if (link_flags & H5O_LINK_STORE_CORDER) {
if (H5_IS_BUFFER_OVERFLOW(p, 8, p_end))
HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL, "ran off end of input buffer while decoding")
- INT64DECODE(p, lnk->corder)
+ INT64DECODE(p, lnk->corder);
lnk->corder_valid = TRUE;
}
else {
@@ -223,7 +223,7 @@ H5O__link_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNUSE
/* Get the link value */
if (H5_IS_BUFFER_OVERFLOW(p, 2, p_end))
HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL, "ran off end of input buffer while decoding")
- UINT16DECODE(p, len)
+ UINT16DECODE(p, len);
if (len == 0)
HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "invalid link length")
@@ -247,7 +247,7 @@ H5O__link_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNUSE
/* A UD link. Get the user-supplied data */
if (H5_IS_BUFFER_OVERFLOW(p, 2, p_end))
HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL, "ran off end of input buffer while decoding")
- UINT16DECODE(p, len)
+ UINT16DECODE(p, len);
if (lnk->type == H5L_TYPE_EXTERNAL && len < 3)
HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL, "external link information length < 3")
lnk->u.ud.size = len;
@@ -332,7 +332,7 @@ H5O__link_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, co
/* Store the link creation order in the file, if its valid */
if (lnk->corder_valid)
- INT64ENCODE(p, lnk->corder)
+ INT64ENCODE(p, lnk->corder);
/* Store a non-default link name character set */
if (link_flags & H5O_LINK_STORE_NAME_CSET)
@@ -375,7 +375,7 @@ H5O__link_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, co
/* Store the link value */
len = (uint16_t)HDstrlen(lnk->u.soft.name);
HDassert(len > 0);
- UINT16ENCODE(p, len)
+ UINT16ENCODE(p, len);
H5MM_memcpy(p, lnk->u.soft.name, (size_t)len);
p += len;
break;
@@ -389,7 +389,7 @@ H5O__link_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, co
/* Store the user-supplied data, however long it is */
len = (uint16_t)lnk->u.ud.size;
- UINT16ENCODE(p, len)
+ UINT16ENCODE(p, len);
if (len > 0) {
H5MM_memcpy(p, lnk->u.ud.udata, (size_t)len);
p += len;
diff --git a/src/H5Omessage.c b/src/H5Omessage.c
index 1c25d44..8dd8526 100644
--- a/src/H5Omessage.c
+++ b/src/H5Omessage.c
@@ -2047,7 +2047,7 @@ H5O_msg_flush(H5F_t *f, H5O_t *oh, H5O_mesg_t *mesg)
/* Encode the message prefix */
if (oh->version == H5O_VERSION_1)
- UINT16ENCODE(p, msg_id)
+ UINT16ENCODE(p, msg_id);
else
*p++ = (uint8_t)msg_id;
HDassert(mesg->raw_size < H5O_MESG_MAX_SIZE);
diff --git a/src/H5Opline.c b/src/H5Opline.c
index 711a67b..a40f027 100644
--- a/src/H5Opline.c
+++ b/src/H5Opline.c
@@ -229,7 +229,7 @@ H5O__pline_decode(H5F_t H5_ATTR_UNUSED *f, H5O_t H5_ATTR_UNUSED *open_oh, unsign
for (size_t j = 0; j < filter->cd_nelmts; j++) {
if (H5_IS_BUFFER_OVERFLOW(p, 4, p_end))
HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL, "ran off end of input buffer while decoding")
- UINT32DECODE(p, filter->cd_values[j])
+ UINT32DECODE(p, filter->cd_values[j]);
}
if (pline->version == H5O_PLINE_VERSION_1)
diff --git a/src/H5Orefcount.c b/src/H5Orefcount.c
index f4d3b5c..da36551 100644
--- a/src/H5Orefcount.c
+++ b/src/H5Orefcount.c
@@ -104,7 +104,7 @@ H5O__refcount_decode(H5F_t H5_ATTR_UNUSED *f, H5O_t H5_ATTR_UNUSED *open_oh,
/* Get reference count for object */
if (H5_IS_BUFFER_OVERFLOW(p, 4, p_end))
HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL, "ran off end of input buffer while decoding")
- UINT32DECODE(p, *refcount)
+ UINT32DECODE(p, *refcount);
/* Set return value */
ret_value = refcount;
diff --git a/src/H5Oshared.c b/src/H5Oshared.c
index 22d71a0..a6af84e 100644
--- a/src/H5Oshared.c
+++ b/src/H5Oshared.c
@@ -602,7 +602,7 @@ H5O__shared_copy_file(H5F_t H5_ATTR_NDEBUG_UNUSED *file_src, H5F_t *file_dst,
if (shared_src->type != H5O_SHARE_TYPE_COMMITTED) {
/* Simulate trying to share new message in the destination file. */
/* Set copied metadata tag */
- H5_BEGIN_TAG(H5AC__COPIED_TAG);
+ H5_BEGIN_TAG(H5AC__COPIED_TAG)
if (H5SM_try_share(file_dst, NULL, H5SM_DEFER, mesg_type->id, _native_dst, mesg_flags) < 0)
HGOTO_ERROR_TAG(H5E_OHDR, H5E_WRITEERROR, FAIL, "unable to determine if message should be shared")
diff --git a/src/H5Ostab.c b/src/H5Ostab.c
index 4a94485..3b7417d 100644
--- a/src/H5Ostab.c
+++ b/src/H5Ostab.c
@@ -307,7 +307,7 @@ H5O__stab_copy_file(H5F_t *file_src, void *native_src, H5F_t *file_dst,
HGOTO_ERROR(H5E_SYM, H5E_CANTGETSIZE, NULL, "can't query local heap size")
/* Set copy metadata tag */
- H5_BEGIN_TAG(H5AC__COPIED_TAG);
+ H5_BEGIN_TAG(H5AC__COPIED_TAG)
/* Create components of symbol table message */
if (H5G__stab_create_components(file_dst, stab_dst, size_hint) < 0)
diff --git a/src/H5Otest.c b/src/H5Otest.c
index 687d7c6..f3e6745 100644
--- a/src/H5Otest.c
+++ b/src/H5Otest.c
@@ -197,7 +197,7 @@ H5O__is_attr_empty_test(hid_t oid)
HDassert(nattrs == 0);
/* Set metadata tag in API context */
- H5_BEGIN_TAG(loc->addr);
+ H5_BEGIN_TAG(loc->addr)
/* Open the name index v2 B-tree */
if (NULL == (bt2_name = H5B2_open(loc->file, ainfo.name_bt2_addr, NULL)))
@@ -299,7 +299,7 @@ H5O__num_attrs_test(hid_t oid, hsize_t *nattrs)
HDassert(obj_nattrs == 0);
/* Set metadata tag in API context */
- H5_BEGIN_TAG(loc->addr);
+ H5_BEGIN_TAG(loc->addr)
/* Open the name index v2 B-tree */
if (NULL == (bt2_name = H5B2_open(loc->file, ainfo.name_bt2_addr, NULL)))
@@ -376,7 +376,7 @@ H5O__attr_dense_info_test(hid_t oid, hsize_t *name_count, hsize_t *corder_count)
api_ctx_pushed = TRUE;
/* Set metadata tag in API context */
- H5_BEGIN_TAG(loc->addr);
+ H5_BEGIN_TAG(loc->addr)
/* Get the object header */
if (NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
diff --git a/src/H5PLpath.c b/src/H5PLpath.c
index 9619b13..965479f 100644
--- a/src/H5PLpath.c
+++ b/src/H5PLpath.c
@@ -579,7 +579,7 @@ H5PL__path_table_iterate(H5PL_iterate_type_t iter_type, H5PL_iterate_t iter_op,
}
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5PL__path_table_iterate() */
/*-------------------------------------------------------------------------
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c
index 298baa5..2e814d3 100644
--- a/src/H5Pdcpl.c
+++ b/src/H5Pdcpl.c
@@ -460,7 +460,7 @@ H5P__dcrt_layout_enc(const void *value, void **_pp, size_t *size)
/* Encode chunk dims */
HDcompile_assert(sizeof(uint32_t) == sizeof(layout->u.chunk.dim[0]));
for (u = 0; u < (size_t)layout->u.chunk.ndims; u++) {
- UINT32ENCODE(*pp, layout->u.chunk.dim[u])
+ UINT32ENCODE(*pp, layout->u.chunk.dim[u]);
*size += sizeof(uint32_t);
} /* end for */
} /* end if */
@@ -468,7 +468,7 @@ H5P__dcrt_layout_enc(const void *value, void **_pp, size_t *size)
uint64_t nentries = (uint64_t)layout->storage.u.virt.list_nused;
/* Encode number of entries */
- UINT64ENCODE(*pp, nentries)
+ UINT64ENCODE(*pp, nentries);
*size += (size_t)8;
/* Iterate over entries */
@@ -613,7 +613,7 @@ H5P__dcrt_layout_dec(const void **_pp, void *value)
/* Set rank & dimensions */
tmp_layout.u.chunk.ndims = (unsigned)ndims;
for (u = 0; u < ndims; u++)
- UINT32DECODE(*pp, tmp_layout.u.chunk.dim[u])
+ UINT32DECODE(*pp, tmp_layout.u.chunk.dim[u]);
/* Point at the newly set up struct */
layout = &tmp_layout;
@@ -624,7 +624,7 @@ H5P__dcrt_layout_dec(const void **_pp, void *value)
uint64_t nentries; /* Number of VDS mappings */
/* Decode number of entries */
- UINT64DECODE(*pp, nentries)
+ UINT64DECODE(*pp, nentries);
if (nentries == (uint64_t)0)
/* Just use the default struct */
@@ -1093,7 +1093,7 @@ H5P__dcrt_fill_value_enc(const void *value, void **_pp, size_t *size)
*(*pp)++ = (uint8_t)fill->fill_time;
/* Encode size of fill value */
- INT64ENCODE(*pp, fill->size)
+ INT64ENCODE(*pp, fill->size);
/* Encode the fill value & datatype */
if (fill->size > 0) {
@@ -1183,7 +1183,7 @@ H5P__dcrt_fill_value_dec(const void **_pp, void *_value)
fill->fill_time = (H5D_fill_time_t) * (*pp)++;
/* Decode fill size */
- INT64DECODE(*pp, fill->size)
+ INT64DECODE(*pp, fill->size);
/* Check if there's a fill value */
if (fill->size > 0) {
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c
index ec033c1..2ad8b02 100644
--- a/src/H5Pdxpl.c
+++ b/src/H5Pdxpl.c
@@ -587,15 +587,15 @@ H5P__dxfr_btree_split_ratio_enc(const void *value, void **_pp, size_t *size)
*(*pp)++ = (uint8_t)sizeof(double);
/* Encode the left split value */
- H5_ENCODE_DOUBLE(*pp, *(const double *)btree_split_ratio)
+ H5_ENCODE_DOUBLE(*pp, *(const double *)btree_split_ratio);
btree_split_ratio++;
/* Encode the middle split value */
- H5_ENCODE_DOUBLE(*pp, *(const double *)btree_split_ratio)
+ H5_ENCODE_DOUBLE(*pp, *(const double *)btree_split_ratio);
btree_split_ratio++;
/* Encode the right split value */
- H5_ENCODE_DOUBLE(*pp, *(const double *)btree_split_ratio)
+ H5_ENCODE_DOUBLE(*pp, *(const double *)btree_split_ratio);
} /* end if */
/* Size of B-tree split ratio values */
@@ -640,9 +640,9 @@ H5P__dxfr_btree_split_ratio_dec(const void **_pp, void *_value)
HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "double value can't be decoded")
/* Decode the left, middle & left B-tree split ratios */
- H5_DECODE_DOUBLE(*pp, btree_split_ratio[0])
- H5_DECODE_DOUBLE(*pp, btree_split_ratio[1])
- H5_DECODE_DOUBLE(*pp, btree_split_ratio[2])
+ H5_DECODE_DOUBLE(*pp, btree_split_ratio[0]);
+ H5_DECODE_DOUBLE(*pp, btree_split_ratio[1]);
+ H5_DECODE_DOUBLE(*pp, btree_split_ratio[2]);
done:
FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Pencdec.c b/src/H5Pencdec.c
index 2ee02c8..ebfa567 100644
--- a/src/H5Pencdec.c
+++ b/src/H5Pencdec.c
@@ -176,7 +176,7 @@ H5P__encode_unsigned(const void *value, void **_pp, size_t *size)
*(*pp)++ = (uint8_t)sizeof(unsigned);
/* Encode the value */
- H5_ENCODE_UNSIGNED(*pp, *(const unsigned *)value)
+ H5_ENCODE_UNSIGNED(*pp, *(const unsigned *)value);
} /* end if */
/* Set size needed for encoding */
@@ -283,7 +283,7 @@ H5P__encode_double(const void *value, void **_pp, size_t *size)
*(*pp)++ = (uint8_t)sizeof(double);
/* Encode the value */
- H5_ENCODE_DOUBLE(*pp, *(const double *)value)
+ H5_ENCODE_DOUBLE(*pp, *(const double *)value);
} /* end if */
/* Set size needed for encoding */
@@ -538,7 +538,7 @@ H5P__decode_unsigned(const void **_pp, void *_value)
if (enc_size != sizeof(unsigned))
HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "unsigned value can't be decoded")
- H5_DECODE_UNSIGNED(*pp, *value)
+ H5_DECODE_UNSIGNED(*pp, *value);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -643,7 +643,7 @@ H5P__decode_double(const void **_pp, void *_value)
if (enc_size != sizeof(double))
HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "double value can't be decoded")
- H5_DECODE_DOUBLE(*pp, *value)
+ H5_DECODE_DOUBLE(*pp, *value);
done:
FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Pfcpl.c b/src/H5Pfcpl.c
index f5d0db4..aa06240 100644
--- a/src/H5Pfcpl.c
+++ b/src/H5Pfcpl.c
@@ -712,7 +712,7 @@ H5P__fcrt_btree_rank_enc(const void *value, void **_pp, size_t *size)
/* Encode all the btree */
for (u = 0; u < H5B_NUM_BTREE_ID; u++) {
/* Encode the left split value */
- H5_ENCODE_UNSIGNED(*pp, *(const unsigned *)btree_k)
+ H5_ENCODE_UNSIGNED(*pp, *(const unsigned *)btree_k);
btree_k++;
} /* end for */
} /* end if */
@@ -760,7 +760,7 @@ H5P__fcrt_btree_rank_dec(const void **_pp, void *_value)
/* Decode all the type flags */
for (u = 0; u < H5B_NUM_BTREE_ID; u++)
- H5_DECODE_UNSIGNED(*pp, btree_k[u])
+ H5_DECODE_UNSIGNED(*pp, btree_k[u]);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -999,7 +999,7 @@ H5P__fcrt_shmsg_index_types_enc(const void *value, void **_pp, size_t *size)
/* Encode all the type flags */
for (u = 0; u < H5O_SHMESG_MAX_NINDEXES; u++) {
/* Encode the left split value */
- H5_ENCODE_UNSIGNED(*pp, *(const unsigned *)type_flags)
+ H5_ENCODE_UNSIGNED(*pp, *(const unsigned *)type_flags);
type_flags++;
} /* end for */
} /* end if */
@@ -1048,7 +1048,7 @@ H5P__fcrt_shmsg_index_types_dec(const void **_pp, void *_value)
/* Decode all the type flags */
for (u = 0; u < H5O_SHMESG_MAX_NINDEXES; u++)
- H5_DECODE_UNSIGNED(*pp, type_flags[u])
+ H5_DECODE_UNSIGNED(*pp, type_flags[u]);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -1090,7 +1090,7 @@ H5P__fcrt_shmsg_index_minsize_enc(const void *value, void **_pp, size_t *size)
/* Encode all the minsize values */
for (u = 0; u < H5O_SHMESG_MAX_NINDEXES; u++) {
/* Encode the left split value */
- H5_ENCODE_UNSIGNED(*pp, *(const unsigned *)minsizes)
+ H5_ENCODE_UNSIGNED(*pp, *(const unsigned *)minsizes);
minsizes++;
} /* end for */
} /* end if */
@@ -1139,7 +1139,7 @@ H5P__fcrt_shmsg_index_minsize_dec(const void **_pp, void *_value)
/* Decode all the minsize values */
for (u = 0; u < H5O_SHMESG_MAX_NINDEXES; u++)
- H5_DECODE_UNSIGNED(*pp, minsizes[u])
+ H5_DECODE_UNSIGNED(*pp, minsizes[u]);
done:
FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Pgcpl.c b/src/H5Pgcpl.c
index 0fd3a68..15099a6 100644
--- a/src/H5Pgcpl.c
+++ b/src/H5Pgcpl.c
@@ -534,11 +534,11 @@ H5P__gcrt_group_info_enc(const void *value, void **_pp, size_t *size)
FUNC_ENTER_PACKAGE_NOERR
if (NULL != *pp) {
- UINT32ENCODE(*pp, ginfo->lheap_size_hint)
- UINT16ENCODE(*pp, ginfo->max_compact)
- UINT16ENCODE(*pp, ginfo->min_dense)
- UINT16ENCODE(*pp, ginfo->est_num_entries)
- UINT16ENCODE(*pp, ginfo->est_name_len)
+ UINT32ENCODE(*pp, ginfo->lheap_size_hint);
+ UINT16ENCODE(*pp, ginfo->max_compact);
+ UINT16ENCODE(*pp, ginfo->min_dense);
+ UINT16ENCODE(*pp, ginfo->est_num_entries);
+ UINT16ENCODE(*pp, ginfo->est_name_len);
} /* end if */
*size += sizeof(uint16_t) * 4 + sizeof(uint32_t);
@@ -574,11 +574,11 @@ H5P__gcrt_group_info_dec(const void **_pp, void *_value)
HDmemset(ginfo, 0, sizeof(H5O_ginfo_t));
*ginfo = H5G_def_ginfo_g;
- UINT32DECODE(*pp, ginfo->lheap_size_hint)
- UINT16DECODE(*pp, ginfo->max_compact)
- UINT16DECODE(*pp, ginfo->min_dense)
- UINT16DECODE(*pp, ginfo->est_num_entries)
- UINT16DECODE(*pp, ginfo->est_name_len)
+ UINT32DECODE(*pp, ginfo->lheap_size_hint);
+ UINT16DECODE(*pp, ginfo->max_compact);
+ UINT16DECODE(*pp, ginfo->min_dense);
+ UINT16DECODE(*pp, ginfo->est_num_entries);
+ UINT16DECODE(*pp, ginfo->est_name_len);
/* Update fields */
if (ginfo->max_compact != H5G_CRT_GINFO_MAX_COMPACT || ginfo->min_dense != H5G_CRT_GINFO_MIN_DENSE)
@@ -628,7 +628,7 @@ H5P__gcrt_link_info_enc(const void *value, void **_pp, size_t *size)
*(*pp)++ = (uint8_t)sizeof(unsigned);
/* Encode the value */
- H5_ENCODE_UNSIGNED(*pp, crt_order_flags)
+ H5_ENCODE_UNSIGNED(*pp, crt_order_flags);
} /* end if */
*size += (1 + sizeof(unsigned));
@@ -670,7 +670,7 @@ H5P__gcrt_link_info_dec(const void **_pp, void *_value)
HDmemset(linfo, 0, sizeof(H5O_linfo_t));
*linfo = H5G_def_linfo_g;
- H5_DECODE_UNSIGNED(*pp, crt_order_flags)
+ H5_DECODE_UNSIGNED(*pp, crt_order_flags);
/* Update fields */
linfo->track_corder = (hbool_t)((crt_order_flags & H5P_CRT_ORDER_TRACKED) ? TRUE : FALSE);
diff --git a/src/H5Pocpl.c b/src/H5Pocpl.c
index bad857f..a9968b0 100644
--- a/src/H5Pocpl.c
+++ b/src/H5Pocpl.c
@@ -1386,10 +1386,10 @@ H5P__ocrt_pipeline_enc(const void *value, void **_pp, size_t *size)
unsigned v; /* Local index variable */
/* encode filter ID */
- INT32ENCODE(*pp, pline->filter[u].id)
+ INT32ENCODE(*pp, pline->filter[u].id);
/* encode filter flags */
- H5_ENCODE_UNSIGNED(*pp, pline->filter[u].flags)
+ H5_ENCODE_UNSIGNED(*pp, pline->filter[u].flags);
/* encode filter name if it exists */
if (NULL != pline->filter[u].name) {
@@ -1413,7 +1413,7 @@ H5P__ocrt_pipeline_enc(const void *value, void **_pp, size_t *size)
/* encode all values */
for (v = 0; v < pline->filter[u].cd_nelmts; v++)
- H5_ENCODE_UNSIGNED(*pp, pline->filter[u].cd_values[v])
+ H5_ENCODE_UNSIGNED(*pp, pline->filter[u].cd_values[v]);
} /* end for */
} /* end if */
@@ -1482,10 +1482,10 @@ H5P__ocrt_pipeline_dec(const void **_pp, void *_value)
unsigned v; /* Local index variable */
/* decode filter id */
- INT32DECODE(*pp, filter.id)
+ INT32DECODE(*pp, filter.id);
/* decode filter flags */
- H5_DECODE_UNSIGNED(*pp, filter.flags)
+ H5_DECODE_UNSIGNED(*pp, filter.flags);
/* decode value indicating if the name is encoded */
has_name = *(*pp)++;
@@ -1512,7 +1512,7 @@ H5P__ocrt_pipeline_dec(const void **_pp, void *_value)
/* decode values */
for (v = 0; v < filter.cd_nelmts; v++)
- H5_DECODE_UNSIGNED(*pp, filter.cd_values[v])
+ H5_DECODE_UNSIGNED(*pp, filter.cd_values[v]);
/* Add the filter to the I/O pipeline */
if (H5Z_append(pline, filter.id, filter.flags, filter.cd_nelmts, filter.cd_values) < 0)
diff --git a/src/H5Pocpypl.c b/src/H5Pocpypl.c
index 98c9d8a..b61bcf9 100644
--- a/src/H5Pocpypl.c
+++ b/src/H5Pocpypl.c
@@ -210,7 +210,7 @@ H5P__free_merge_comm_dtype_list(H5O_copy_dtype_merge_list_t *dt_list)
dt_list = tmp_node;
} /* end while */
- FUNC_LEAVE_NOAPI(NULL);
+ FUNC_LEAVE_NOAPI(NULL)
} /* H5P__free_merge_comm_dtype_list */
/*--------------------------------------------------------------------------
diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index 9f567d3..376426d 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -540,7 +540,7 @@ H5S__hyper_get_op_gen(void)
{
FUNC_ENTER_PACKAGE_NOERR
- FUNC_LEAVE_NOAPI(H5S_hyper_op_gen_g++);
+ FUNC_LEAVE_NOAPI(H5S_hyper_op_gen_g++)
} /* end H5S__hyper_op_gen() */
/*-------------------------------------------------------------------------
@@ -4041,13 +4041,13 @@ H5S__hyper_serialize(H5S_t *space, uint8_t **p)
UINT16ENCODE(pp, diminfo[u].start);
UINT16ENCODE(pp, diminfo[u].stride);
if (diminfo[u].count == H5S_UNLIMITED)
- UINT16ENCODE(pp, H5S_UINT16_MAX)
+ UINT16ENCODE(pp, H5S_UINT16_MAX);
else
- UINT16ENCODE(pp, diminfo[u].count)
+ UINT16ENCODE(pp, diminfo[u].count);
if (diminfo[u].block == H5S_UNLIMITED)
- UINT16ENCODE(pp, H5S_UINT16_MAX)
+ UINT16ENCODE(pp, H5S_UINT16_MAX);
else
- UINT16ENCODE(pp, diminfo[u].block)
+ UINT16ENCODE(pp, diminfo[u].block);
} /* end for */
break;
@@ -4057,13 +4057,13 @@ H5S__hyper_serialize(H5S_t *space, uint8_t **p)
UINT32ENCODE(pp, diminfo[u].start);
UINT32ENCODE(pp, diminfo[u].stride);
if (diminfo[u].count == H5S_UNLIMITED)
- UINT32ENCODE(pp, H5S_UINT32_MAX)
+ UINT32ENCODE(pp, H5S_UINT32_MAX);
else
- UINT32ENCODE(pp, diminfo[u].count)
+ UINT32ENCODE(pp, diminfo[u].count);
if (diminfo[u].block == H5S_UNLIMITED)
- UINT32ENCODE(pp, H5S_UINT32_MAX)
+ UINT32ENCODE(pp, H5S_UINT32_MAX);
else
- UINT32ENCODE(pp, diminfo[u].block)
+ UINT32ENCODE(pp, diminfo[u].block);
} /* end for */
break;
@@ -4073,13 +4073,13 @@ H5S__hyper_serialize(H5S_t *space, uint8_t **p)
UINT64ENCODE(pp, diminfo[u].start);
UINT64ENCODE(pp, diminfo[u].stride);
if (diminfo[u].count == H5S_UNLIMITED)
- UINT64ENCODE(pp, H5S_UINT64_MAX)
+ UINT64ENCODE(pp, H5S_UINT64_MAX);
else
- UINT64ENCODE(pp, diminfo[u].count)
+ UINT64ENCODE(pp, diminfo[u].count);
if (diminfo[u].block == H5S_UNLIMITED)
- UINT64ENCODE(pp, H5S_UINT64_MAX)
+ UINT64ENCODE(pp, H5S_UINT64_MAX);
else
- UINT64ENCODE(pp, diminfo[u].block)
+ UINT64ENCODE(pp, diminfo[u].block);
} /* end for */
if (version == H5S_HYPER_VERSION_2)
len += (4 * space->extent.rank * 8);
@@ -5081,7 +5081,7 @@ H5S__hyper_unlim_dim(const H5S_t *space)
{
FUNC_ENTER_PACKAGE_NOERR
- FUNC_LEAVE_NOAPI(space->select.sel_info.hslab->unlim_dim);
+ FUNC_LEAVE_NOAPI(space->select.sel_info.hslab->unlim_dim)
} /* end H5S__hyper_unlim_dim() */
/*--------------------------------------------------------------------------
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index 8118eb0..7c50a3c 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -1041,12 +1041,12 @@ done:
/* Swap two elements (I & J) of an array using a temporary variable */
#define H5_SWAP_BYTES(ARRAY, I, J) \
- { \
+ do { \
uint8_t _tmp; \
_tmp = ARRAY[I]; \
ARRAY[I] = ARRAY[J]; \
ARRAY[J] = _tmp; \
- }
+ } while (0)
/* Minimum size of variable-length conversion buffer */
#define H5T_VLEN_MIN_CONF_BUF_SIZE 4096
diff --git a/src/H5VLcallback.c b/src/H5VLcallback.c
index 8191d29..c078579 100644
--- a/src/H5VLcallback.c
+++ b/src/H5VLcallback.c
@@ -3752,7 +3752,7 @@ H5VL__file_open_find_connector_cb(H5PL_type_t plugin_type, const void *plugin_in
{
status = H5VL_file_specific(NULL, &vol_cb_args, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status < 0) {
ssize_t new_num_errors = 0;
diff --git a/src/H5VLnative.c b/src/H5VLnative.c
index b667808..f686219 100644
--- a/src/H5VLnative.c
+++ b/src/H5VLnative.c
@@ -557,7 +557,7 @@ H5VL_native_get_file_struct(void *obj, H5I_type_t type, H5F_t **file)
H5O_loc_t *oloc = NULL; /* Object location for ID */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
*file = NULL;
diff --git a/src/H5VMprivate.h b/src/H5VMprivate.h
index 49bb53d..0c96fef 100644
--- a/src/H5VMprivate.h
+++ b/src/H5VMprivate.h
@@ -35,13 +35,13 @@ typedef herr_t (*H5VM_opvv_func_t)(hsize_t dst_off, hsize_t src_off, size_t len,
/* Other functions */
#define H5VM_vector_cpy(N, DST, SRC) \
- { \
+ do { \
HDassert(sizeof(*(DST)) == sizeof(*(SRC))); \
if (SRC) \
H5MM_memcpy(DST, SRC, (N) * sizeof(*(DST))); \
else \
HDmemset(DST, 0, (N) * sizeof(*(DST))); \
- }
+ } while (0)
#define H5VM_vector_zero(N, DST) HDmemset(DST, 0, (N) * sizeof(*(DST)))
@@ -49,7 +49,7 @@ typedef herr_t (*H5VM_opvv_func_t)(hsize_t dst_off, hsize_t src_off, size_t len,
* dimension (UNLIM_DIM) value to offset 0, sliding any intermediate values down
* one position. */
#define H5VM_swizzle_coords(TYPE, COORDS, UNLIM_DIM) \
- { \
+ do { \
/* COORDS must be an array of type TYPE */ \
HDassert(sizeof(COORDS[0]) == sizeof(TYPE)); \
\
@@ -60,14 +60,14 @@ typedef herr_t (*H5VM_opvv_func_t)(hsize_t dst_off, hsize_t src_off, size_t len,
HDmemmove(&(COORDS)[1], &(COORDS)[0], sizeof(TYPE) * (UNLIM_DIM)); \
(COORDS)[0] = _tmp; \
} /* end if */ \
- }
+ } while (0)
/* Given a coordinate offset array (COORDS) of type TYPE, move the value at
* offset 0 to offset of the unlimied dimension (UNLIM_DIM), sliding any
* intermediate values up one position. Undoes the "swizzle_coords" operation.
*/
#define H5VM_unswizzle_coords(TYPE, COORDS, UNLIM_DIM) \
- { \
+ do { \
/* COORDS must be an array of type TYPE */ \
HDassert(sizeof(COORDS[0]) == sizeof(TYPE)); \
\
@@ -78,7 +78,7 @@ typedef herr_t (*H5VM_opvv_func_t)(hsize_t dst_off, hsize_t src_off, size_t len,
HDmemmove(&(COORDS)[0], &(COORDS)[1], sizeof(TYPE) * (UNLIM_DIM)); \
(COORDS)[UNLIM_DIM] = _tmp; \
} /* end if */ \
- }
+ } while (0)
/* A null pointer is equivalent to a zero vector */
#define H5VM_ZERO NULL
diff --git a/src/H5Zscaleoffset.c b/src/H5Zscaleoffset.c
index 4f35fe3..6ef559e 100644
--- a/src/H5Zscaleoffset.c
+++ b/src/H5Zscaleoffset.c
@@ -255,7 +255,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
/* Get the fill value for integer type */
#define H5Z_scaleoffset_get_filval_1(type, cd_values, fill_val) \
- { \
+ do { \
unsigned _i = H5Z_SCALEOFFSET_PARM_FILVAL; /* index into cd_values */ \
uint32_t _cd_value; /* Current cd_value */ \
char *_fv_p; /* Pointer to current byte in fill_val */ \
@@ -319,15 +319,16 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
H5MM_memcpy(_fv_p, (char *)&_cd_value + 4 - _size_rem, _size_rem); \
} /* end if */ \
} /* end else */ \
- }
+ } while (0)
/* Get the fill value for floating-point type */
#define H5Z_scaleoffset_get_filval_2(type, cd_values, filval) \
- { \
+ do { \
if (sizeof(type) <= sizeof(long long)) \
- H5Z_scaleoffset_get_filval_1(type, cd_values, filval) else HGOTO_ERROR( \
- H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer datatype") \
- }
+ H5Z_scaleoffset_get_filval_1(type, cd_values, filval); \
+ else \
+ HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer datatype") \
+ } while (0)
/* Find maximum and minimum values of a buffer with fill value defined for integer type */
#define H5Z_scaleoffset_max_min_1(i, d_nelmts, buf, filval, max, min) \
@@ -455,32 +456,32 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
unsigned i; \
\
if (filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */ \
- H5Z_scaleoffset_get_filval_1(type, cd_values, \
- filval) if (*minbits == H5Z_SO_INT_MINBITS_DEFAULT) \
- { /* minbits not set yet, calculate max, min, and minbits */ \
+ H5Z_scaleoffset_get_filval_1(type, cd_values, filval); \
+ if (*minbits == \
+ H5Z_SO_INT_MINBITS_DEFAULT) { /* minbits not set yet, calculate max, min, and minbits */ \
H5Z_scaleoffset_max_min_1(i, d_nelmts, buf, filval, max, min) \
H5Z_scaleoffset_check_1(type, max, min, minbits) span = (type)(max - min + 1); \
*minbits = H5Z__scaleoffset_log2((unsigned long long)(span + 1)); \
} \
else /* minbits already set, only calculate min */ \
- H5Z_scaleoffset_min_1( \
- i, d_nelmts, buf, filval, \
- min) if (*minbits != sizeof(type) * 8) /* change values if minbits != full precision */ \
- for (i = 0; i < d_nelmts; i++) buf[i] = \
- (type)((buf[i] == filval) ? (((type)1 << *minbits) - 1) : (buf[i] - min)); \
+ H5Z_scaleoffset_min_1(i, d_nelmts, buf, filval, min); \
+ if (*minbits != sizeof(type) * 8) /* change values if minbits != full precision */ \
+ for (i = 0; i < d_nelmts; i++) \
+ buf[i] = (type)((buf[i] == filval) ? (((type)1 << *minbits) - 1) : (buf[i] - min)); \
} \
else { /* fill value undefined */ \
if (*minbits == \
H5Z_SO_INT_MINBITS_DEFAULT) { /* minbits not set yet, calculate max, min, and minbits */ \
- H5Z_scaleoffset_max_min_2(i, d_nelmts, buf, max, min) \
- H5Z_scaleoffset_check_1(type, max, min, minbits) span = (type)(max - min + 1); \
+ H5Z_scaleoffset_max_min_2(i, d_nelmts, buf, max, min); \
+ H5Z_scaleoffset_check_1(type, max, min, minbits); \
+ span = (type)(max - min + 1); \
*minbits = H5Z__scaleoffset_log2((unsigned long long)span); \
} \
else /* minbits already set, only calculate min */ \
- H5Z_scaleoffset_min_2( \
- i, d_nelmts, buf, \
- min) if (*minbits != sizeof(type) * 8) /* change values if minbits != full precision */ \
- for (i = 0; i < d_nelmts; i++) buf[i] = (type)(buf[i] - min); \
+ H5Z_scaleoffset_min_2(i, d_nelmts, buf, min); \
+ if (*minbits != sizeof(type) * 8) /* change values if minbits != full precision */ \
+ for (i = 0; i < d_nelmts; i++) \
+ buf[i] = (type)(buf[i] - min); \
} \
*minval = min; \
} while (0)
@@ -493,20 +494,19 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
unsigned i; \
\
if (filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */ \
- H5Z_scaleoffset_get_filval_1(type, cd_values, \
- filval) if (*minbits == H5Z_SO_INT_MINBITS_DEFAULT) \
- { /* minbits not set yet, calculate max, min, and minbits */ \
+ H5Z_scaleoffset_get_filval_1(type, cd_values, filval); \
+ if (*minbits == \
+ H5Z_SO_INT_MINBITS_DEFAULT) { /* minbits not set yet, calculate max, min, and minbits */ \
H5Z_scaleoffset_max_min_1(i, d_nelmts, buf, filval, max, min) \
H5Z_scaleoffset_check_2(type, max, min, minbits) span = (unsigned type)(max - min + 1); \
*minbits = H5Z__scaleoffset_log2((unsigned long long)(span + 1)); \
} \
else /* minbits already set, only calculate min */ \
- H5Z_scaleoffset_min_1( \
- i, d_nelmts, buf, filval, \
- min) if (*minbits != sizeof(type) * 8) /* change values if minbits != full precision */ \
- for (i = 0; i < d_nelmts; i++) buf[i] = \
- (type)((buf[i] == filval) ? (type)(((unsigned type)1 << *minbits) - 1) \
- : (buf[i] - min)); \
+ H5Z_scaleoffset_min_1(i, d_nelmts, buf, filval, min); \
+ if (*minbits != sizeof(type) * 8) /* change values if minbits != full precision */ \
+ for (i = 0; i < d_nelmts; i++) \
+ buf[i] = (type)((buf[i] == filval) ? (type)(((unsigned type)1 << *minbits) - 1) \
+ : (buf[i] - min)); \
} \
else { /* fill value undefined */ \
if (*minbits == \
@@ -603,29 +603,29 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
\
*minval = 0; \
if (filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */ \
- H5Z_scaleoffset_get_filval_2(type, cd_values, filval) \
- H5Z_scaleoffset_max_min_3(i, d_nelmts, buf, filval, max, min, D_val) \
- H5Z_scaleoffset_check_3(i, type, pow_fun, round_fun, max, min, minbits, D_val) span = \
- (unsigned long long)(llround_fun(max * pow_fun((type)10, (type)D_val) - \
- min * pow_fun((type)10, (type)D_val)) + \
- 1); \
+ H5Z_scaleoffset_get_filval_2(type, cd_values, filval); \
+ H5Z_scaleoffset_max_min_3(i, d_nelmts, buf, filval, max, min, D_val); \
+ H5Z_scaleoffset_check_3(i, type, pow_fun, round_fun, max, min, minbits, D_val); \
+ span = (unsigned long long)(llround_fun(max * pow_fun((type)10, (type)D_val) - \
+ min * pow_fun((type)10, (type)D_val)) + \
+ 1); \
*minbits = H5Z__scaleoffset_log2(span + 1); \
if (*minbits != sizeof(type) * 8) /* change values if minbits != full precision */ \
H5Z_scaleoffset_modify_1(i, type, pow_fun, abs_fun, lround_fun, llround_fun, buf, d_nelmts, \
- filval, minbits, min, D_val) \
+ filval, minbits, min, D_val); \
} \
else { /* fill value undefined */ \
- H5Z_scaleoffset_max_min_2(i, d_nelmts, buf, max, min) \
- H5Z_scaleoffset_check_3(i, type, pow_fun, round_fun, max, min, minbits, D_val) span = \
- (unsigned long long)(llround_fun(max * pow_fun((type)10, (type)D_val) - \
- min * pow_fun((type)10, (type)D_val)) + \
- 1); \
+ H5Z_scaleoffset_max_min_2(i, d_nelmts, buf, max, min); \
+ H5Z_scaleoffset_check_3(i, type, pow_fun, round_fun, max, min, minbits, D_val); \
+ span = (unsigned long long)(llround_fun(max * pow_fun((type)10, (type)D_val) - \
+ min * pow_fun((type)10, (type)D_val)) + \
+ 1); \
*minbits = H5Z__scaleoffset_log2(span); \
if (*minbits != sizeof(type) * 8) /* change values if minbits != full precision */ \
H5Z_scaleoffset_modify_2(i, type, pow_fun, lround_fun, llround_fun, buf, d_nelmts, min, \
- D_val) \
+ D_val); \
} \
- H5Z_scaleoffset_save_min(i, type, minval, min) \
+ H5Z_scaleoffset_save_min(i, type, minval, min); \
} while (0)
/* Postdecompress for unsigned integer type */
@@ -635,8 +635,9 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
unsigned i; \
\
if (filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */ \
- H5Z_scaleoffset_get_filval_1(type, cd_values, filval) for (i = 0; i < d_nelmts; i++) buf[i] = \
- (type)((buf[i] == (((type)1 << minbits) - 1)) ? filval : (buf[i] + minval)); \
+ H5Z_scaleoffset_get_filval_1(type, cd_values, filval); \
+ for (i = 0; i < d_nelmts; i++) \
+ buf[i] = (type)((buf[i] == (((type)1 << minbits) - 1)) ? filval : (buf[i] + minval)); \
} \
else /* fill value undefined */ \
for (i = 0; i < d_nelmts; i++) \
@@ -650,9 +651,11 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
unsigned i; \
\
if (filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */ \
- H5Z_scaleoffset_get_filval_1(type, cd_values, filval) for (i = 0; i < d_nelmts; i++) buf[i] = \
- (type)(((unsigned type)buf[i] == (((unsigned type)1 << minbits) - 1)) ? filval \
- : (buf[i] + minval)); \
+ H5Z_scaleoffset_get_filval_1(type, cd_values, filval); \
+ for (i = 0; i < d_nelmts; i++) \
+ buf[i] = (type)(((unsigned type)buf[i] == (((unsigned type)1 << minbits) - 1)) \
+ ? filval \
+ : (buf[i] + minval)); \
} \
else /* fill value undefined */ \
for (i = 0; i < d_nelmts; i++) \
@@ -661,7 +664,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
/* Retrieve minimum value of floating-point type */
#define H5Z_scaleoffset_get_min(type, minval, min) \
- { \
+ do { \
if (sizeof(type) <= sizeof(long long)) \
/* retrieve min value from corresponding position \
* byte-order has already been swapped as appropriate, but be sure to \
@@ -675,11 +678,11 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
} /* end else */ \
else \
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer datatype") \
- }
+ } while (0)
/* Modify values of data in postdecompression if fill value defined for floating-point type */
#define H5Z_scaleoffset_modify_3(i, type, pow_fun, buf, d_nelmts, filval, minbits, min, D_val) \
- { \
+ do { \
if (sizeof(type) == sizeof(int)) \
for (i = 0; i < d_nelmts; i++) \
buf[i] = \
@@ -702,11 +705,11 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
min); \
else \
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer datatype") \
- }
+ } while (0)
/* Modify values of data in postdecompression if fill value undefined for floating-point type */
#define H5Z_scaleoffset_modify_4(i, type, pow_fun, buf, d_nelmts, min, D_val) \
- { \
+ do { \
if (sizeof(type) == sizeof(int)) \
for (i = 0; i < d_nelmts; i++) \
buf[i] = ((type)(*(int *)((void *)&buf[i])) / pow_fun((type)10, (type)D_val) + min); \
@@ -718,7 +721,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
buf[i] = ((type)(*(long long *)((void *)&buf[i])) / pow_fun((type)10, (type)D_val) + min); \
else \
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer datatype") \
- }
+ } while (0)
/* Postdecompress for floating-point type using variable-minimum-bits method */
#define H5Z_scaleoffset_postdecompress_3(type, pow_fun, data, d_nelmts, filavail, cd_values, minbits, \
@@ -727,15 +730,14 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
type *buf = (type *)data, filval = 0, min = 0; \
unsigned i; \
\
- H5Z_scaleoffset_get_min(type, minval, min) \
+ H5Z_scaleoffset_get_min(type, minval, min); \
\
- if (filavail == H5Z_SCALEOFFSET_FILL_DEFINED) \
- { /* fill value defined */ \
- H5Z_scaleoffset_get_filval_2(type, cd_values, filval) \
- H5Z_scaleoffset_modify_3(i, type, pow_fun, buf, d_nelmts, filval, minbits, min, D_val) \
+ if (filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */ \
+ H5Z_scaleoffset_get_filval_2(type, cd_values, filval); \
+ H5Z_scaleoffset_modify_3(i, type, pow_fun, buf, d_nelmts, filval, minbits, min, D_val); \
} \
else /* fill value undefined */ \
- H5Z_scaleoffset_modify_4(i, type, pow_fun, buf, d_nelmts, min, D_val) \
+ H5Z_scaleoffset_modify_4(i, type, pow_fun, buf, d_nelmts, min, D_val); \
} while (0)
/*-------------------------------------------------------------------------
@@ -1538,9 +1540,10 @@ H5Z__scaleoffset_postdecompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleo
unsigned i;
if (filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */
- H5Z_scaleoffset_get_filval_1(signed char, cd_values, filval) for (i = 0; i < d_nelmts;
- i++) buf[i] =
- (signed char)((buf[i] == (((unsigned char)1 << minbits) - 1)) ? filval : (buf[i] + sminval));
+ H5Z_scaleoffset_get_filval_1(signed char, cd_values, filval);
+ for (i = 0; i < d_nelmts; i++)
+ buf[i] = (signed char)((buf[i] == (((unsigned char)1 << minbits) - 1)) ? filval
+ : (buf[i] + sminval));
}
else /* fill value undefined */
for (i = 0; i < d_nelmts; i++)
diff --git a/src/H5Ztrans.c b/src/H5Ztrans.c
index 39f9e9d..cd19a39 100644
--- a/src/H5Ztrans.c
+++ b/src/H5Ztrans.c
@@ -897,7 +897,7 @@ H5Z__parse_factor(H5Z_token *current, H5Z_datval_ptrs *dat_val_pointers)
ret_value = factor;
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
}
/*-------------------------------------------------------------------------
@@ -1396,7 +1396,7 @@ H5Z__xform_reduce_tree(H5Z_node *tree)
}
}
- FUNC_LEAVE_NOAPI_VOID;
+ FUNC_LEAVE_NOAPI_VOID
}
/*-------------------------------------------------------------------------
@@ -1429,7 +1429,7 @@ H5Z__do_op(H5Z_node *tree)
else if (tree->type == H5Z_XFORM_MINUS)
H5Z_XFORM_DO_OP6(-)
- FUNC_LEAVE_NOAPI_VOID;
+ FUNC_LEAVE_NOAPI_VOID
}
/*-------------------------------------------------------------------------
diff --git a/src/H5checksum.c b/src/H5checksum.c
index cb1f754..cd3fb4c 100644
--- a/src/H5checksum.c
+++ b/src/H5checksum.c
@@ -284,7 +284,7 @@ rotates.
*/
#define H5_lookup3_rot(x, k) (((x) << (k)) ^ ((x) >> (32 - (k))))
#define H5_lookup3_mix(a, b, c) \
- { \
+ do { \
a -= c; \
a ^= H5_lookup3_rot(c, 4); \
c += b; \
@@ -303,7 +303,7 @@ rotates.
c -= b; \
c ^= H5_lookup3_rot(b, 4); \
b += a; \
- }
+ } while (0)
/*
-------------------------------------------------------------------------------
@@ -331,7 +331,7 @@ and these came close:
-------------------------------------------------------------------------------
*/
#define H5_lookup3_final(a, b, c) \
- { \
+ do { \
c ^= b; \
c -= H5_lookup3_rot(b, 14); \
a ^= c; \
@@ -346,7 +346,7 @@ and these came close:
b -= H5_lookup3_rot(a, 14); \
c ^= b; \
c -= H5_lookup3_rot(b, 24); \
- }
+ } while (0)
/*
-------------------------------------------------------------------------------
diff --git a/src/H5encode.h b/src/H5encode.h
index 6a320f1..3ec12b6 100644
--- a/src/H5encode.h
+++ b/src/H5encode.h
@@ -27,23 +27,23 @@
*/
#define INT16ENCODE(p, i) \
- { \
+ do { \
*(p) = (uint8_t)((unsigned)(i)&0xff); \
(p)++; \
*(p) = (uint8_t)(((unsigned)(i) >> 8) & 0xff); \
(p)++; \
- }
+ } while (0)
#define UINT16ENCODE(p, i) \
- { \
+ do { \
*(p) = (uint8_t)((unsigned)(i)&0xff); \
(p)++; \
*(p) = (uint8_t)(((unsigned)(i) >> 8) & 0xff); \
(p)++; \
- }
+ } while (0)
#define INT32ENCODE(p, i) \
- { \
+ do { \
*(p) = (uint8_t)((uint32_t)(i)&0xff); \
(p)++; \
*(p) = (uint8_t)(((uint32_t)(i) >> 8) & 0xff); \
@@ -52,10 +52,10 @@
(p)++; \
*(p) = (uint8_t)(((uint32_t)(i) >> 24) & 0xff); \
(p)++; \
- }
+ } while (0)
#define UINT32ENCODE(p, i) \
- { \
+ do { \
*(p) = (uint8_t)((i)&0xff); \
(p)++; \
*(p) = (uint8_t)(((i) >> 8) & 0xff); \
@@ -64,12 +64,12 @@
(p)++; \
*(p) = (uint8_t)(((i) >> 24) & 0xff); \
(p)++; \
- }
+ } while (0)
/* Encode an unsigned integer into a variable-sized buffer */
/* (Assumes that the high bits of the integer are zero) */
#define ENCODE_VAR(p, typ, n, l) \
- { \
+ do { \
typ _n = (n); \
size_t _i; \
uint8_t *_p = (uint8_t *)(p); \
@@ -77,14 +77,14 @@
for (_i = 0; _i < l; _i++, _n >>= 8) \
*_p++ = (uint8_t)(_n & 0xff); \
(p) = (uint8_t *)(p) + l; \
- }
+ } while (0)
/* Encode a 32-bit unsigned integer into a variable-sized buffer */
/* (Assumes that the high bits of the integer are zero) */
#define UINT32ENCODE_VAR(p, n, l) ENCODE_VAR(p, uint32_t, n, l)
#define INT64ENCODE(p, n) \
- { \
+ do { \
int64_t _n = (n); \
size_t _i; \
uint8_t *_p = (uint8_t *)(p); \
@@ -94,10 +94,10 @@
for (/*void*/; _i < 8; _i++) \
*_p++ = (uint8_t)((n) < 0 ? 0xff : 0); \
(p) = (uint8_t *)(p) + 8; \
- }
+ } while (0)
#define UINT64ENCODE(p, n) \
- { \
+ do { \
uint64_t _n = (n); \
size_t _i; \
uint8_t *_p = (uint8_t *)(p); \
@@ -107,21 +107,21 @@
for (/*void*/; _i < 8; _i++) \
*_p++ = 0; \
(p) = (uint8_t *)(p) + 8; \
- }
+ } while (0)
/* Encode a 64-bit unsigned integer into a variable-sized buffer */
/* (Assumes that the high bits of the integer are zero) */
#define UINT64ENCODE_VAR(p, n, l) ENCODE_VAR(p, uint64_t, n, l)
#define H5_ENCODE_UNSIGNED(p, n) \
- { \
+ do { \
HDcompile_assert(sizeof(unsigned) == sizeof(uint32_t)); \
- UINT32ENCODE(p, n) \
- }
+ UINT32ENCODE(p, n); \
+ } while (0)
/* Assumes the endianness of uint64_t is the same as double */
#define H5_ENCODE_DOUBLE(p, n) \
- { \
+ do { \
uint64_t _n; \
size_t _u; \
uint8_t *_p = (uint8_t *)(p); \
@@ -132,7 +132,7 @@
for (_u = 0; _u < sizeof(uint64_t); _u++, _n >>= 8) \
*_p++ = (uint8_t)(_n & 0xff); \
(p) = (uint8_t *)(p) + 8; \
- }
+ } while (0)
/* DECODE converts little endian bytes pointed by p to integer values and store
* it in i. For signed values, need to do sign-extension when converting
@@ -143,23 +143,23 @@
*/
#define INT16DECODE(p, i) \
- { \
+ do { \
(i) = (int16_t)((*(p)&0xff)); \
(p)++; \
(i) |= (int16_t)(((*(p)&0xff) << 8) | ((*(p)&0x80) ? ~0xffff : 0x0)); \
(p)++; \
- }
+ } while (0)
#define UINT16DECODE(p, i) \
- { \
+ do { \
(i) = (uint16_t)(*(p)&0xff); \
(p)++; \
(i) |= (uint16_t)((*(p)&0xff) << 8); \
(p)++; \
- }
+ } while (0)
#define INT32DECODE(p, i) \
- { \
+ do { \
(i) = ((int32_t)(*(p)&0xff)); \
(p)++; \
(i) |= ((int32_t)(*(p)&0xff) << 8); \
@@ -168,10 +168,10 @@
(p)++; \
(i) |= ((int32_t)(((*(p) & (unsigned)0xff) << 24) | ((*(p)&0x80) ? ~0xffffffffULL : 0x0ULL))); \
(p)++; \
- }
+ } while (0)
#define UINT32DECODE(p, i) \
- { \
+ do { \
(i) = (uint32_t)(*(p)&0xff); \
(p)++; \
(i) |= ((uint32_t)(*(p)&0xff) << 8); \
@@ -180,12 +180,12 @@
(p)++; \
(i) |= ((uint32_t)(*(p)&0xff) << 24); \
(p)++; \
- }
+ } while (0)
/* Decode a variable-sized buffer */
/* (Assumes that the high bits of the integer will be zero) */
#define DECODE_VAR(p, n, l) \
- { \
+ do { \
size_t _i; \
\
n = 0; \
@@ -193,14 +193,14 @@
for (_i = 0; _i < l; _i++) \
n = (n << 8) | *(--p); \
(p) += l; \
- }
+ } while (0)
/* Decode a variable-sized buffer into a 32-bit unsigned integer */
/* (Assumes that the high bits of the integer will be zero) */
#define UINT32DECODE_VAR(p, n, l) DECODE_VAR(p, n, l)
#define INT64DECODE(p, n) \
- { \
+ do { \
/* WE DON'T CHECK FOR OVERFLOW! */ \
size_t _i; \
\
@@ -209,10 +209,10 @@
for (_i = 0; _i < sizeof(int64_t); _i++) \
n = (n << 8) | *(--p); \
(p) += 8; \
- }
+ } while (0)
#define UINT64DECODE(p, n) \
- { \
+ do { \
/* WE DON'T CHECK FOR OVERFLOW! */ \
size_t _i; \
\
@@ -221,21 +221,21 @@
for (_i = 0; _i < sizeof(uint64_t); _i++) \
n = (n << 8) | *(--p); \
(p) += 8; \
- }
+ } while (0)
/* Decode a variable-sized buffer into a 64-bit unsigned integer */
/* (Assumes that the high bits of the integer will be zero) */
#define UINT64DECODE_VAR(p, n, l) DECODE_VAR(p, n, l)
#define H5_DECODE_UNSIGNED(p, n) \
- { \
+ do { \
HDcompile_assert(sizeof(unsigned) == sizeof(uint32_t)); \
- UINT32DECODE(p, n) \
- }
+ UINT32DECODE(p, n); \
+ } while (0)
/* Assumes the endianness of uint64_t is the same as double */
#define H5_DECODE_DOUBLE(p, n) \
- { \
+ do { \
uint64_t _n; \
size_t _u; \
\
@@ -247,37 +247,41 @@
_n = (_n << 8) | *(--p); \
HDmemcpy(&(n), &_n, sizeof(double)); \
(p) += 8; \
- }
+ } while (0)
/* Macros to encode/decode offset/length's for storing in the file */
#define H5_ENCODE_LENGTH_LEN(p, l, s) \
- switch (s) { \
- case 4: \
- UINT32ENCODE(p, l); \
- break; \
- case 8: \
- UINT64ENCODE(p, l); \
- break; \
- case 2: \
- UINT16ENCODE(p, l); \
- break; \
- default: \
- HDassert("bad sizeof size" && 0); \
- }
+ do { \
+ switch (s) { \
+ case 4: \
+ UINT32ENCODE(p, l); \
+ break; \
+ case 8: \
+ UINT64ENCODE(p, l); \
+ break; \
+ case 2: \
+ UINT16ENCODE(p, l); \
+ break; \
+ default: \
+ HDassert("bad sizeof size" && 0); \
+ } \
+ } while (0)
#define H5_DECODE_LENGTH_LEN(p, l, s) \
- switch (s) { \
- case 4: \
- UINT32DECODE(p, l); \
- break; \
- case 8: \
- UINT64DECODE(p, l); \
- break; \
- case 2: \
- UINT16DECODE(p, l); \
- break; \
- default: \
- HDassert("bad sizeof size" && 0); \
- }
+ do { \
+ switch (s) { \
+ case 4: \
+ UINT32DECODE(p, l); \
+ break; \
+ case 8: \
+ UINT64DECODE(p, l); \
+ break; \
+ case 2: \
+ UINT16DECODE(p, l); \
+ break; \
+ default: \
+ HDassert("bad sizeof size" && 0); \
+ } \
+ } while (0)
#endif /* H5encode_H */
diff --git a/src/H5private.h b/src/H5private.h
index 0b822a7..433472b 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -1378,10 +1378,15 @@ H5_DLL int HDvasprintf(char **bufp, const char *fmt, va_list _ap);
* that will always generate the expected name.
*/
#define H5_CHECKED_ASSIGN(dst, dsttype, src, srctype) \
- ASSIGN_##srctype##_TO_##dsttype(dst, dsttype, src, srctype)
+ do { \
+ ASSIGN_##srctype##_TO_##dsttype(dst, dsttype, src, srctype) \
+ } while (0)
#else /* NDEBUG */
-#define H5_CHECKED_ASSIGN(dst, dsttype, src, srctype) (dst) = (dsttype)(src);
+#define H5_CHECKED_ASSIGN(dst, dsttype, src, srctype) \
+ do { \
+ (dst) = (dsttype)(src); \
+ } while (0)
#endif /* NDEBUG */
#if defined(H5_HAVE_WINDOW_PATH)
diff --git a/test/accum_swmr_reader.c b/test/accum_swmr_reader.c
index b667b07..10698c1 100644
--- a/test/accum_swmr_reader.c
+++ b/test/accum_swmr_reader.c
@@ -110,7 +110,7 @@ error:
H5Pclose(fapl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (api_ctx_pushed)
H5CX_pop(FALSE);
diff --git a/test/big.c b/test/big.c
index 503570d..ca8ba1f 100644
--- a/test/big.c
+++ b/test/big.c
@@ -441,7 +441,7 @@ error:
H5Sclose(mem_space);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (buf)
HDfree(buf);
if (out)
@@ -547,7 +547,7 @@ error:
H5Sclose(fspace);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (buf)
HDfree(buf);
if (script)
diff --git a/test/btree2.c b/test/btree2.c
index 573f45c..36182f2 100644
--- a/test/btree2.c
+++ b/test/btree2.c
@@ -679,7 +679,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
{
ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)0, find_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -737,7 +737,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
{
ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)1, find_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -802,7 +802,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
{
ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)4, find_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -842,7 +842,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_insert_basic() */
@@ -988,7 +988,7 @@ test_insert_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p
{
ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC + 2), find_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -1027,7 +1027,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_insert_split_root() */
@@ -1180,7 +1180,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_insert_level1_2leaf_redistrib() */
@@ -1339,7 +1339,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_insert_level1_side_split() */
@@ -1482,7 +1482,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_insert_level1_3leaf_redistrib() */
@@ -1604,7 +1604,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_insert_level1_middle_split() */
@@ -1757,7 +1757,7 @@ test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
{
ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC * 30), find_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -1797,7 +1797,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_insert_make_level2() */
@@ -2025,7 +2025,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_insert_level2_leaf_redistrib() */
@@ -2257,7 +2257,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_insert_level2_leaf_split() */
@@ -2429,7 +2429,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_insert_level2_2internal_redistrib() */
@@ -2606,7 +2606,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_insert_level2_2internal_split() */
@@ -2784,7 +2784,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_insert_level2_3internal_redistrib() */
@@ -2965,7 +2965,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_insert_level2_3internal_split() */
@@ -3132,7 +3132,7 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time);
{
ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_MANY * 3), find_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -3140,7 +3140,7 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time);
{
ret = H5B2_index(bt2, H5_ITER_DEC, (hsize_t)(INSERT_MANY * 3), find_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -3174,7 +3174,7 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time);
{
ret = H5B2_insert(bt2, &record);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -3209,7 +3209,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(records);
return 1;
} /* test_insert_lots() */
@@ -3309,7 +3309,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
{
ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)1, index_rec_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -3386,7 +3386,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
{
ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)1, index_rec_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -3463,7 +3463,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
{
ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)4, index_rec_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -3557,7 +3557,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
{
ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)4, index_rec_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -3617,7 +3617,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_update_basic() */
@@ -3824,7 +3824,7 @@ test_update_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p
{
ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC + 2), index_rec_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -3878,7 +3878,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_update_split_root() */
@@ -4035,7 +4035,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_update_level1_2leaf_redistrib() */
@@ -4198,7 +4198,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_update_level1_side_split() */
@@ -4345,7 +4345,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_update_level1_3leaf_redistrib() */
@@ -4470,7 +4470,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_update_level1_middle_split() */
@@ -4642,7 +4642,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
{
ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC * 42), index_rec_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -4819,7 +4819,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
{
ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC * 42), index_rec_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -5006,7 +5006,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
{
ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC * 42), index_rec_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -5061,7 +5061,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_update_make_level2() */
@@ -5220,7 +5220,7 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
{
ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_MANY_REC * 3), find_rec_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -5228,7 +5228,7 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
{
ret = H5B2_index(bt2, H5_ITER_DEC, (hsize_t)(INSERT_MANY_REC * 3), find_rec_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -5312,7 +5312,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(records);
return 1;
@@ -5369,7 +5369,7 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
{
ret = H5B2_remove(bt2, &record, NULL, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -5409,7 +5409,7 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
{
ret = H5B2_remove(bt2, &record, NULL, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -5493,7 +5493,7 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
{
ret = H5B2_remove(bt2, &record, NULL, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -5627,7 +5627,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_remove_basic() */
@@ -5698,7 +5698,7 @@ test_remove_level1_noredistrib(hid_t fapl, const H5B2_create_t *cparam, const bt
{
ret = H5B2_remove(bt2, &record, NULL, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -5851,7 +5851,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_remove_level1_noredistrib() */
@@ -6047,7 +6047,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_remove_level1_redistrib() */
@@ -6225,7 +6225,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_remove_level1_2leaf_merge() */
@@ -6350,7 +6350,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_remove_level1_3leaf_merge() */
@@ -6576,7 +6576,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_remove_level1_promote() */
@@ -6724,7 +6724,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_remove_level1_promote_2leaf_redistrib() */
@@ -6872,7 +6872,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_remove_level1_promote_3leaf_redistrib() */
@@ -7017,7 +7017,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_remove_level1_promote_2leaf_merge() */
@@ -7162,7 +7162,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_remove_level1_promote_3leaf_merge() */
@@ -7300,7 +7300,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_remove_level1_collapse() */
@@ -7585,7 +7585,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_remove_level2_promote() */
@@ -7736,7 +7736,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_remove_level2_promote_2internal_redistrib() */
@@ -7887,7 +7887,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_remove_level2_promote_3internal_redistrib() */
@@ -8039,7 +8039,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_remove_level2_promote_2internal_merge() */
@@ -8191,7 +8191,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_remove_level2_promote_3internal_merge() */
@@ -8317,7 +8317,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_remove_level2_2internal_merge_left() */
@@ -8443,7 +8443,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_remove_level2_2internal_merge_right() */
@@ -8569,7 +8569,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_remove_level2_3internal_merge() */
@@ -8694,7 +8694,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_remove_level2_collapse_right() */
@@ -8769,7 +8769,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* gen_l4_btree2() */
@@ -9205,7 +9205,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fd > 0)
HDclose(fd);
@@ -9279,7 +9279,7 @@ test_find_neighbor(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param
{
ret = H5B2_neighbor(bt2, H5B2_COMPARE_LESS, &search, neighbor_cb, &record);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -9359,7 +9359,7 @@ test_find_neighbor(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param
{
ret = H5B2_neighbor(bt2, H5B2_COMPARE_GREATER, &search, neighbor_cb, &record);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -9437,7 +9437,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(records);
return 1;
} /* test_find_neighbor() */
@@ -9710,7 +9710,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_delete() */
@@ -9777,7 +9777,7 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa
{
ret = H5B2_modify(bt2, &record, modify_cb, &modify);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -9828,7 +9828,7 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa
{
ret = H5B2_modify(bt2, &record, modify_cb, &modify);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -9879,7 +9879,7 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa
{
ret = H5B2_modify(bt2, &record, modify_cb, &modify);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -9930,7 +9930,7 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa
{
ret = H5B2_modify(bt2, &record, modify_cb, &modify);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (ret != FAIL)
TEST_ERROR;
@@ -9955,7 +9955,7 @@ error:
H5B2_close(bt2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_modify() */
@@ -10095,7 +10095,7 @@ error:
H5Fclose(file0);
H5Fclose(file00);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_open_twice_diff() */
@@ -10258,7 +10258,7 @@ error:
{
H5Pclose(fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (api_ctx_pushed)
H5CX_pop(FALSE);
diff --git a/test/cache_api.c b/test/cache_api.c
index f40782c..b596534 100644
--- a/test/cache_api.c
+++ b/test/cache_api.c
@@ -1658,7 +1658,7 @@ check_fapl_mdc_api_errs(void)
{
result = H5Pget_mdc_config((hid_t)-1, &scratch);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (result >= 0) {
@@ -1696,7 +1696,7 @@ check_fapl_mdc_api_errs(void)
{
result = H5Pget_mdc_config(fapl_id, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (result >= 0) {
@@ -1714,7 +1714,7 @@ check_fapl_mdc_api_errs(void)
{
result = H5Pget_mdc_config(fapl_id, &scratch);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (result >= 0) {
@@ -1733,7 +1733,7 @@ check_fapl_mdc_api_errs(void)
{
result = H5Pset_mdc_config((hid_t)-1, &default_config);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (result >= 0) {
@@ -1748,7 +1748,7 @@ check_fapl_mdc_api_errs(void)
{
result = H5Pset_mdc_config(fapl_id, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (result >= 0) {
@@ -1763,7 +1763,7 @@ check_fapl_mdc_api_errs(void)
{
result = H5Pset_mdc_config(fapl_id, &(invalid_configs[i]));
}
- H5E_END_TRY;
+ H5E_END_TRY
if (result >= 0) {
@@ -1891,7 +1891,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
{
result = H5Fget_mdc_config((hid_t)-1, &scratch);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (result >= 0) {
@@ -1911,7 +1911,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
{
result = H5Fget_mdc_config(file_id, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (result >= 0) {
@@ -1932,7 +1932,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
{
result = H5Fget_mdc_config(file_id, &scratch);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (result >= 0) {
@@ -1955,7 +1955,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
{
result = H5Fset_mdc_config((hid_t)-1, &default_config);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (result >= 0) {
@@ -1975,7 +1975,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
{
result = H5Fset_mdc_config(file_id, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (result >= 0) {
@@ -1995,7 +1995,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
{
result = H5Fset_mdc_config(file_id, &(invalid_configs[i]));
}
- H5E_END_TRY;
+ H5E_END_TRY
if (result >= 0) {
@@ -2023,7 +2023,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
{
result = H5Fget_mdc_hit_rate((hid_t)-1, &hit_rate);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (result >= 0) {
@@ -2043,7 +2043,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
{
result = H5Fget_mdc_hit_rate(file_id, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (result >= 0) {
@@ -2064,7 +2064,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
{
result = H5Freset_mdc_hit_rate_stats((hid_t)-1);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (result >= 0) {
@@ -2085,7 +2085,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
{
result = H5Fget_mdc_size((hid_t)-1, &max_size, &min_clean_size, &cur_size, &cur_num_entries);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (result >= 0) {
diff --git a/test/cache_image.c b/test/cache_image.c
index 8ee152c..8072eda 100644
--- a/test/cache_image.c
+++ b/test/cache_image.c
@@ -935,7 +935,7 @@ attempt_swmr_open_hdf5_file(const hbool_t create_file, const hbool_t set_mdci_fa
{
file_id = H5Fcreate(hdf_file_name, H5F_ACC_TRUNC | H5F_ACC_SWMR_WRITE, H5P_DEFAULT, fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
else {
@@ -943,7 +943,7 @@ attempt_swmr_open_hdf5_file(const hbool_t create_file, const hbool_t set_mdci_fa
{
file_id = H5Fopen(hdf_file_name, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
if (file_id >= 0) {
@@ -6284,7 +6284,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd)
failure_mssg = "SWMR start succeeded in file with cache image.";
}
}
- H5E_END_TRY;
+ H5E_END_TRY
}
if (show_progress)
diff --git a/test/chunk_info.c b/test/chunk_info.c
index 6f3359e..5a53d92 100644
--- a/test/chunk_info.c
+++ b/test/chunk_info.c
@@ -641,7 +641,7 @@ test_get_chunk_info_highest_v18(hid_t fapl)
{
ret = H5Dget_chunk_info(dset, H5S_ALL, chk_index, out_offset, &read_flt_msk, &addr, &size);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret != FAIL)
FAIL_PUTS_ERROR(" Attempt to get info of a non-existing chunk.");
@@ -698,7 +698,7 @@ test_get_chunk_info_highest_v18(hid_t fapl)
{
ret = H5Dget_chunk_info(dset, dspace, chk_index, out_offset, &read_flt_msk, &addr, &size);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret != FAIL)
FAIL_PUTS_ERROR(" Attempt to get info of a non-existing chunk.");
@@ -798,7 +798,7 @@ error:
H5Pclose(cparms);
H5Fclose(chunkfile);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return FAIL;
@@ -922,7 +922,7 @@ test_chunk_info_single_chunk(const char *filename, hid_t fapl)
{
ret = H5Dget_chunk_info(dset, dspace, chk_index, out_offset, &read_flt_msk, &addr, &size);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret != FAIL)
TEST_ERROR;
@@ -945,7 +945,7 @@ error:
H5Pclose(cparms);
H5Fclose(chunkfile);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return FAIL;
@@ -1064,7 +1064,7 @@ error:
H5Pclose(cparms);
H5Fclose(chunkfile);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return FAIL;
@@ -1170,7 +1170,7 @@ test_chunk_info_fixed_array(const char *filename, hid_t fapl)
{
ret = H5Dget_chunk_info(dset, dspace, chk_index, out_offset, &read_flt_msk, &addr, &size);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret != FAIL)
FAIL_PUTS_ERROR(" Attempted to get info of a chunk using an out-of-range index.");
@@ -1207,7 +1207,7 @@ error:
H5Pclose(cparms);
H5Fclose(chunkfile);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return FAIL;
@@ -1319,7 +1319,7 @@ test_chunk_info_extensible_array(const char *filename, hid_t fapl)
{
ret = H5Dget_chunk_info(dset, dspace, chk_index, out_offset, &read_flt_msk, &addr, &size);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret != FAIL)
FAIL_PUTS_ERROR(" Attempted to get info of a chunk using an out-of-range index.");
@@ -1356,7 +1356,7 @@ error:
H5Pclose(cparms);
H5Fclose(chunkfile);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return FAIL;
@@ -1468,7 +1468,7 @@ test_chunk_info_version2_btrees(const char *filename, hid_t fapl)
{
ret = H5Dget_chunk_info(dset, dspace, chk_index, out_offset, &read_flt_msk, &addr, &size);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret != FAIL)
FAIL_PUTS_ERROR(" Attempted to get info of a chunk using an out-of-range index.");
@@ -1505,7 +1505,7 @@ error:
H5Pclose(cparms);
H5Fclose(chunkfile);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return FAIL;
@@ -1665,7 +1665,7 @@ test_basic_query(hid_t fapl)
{
ret = H5Dget_chunk_info(dset, dspace, chk_index, out_offset, &read_flt_msk, &addr, &size);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret != FAIL)
TEST_ERROR;
@@ -1744,7 +1744,7 @@ test_basic_query(hid_t fapl)
{
ret = H5Dchunk_iter(dset, H5P_DEFAULT, &iter_cb_fail, &cptr);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
if (cptr != &(chunk_infos[1]))
@@ -1774,7 +1774,7 @@ error:
H5Pclose(cparms);
H5Fclose(basicfile);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return FAIL;
@@ -1852,7 +1852,7 @@ test_failed_attempts(const char *filename, hid_t fapl)
{
ret = H5Dget_num_chunks(dset, dspace, &nchunks);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret != FAIL)
FAIL_PUTS_ERROR(" Attempt a chunk query function on a contiguous dataset.");
@@ -1863,7 +1863,7 @@ test_failed_attempts(const char *filename, hid_t fapl)
{
ret = H5Dget_chunk_info(dset, dspace, chk_index, out_offset, &read_flt_msk, &addr, &size);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret != FAIL)
FAIL_PUTS_ERROR(" Attempt a chunk query function on a contiguous dataset.");
@@ -1875,7 +1875,7 @@ test_failed_attempts(const char *filename, hid_t fapl)
{
ret = H5Dget_chunk_info_by_coord(dset, offset, &read_flt_msk, &addr, &size);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret != FAIL)
FAIL_PUTS_ERROR(" Attempt a chunk query function on a contiguous dataset.");
@@ -1897,7 +1897,7 @@ error:
H5Sclose(dspace);
H5Fclose(chunkfile);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return FAIL;
@@ -2185,7 +2185,7 @@ error:
H5Pclose(dxpl);
H5Fclose(filter_file);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return FAIL;
diff --git a/test/cork.c b/test/cork.c
index ad10fa2..5a81b25 100644
--- a/test/cork.c
+++ b/test/cork.c
@@ -275,7 +275,7 @@ error:
H5Pclose(dcpl3);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(buf);
HDfree(buf_data);
@@ -483,7 +483,7 @@ error:
H5Pclose(fapl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* verify_obj_dset_cork */
@@ -738,7 +738,7 @@ error:
H5Pclose(fapl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(buf);
HDfree(buf_data);
@@ -911,7 +911,7 @@ error:
H5Pclose(fapl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* verify_group_cork */
@@ -1186,7 +1186,7 @@ error:
H5Pclose(fapl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* verify_named_cork */
@@ -1478,7 +1478,7 @@ verify_multiple_cork(hbool_t swmr)
{
ret = H5Odisable_mdc_flushes(aidg2);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -1487,7 +1487,7 @@ verify_multiple_cork(hbool_t swmr)
{
ret = H5Odisable_mdc_flushes(aidd1);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -1496,7 +1496,7 @@ verify_multiple_cork(hbool_t swmr)
{
ret = H5Oare_mdc_flushes_disabled(aidt2, &corked);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -1520,7 +1520,7 @@ verify_multiple_cork(hbool_t swmr)
ret = H5Oare_mdc_flushes_disabled(fid1, &corked);
ret = H5Odisable_mdc_flushes(fid1);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -1529,7 +1529,7 @@ verify_multiple_cork(hbool_t swmr)
{
ret = H5Oenable_mdc_flushes(fid2);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -1563,7 +1563,7 @@ error:
H5Fclose(fid1);
H5Fclose(fid1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* verify_multiple_cork */
@@ -1667,7 +1667,7 @@ test_objs_cork(hbool_t swmr, hbool_t new_format)
{
ret = H5Odisable_mdc_flushes(tid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -1706,7 +1706,7 @@ test_objs_cork(hbool_t swmr, hbool_t new_format)
{
ret = H5Oenable_mdc_flushes(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -1723,7 +1723,7 @@ test_objs_cork(hbool_t swmr, hbool_t new_format)
{
ret = H5Oare_mdc_flushes_disabled(aid, &corked);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -1766,7 +1766,7 @@ test_objs_cork(hbool_t swmr, hbool_t new_format)
{
ret = H5Odisable_mdc_flushes(gid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -1791,7 +1791,7 @@ test_objs_cork(hbool_t swmr, hbool_t new_format)
{
ret = H5Oenable_mdc_flushes(tid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -1865,7 +1865,7 @@ error:
H5Pclose(fapl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_objs_cork() */
@@ -2215,7 +2215,7 @@ error:
H5Pclose(fapl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(wbuf);
HDfree(wbuf_data);
diff --git a/test/cross_read.c b/test/cross_read.c
index c1073cb..2c82306 100644
--- a/test/cross_read.c
+++ b/test/cross_read.c
@@ -126,7 +126,7 @@ error:
{
H5Dclose(did);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end check_data_i() */
@@ -200,7 +200,7 @@ error:
{
H5Dclose(did);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end check_data_f() */
@@ -334,7 +334,7 @@ error:
{
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return nerrors;
} /* end check_file() */
diff --git a/test/dangle.c b/test/dangle.c
index 36984b8..05d7110 100644
--- a/test/dangle.c
+++ b/test/dangle.c
@@ -84,7 +84,7 @@ test_dangle_dataset(H5F_close_degree_t degree)
0)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
if (H5Sclose(sid) < 0)
TEST_ERROR;
@@ -100,7 +100,7 @@ test_dangle_dataset(H5F_close_degree_t degree)
if (H5Fclose(fid) >= 0)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
} /* end if */
else if (H5Fclose(fid) < 0)
TEST_ERROR;
@@ -175,7 +175,7 @@ test_dangle_group(H5F_close_degree_t degree)
{
gid = H5Gcreate2(fid, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (gid >= 0)
TEST_ERROR;
@@ -193,7 +193,7 @@ test_dangle_group(H5F_close_degree_t degree)
if (H5Fclose(fid) >= 0)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
} /* end if */
else if (H5Fclose(fid) < 0)
TEST_ERROR;
@@ -274,7 +274,7 @@ test_dangle_datatype1(H5F_close_degree_t degree)
if (H5Tcommit2(fid, TYPENAME, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) >= 0)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
if (H5Tclose(tid) < 0)
TEST_ERROR;
@@ -289,7 +289,7 @@ test_dangle_datatype1(H5F_close_degree_t degree)
if (H5Fclose(fid) >= 0)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
} /* end if */
else if (H5Fclose(fid) < 0)
TEST_ERROR;
@@ -374,7 +374,7 @@ test_dangle_datatype2(H5F_close_degree_t degree)
if (H5Fclose(fid) >= 0)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
} /* end if */
else if (H5Fclose(fid) < 0)
TEST_ERROR;
@@ -462,7 +462,7 @@ test_dangle_attribute(H5F_close_degree_t degree)
if ((aid = H5Acreate2(dsid, ATTRNAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT)) >= 0)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
if (H5Sclose(sid) < 0)
TEST_ERROR;
@@ -481,7 +481,7 @@ test_dangle_attribute(H5F_close_degree_t degree)
if (H5Fclose(fid) >= 0)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
} /* end if */
else if (H5Fclose(fid) < 0)
TEST_ERROR;
diff --git a/test/direct_chunk.c b/test/direct_chunk.c
index d6f094e..c3037a7 100644
--- a/test/direct_chunk.c
+++ b/test/direct_chunk.c
@@ -364,7 +364,7 @@ error:
H5Pclose(cparms);
H5Pclose(dxpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (outbuf)
HDfree(outbuf);
@@ -476,7 +476,7 @@ error:
H5Sclose(sid);
H5Dclose(did);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return 1;
@@ -659,7 +659,7 @@ error:
H5Pclose(cparms);
H5Pclose(dxpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return 1;
@@ -935,7 +935,7 @@ error:
H5Pclose(cparms);
H5Pclose(dxpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return 1;
@@ -1171,7 +1171,7 @@ error:
H5Tclose(st);
H5Tclose(dt);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return 1;
@@ -1251,7 +1251,7 @@ test_invalid_parameters(hid_t file)
if ((status = H5Dwrite_chunk(dataset, dxpl, filter_mask, offset, buf_size, direct_buf)) != FAIL)
goto error;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Try to get chunk size for a contiguous dataset. It should fail */
H5E_BEGIN_TRY
@@ -1259,7 +1259,7 @@ test_invalid_parameters(hid_t file)
if ((status = H5Dget_chunk_storage_size(dataset, offset, &chunk_nbytes)) != FAIL)
goto error;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Try to H5Dread_chunk from the contiguous dataset. It should fail */
H5E_BEGIN_TRY
@@ -1267,7 +1267,7 @@ test_invalid_parameters(hid_t file)
if ((status = H5Dread_chunk(dataset, dxpl, offset, &filter_mask, direct_buf)) != FAIL)
goto error;
}
- H5E_END_TRY;
+ H5E_END_TRY
if (H5Dclose(dataset) < 0)
goto error;
@@ -1293,14 +1293,14 @@ test_invalid_parameters(hid_t file)
if ((status = H5Dwrite_chunk((hid_t)-1, dxpl, filter_mask, offset, buf_size, direct_buf)) != FAIL)
goto error;
}
- H5E_END_TRY;
+ H5E_END_TRY
H5E_BEGIN_TRY
{
if ((status = H5Dread_chunk((hid_t)-1, dxpl, offset, &filter_mask, direct_buf)) != FAIL)
goto error;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Check invalid DXPL ID for H5Dwrite_chunk and H5Dread_chunk */
H5E_BEGIN_TRY
@@ -1308,14 +1308,14 @@ test_invalid_parameters(hid_t file)
if ((status = H5Dwrite_chunk(dataset, (hid_t)-1, filter_mask, offset, buf_size, direct_buf)) != FAIL)
goto error;
}
- H5E_END_TRY;
+ H5E_END_TRY
H5E_BEGIN_TRY
{
if ((status = H5Dread_chunk(dataset, (hid_t)-1, offset, &filter_mask, direct_buf)) != FAIL)
goto error;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Check invalid OFFSET for H5Dwrite_chunk and H5Dread_chunk */
H5E_BEGIN_TRY
@@ -1323,14 +1323,14 @@ test_invalid_parameters(hid_t file)
if ((status = H5Dwrite_chunk(dataset, dxpl, filter_mask, NULL, buf_size, direct_buf)) != FAIL)
goto error;
}
- H5E_END_TRY;
+ H5E_END_TRY
H5E_BEGIN_TRY
{
if ((status = H5Dread_chunk(dataset, dxpl, NULL, &filter_mask, direct_buf)) != FAIL)
goto error;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Check when OFFSET is out of dataset range for H5Dwrite_chunk and H5Dread_chunk */
offset[0] = NX + 1;
@@ -1340,14 +1340,14 @@ test_invalid_parameters(hid_t file)
if ((status = H5Dwrite_chunk(dataset, dxpl, filter_mask, offset, buf_size, direct_buf)) != FAIL)
goto error;
}
- H5E_END_TRY;
+ H5E_END_TRY
H5E_BEGIN_TRY
{
if ((status = H5Dread_chunk(dataset, dxpl, offset, &filter_mask, direct_buf)) != FAIL)
goto error;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Check when OFFSET is not on chunk boundary for H5Dwrite_chunk and H5Dread_chunk */
offset[0] = CHUNK_NX;
@@ -1357,14 +1357,14 @@ test_invalid_parameters(hid_t file)
if ((status = H5Dwrite_chunk(dataset, dxpl, filter_mask, offset, buf_size, direct_buf)) != FAIL)
goto error;
}
- H5E_END_TRY;
+ H5E_END_TRY
H5E_BEGIN_TRY
{
if ((status = H5Dread_chunk(dataset, dxpl, offset, &filter_mask, direct_buf)) != FAIL)
goto error;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Check invalid buffer size for H5Dwrite_chunk only */
offset[0] = CHUNK_NX;
@@ -1375,7 +1375,7 @@ test_invalid_parameters(hid_t file)
if ((status = H5Dwrite_chunk(dataset, dxpl, filter_mask, offset, buf_size, direct_buf)) != FAIL)
goto error;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Check invalid data buffer for H5Dwrite_chunk and H5Dread_chunk */
buf_size = CHUNK_NX * CHUNK_NY * sizeof(int);
@@ -1384,14 +1384,14 @@ test_invalid_parameters(hid_t file)
if ((status = H5Dwrite_chunk(dataset, dxpl, filter_mask, offset, buf_size, NULL)) != FAIL)
goto error;
}
- H5E_END_TRY;
+ H5E_END_TRY
H5E_BEGIN_TRY
{
if ((status = H5Dread_chunk(dataset, dxpl, offset, &filter_mask, NULL)) != FAIL)
goto error;
}
- H5E_END_TRY;
+ H5E_END_TRY
if (H5Dclose(dataset) < 0)
goto error;
@@ -1416,7 +1416,7 @@ error:
H5Pclose(cparms);
H5Pclose(dxpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return 1;
@@ -1604,7 +1604,7 @@ error:
H5Pclose(dxpl);
H5Pclose(dapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (outbuf)
HDfree(outbuf);
@@ -1793,7 +1793,7 @@ error:
H5Pclose(cparms);
H5Pclose(dxpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (outbuf)
HDfree(outbuf);
@@ -1952,7 +1952,7 @@ error:
H5Pclose(cparms);
H5Pclose(dxpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return 1;
@@ -2035,7 +2035,7 @@ test_read_unallocated_chunk(hid_t file)
{
status = H5Dread_chunk(dataset, dxpl, offset, &filter_mask, &direct_buf);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Check that the chunk read call does not succeed. */
if (status != -1)
@@ -2047,7 +2047,7 @@ test_read_unallocated_chunk(hid_t file)
{
status = H5Dget_chunk_storage_size(dataset, offset, &direct_chunk_nbytes);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Check that the chunk storage size call does not succeed. */
if (status != -1)
@@ -2081,7 +2081,7 @@ error:
H5Pclose(cparms);
H5Pclose(dxpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return 1;
@@ -2238,7 +2238,7 @@ error:
H5Pclose(fapl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return 1;
diff --git a/test/dsets.c b/test/dsets.c
index 9208233..63ceb4d 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -416,7 +416,7 @@ test_create(hid_t file)
dataset = H5Dcreate2(file, DSET_DEFAULT_NAME, H5T_NATIVE_DOUBLE, space, H5P_DEFAULT, H5P_DEFAULT,
H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (dataset >= 0) {
H5_FAILED();
HDputs(" Library allowed overwrite of existing dataset.");
@@ -443,7 +443,7 @@ test_create(hid_t file)
{
dataset = H5Dopen2(file, "does_not_exist", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (dataset >= 0) {
H5_FAILED();
HDputs(" Opened a non-existent dataset.");
@@ -467,7 +467,7 @@ test_create(hid_t file)
dataset = H5Dcreate2(file, DSET_CHUNKED_NAME, H5T_NATIVE_DOUBLE, space, H5P_DEFAULT, create_parms,
H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (dataset >= 0) {
H5_FAILED();
HDputs(" Opened a dataset with incorrect chunking parameters.");
@@ -945,7 +945,7 @@ test_compact_io(hid_t fapl)
{
ret = H5Pset_libver_bounds(new_fapl, low, high);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret < 0) /* Invalid low/high combinations */
continue;
@@ -1039,7 +1039,7 @@ error:
H5Fclose(file);
H5Fclose(verfile);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_compact_io() */
@@ -1169,7 +1169,7 @@ test_max_compact(hid_t fapl)
{
H5Dcreate2(file, DSET_COMPACT_MAX2_NAME, H5T_NATIVE_INT, space, H5P_DEFAULT, plist, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Close file */
if (H5Sclose(space) < 0)
@@ -1196,7 +1196,7 @@ error:
H5Dclose(dataset);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_max_compact() */
@@ -1254,7 +1254,7 @@ test_layout_extend(hid_t fapl)
FAIL)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Create dataset with extendible dataspace (unlimited max_dims) should fail */
H5E_BEGIN_TRY
@@ -1263,7 +1263,7 @@ test_layout_extend(hid_t fapl)
FAIL)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Create property list for contiguous dataset creation */
if ((dcpl_contig = H5Pcreate(H5P_DATASET_CREATE)) < 0)
@@ -1277,7 +1277,7 @@ test_layout_extend(hid_t fapl)
if (H5Dcreate2(fid, "contig", H5T_NATIVE_INT, sid_fix, H5P_DEFAULT, dcpl_contig, H5P_DEFAULT) != FAIL)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Create dataset with extendible dataspace (unlimited max_dims) should fail*/
H5E_BEGIN_TRY
@@ -1286,7 +1286,7 @@ test_layout_extend(hid_t fapl)
FAIL)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Create property list for chunked dataset creation */
if ((dcpl_chunked = H5Pcreate(H5P_DATASET_CREATE)) < 0)
@@ -1342,7 +1342,7 @@ error:
H5Dclose(did_unlim);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_layout_extend() */
@@ -1469,7 +1469,7 @@ test_conv_buffer(hid_t fid)
{
status = H5Dread(dataset, ctype2, H5S_ALL, H5S_ALL, xfer_list, cfrR);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" Library shouldn't allow conversion buffer too small");
@@ -1527,7 +1527,7 @@ error:
H5Tclose(arr_type5);
H5Dclose(dataset);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_conv_buffer() */
@@ -1613,7 +1613,7 @@ error:
H5Dclose(dataset);
H5Sclose(space);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_tconv() */
@@ -2006,7 +2006,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
{
status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
TEST_ERROR;
@@ -2024,7 +2024,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
{
status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
TEST_ERROR;
}
@@ -2073,7 +2073,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
{
status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
TEST_ERROR;
@@ -2091,7 +2091,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
{
status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
TEST_ERROR;
}
@@ -2137,7 +2137,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
{
status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
TEST_ERROR;
@@ -2156,7 +2156,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
{
status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
TEST_ERROR;
} /* end if */
@@ -2204,7 +2204,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
{
status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
TEST_ERROR;
@@ -2222,7 +2222,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
{
status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, write_dxpl, check_data);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
TEST_ERROR;
}
@@ -2474,7 +2474,7 @@ test_get_filter_info(void)
{
err = H5Zget_filter_info(-1, &flags);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (err >= 0)
TEST_ERROR;
@@ -3020,7 +3020,7 @@ test_missing_filter(hid_t file)
{
ret = H5Dread(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, check_data);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0) {
H5_FAILED();
HDprintf(" Line %d: Should not be able to read dataset data\n", __LINE__);
@@ -5718,7 +5718,7 @@ error:
H5Sclose(space);
H5Pclose(dcpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_multiopen() */
@@ -5829,7 +5829,7 @@ error:
H5Sclose(space);
H5Dclose(dset);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_types() */
@@ -5908,7 +5908,7 @@ test_can_apply(hid_t file)
{
dsid = H5Dcreate2(file, DSET_CAN_APPLY_NAME, H5T_NATIVE_DOUBLE, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (dsid >= 0) {
H5_FAILED();
HDprintf(" Line %d: Shouldn't have created dataset!\n", __LINE__);
@@ -5921,7 +5921,7 @@ test_can_apply(hid_t file)
{
dsid = H5Dcreate2(file, DSET_CAN_APPLY_NAME, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (dsid >= 0) {
H5_FAILED();
HDprintf(" Line %d: Shouldn't have created dataset!\n", __LINE__);
@@ -6276,7 +6276,7 @@ error:
H5Tclose(strtid);
H5Tclose(vlentid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_optional_filters() */
@@ -6344,7 +6344,7 @@ test_can_apply_szip(hid_t
{
ret = H5Pset_szip(dcpl, szip_options_mask, szip_pixels_per_block);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0) {
H5_FAILED();
HDprintf(" Line %d: Shouldn't be able to set szip filter\n", __LINE__);
@@ -6357,7 +6357,7 @@ test_can_apply_szip(hid_t
{
ret = H5Pset_szip(dcpl, szip_options_mask, szip_pixels_per_block);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0) {
H5_FAILED();
HDprintf(" Line %d: Shouldn't be able to set szip filter\n", __LINE__);
@@ -6380,7 +6380,7 @@ test_can_apply_szip(hid_t
dsid = H5Dcreate2(file, DSET_CAN_APPLY_SZIP_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl,
H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (dsid <= 0) {
H5_FAILED();
HDprintf(" Line %d: Should have created dataset!\n", __LINE__);
@@ -6442,7 +6442,7 @@ test_can_apply_szip(hid_t
dsid = H5Dcreate2(file, DSET_CAN_APPLY_SZIP_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl,
H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (dsid >= 0) {
H5_FAILED();
HDprintf(" Line %d: Shouldn't have created dataset!\n", __LINE__);
@@ -6854,7 +6854,7 @@ error:
H5Pclose(dcpl1);
H5Pclose(dcpl2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_compare_dcpl() */
@@ -7017,7 +7017,7 @@ error:
H5Pclose(dcpl1_copy);
H5Pclose(dcpl2_copy);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_copy_dcpl() */
@@ -7103,7 +7103,7 @@ test_filter_delete(hid_t file)
{
ret = H5Pget_filter_by_id2(dcpl1, H5Z_FILTER_DEFLATE, &flags, NULL, NULL, (size_t)0, NULL, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0) {
H5_FAILED();
HDprintf(" Line %d: Shouldn't have deleted filter!\n", __LINE__);
@@ -7115,7 +7115,7 @@ test_filter_delete(hid_t file)
{
ret = H5Premove_filter(dcpl1, H5Z_FILTER_DEFLATE);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0) {
H5_FAILED();
HDprintf(" Line %d: Shouldn't have deleted filter!\n", __LINE__);
@@ -7165,7 +7165,7 @@ error:
H5Dclose(dsid);
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
#else
(void)file; /* Silence compiler */
@@ -7255,7 +7255,7 @@ error:
if (buf)
HDfree(buf);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end auxread_fdata() */
@@ -7332,7 +7332,7 @@ error:
H5Sclose(sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_filters_endianess() */
@@ -7393,7 +7393,7 @@ test_zero_dims(hid_t file)
{
d = H5Dcreate2(file, ZERODIM_DATASET, H5T_NATIVE_INT, s, H5P_DEFAULT, dcpl, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (d > 0) {
H5Dclose(d);
FAIL_PUTS_ERROR("created dataset with undefined chunk dimensions");
@@ -7404,7 +7404,7 @@ test_zero_dims(hid_t file)
{
ret = H5Pset_chunk(dcpl, 1, &dzero);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret > 0)
FAIL_PUTS_ERROR("set zero-sized chunk dimensions");
@@ -7474,7 +7474,7 @@ test_zero_dims(hid_t file)
{
d2 = H5Dcreate2(file, ZERODIM_DATASET2, H5T_NATIVE_INT, s2, H5P_DEFAULT, dcpl2, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (d2 > 0) {
H5Dclose(d2);
FAIL_PUTS_ERROR("created dataset with undefined chunk dimensions");
@@ -7485,7 +7485,7 @@ test_zero_dims(hid_t file)
{
ret = H5Pset_chunk(dcpl2, 2, dzero2);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret > 0)
FAIL_PUTS_ERROR("set zero-sized chunk dimensions");
@@ -7541,7 +7541,7 @@ error:
H5Dclose(d2);
H5Sclose(s2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_zero_dims() */
@@ -7792,7 +7792,7 @@ error:
H5Sclose(s);
H5Sclose(sid2);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(rdata);
HDfree(wdata);
@@ -8336,7 +8336,7 @@ error:
H5Dclose(d);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_random_chunks_real() */
@@ -8375,7 +8375,6 @@ test_random_chunks(hid_t fapl)
nerrors += test_random_chunks_real("Write/read on randomly selected chunks w/implicit index", TRUE, fapl);
return nerrors;
- ;
} /* end test_random_chunks() */
#ifndef H5_NO_DEPRECATED_SYMBOLS
@@ -8457,7 +8456,7 @@ test_deprec(hid_t file)
{
dataset = H5Dcreate1(file, DSET_DEFAULT_NAME, H5T_NATIVE_DOUBLE, space, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (dataset >= 0) {
H5_FAILED();
HDputs(" Library allowed overwrite of existing dataset.");
@@ -8482,7 +8481,7 @@ test_deprec(hid_t file)
{
dataset = H5Dopen1(file, "does_not_exist");
}
- H5E_END_TRY;
+ H5E_END_TRY
if (dataset >= 0) {
H5_FAILED();
HDputs(" Opened a non-existent dataset.");
@@ -8535,7 +8534,7 @@ test_deprec(hid_t file)
{
dataset = H5Dcreate1(file, DSET_DEPREC_NAME_CHUNKED, H5T_NATIVE_DOUBLE, space, create_parms);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (dataset >= 0) {
H5_FAILED();
HDputs(" Opened a dataset with incorrect chunking parameters.");
@@ -8660,7 +8659,7 @@ test_huge_chunks(hid_t fapl)
{
ret = H5Pset_chunk(dcpl, 1, &chunk_dim);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
FAIL_PUTS_ERROR(" Set chunk size with too large of chunk dimensions.");
@@ -8672,7 +8671,7 @@ test_huge_chunks(hid_t fapl)
{
ret = H5Pset_chunk(dcpl, 3, chunk_dim2);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
FAIL_PUTS_ERROR(" Set chunk size with too large of chunk dimensions.");
@@ -8691,7 +8690,7 @@ test_huge_chunks(hid_t fapl)
{
dsid = H5Dcreate2(fid, HUGE_DATASET, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (dsid >= 0)
FAIL_PUTS_ERROR(" 1-D Dataset with too large of chunk dimensions created.");
@@ -8718,7 +8717,7 @@ test_huge_chunks(hid_t fapl)
{
dsid = H5Dcreate2(fid, HUGE_DATASET2, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (dsid >= 0)
FAIL_PUTS_ERROR(" n-D Dataset with too large of chunk dimensions created.");
@@ -8743,7 +8742,7 @@ error:
H5Sclose(sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_huge_chunks() */
@@ -9011,7 +9010,7 @@ error:
H5Sclose(sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_chunk_cache() */
@@ -9380,7 +9379,7 @@ error:
H5Sclose(t_sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(wdata);
HDfree(rdata1);
@@ -9806,7 +9805,7 @@ error:
H5Fclose(fid);
H5Pclose(my_fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_chunk_fast() */
@@ -9944,7 +9943,7 @@ error:
H5Sclose(scalar_sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_reopen_chunk_fast() */
@@ -10089,7 +10088,7 @@ error:
H5Sclose(sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(wbuf);
HDfree(rbuf);
@@ -10276,7 +10275,7 @@ test_chunk_expand(hid_t fapl)
{
dsid = H5Dcreate2(fid, "dset", H5T_NATIVE_UINT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (dsid >= 0)
FAIL_PUTS_ERROR("should fail to create dataset when allocation time is early");
@@ -10284,7 +10283,7 @@ test_chunk_expand(hid_t fapl)
{
dsid2 = H5Dcreate2(fid, "dset2", H5T_NATIVE_UINT, sid2, H5P_DEFAULT, dcpl2, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (dsid2 >= 0)
FAIL_PUTS_ERROR("should fail to create dataset when allocation time is early");
@@ -10381,7 +10380,7 @@ test_chunk_expand(hid_t fapl)
{
status = H5Dwrite(dsid, H5T_NATIVE_UINT, scalar_sid, sid, H5P_DEFAULT, &write_elem);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
FAIL_PUTS_ERROR("should fail to write to dataset when allocation time is not early");
@@ -10390,7 +10389,7 @@ test_chunk_expand(hid_t fapl)
status =
H5Dwrite(dsid2, H5T_NATIVE_UINT, scalar_sid, sid2, H5P_DEFAULT, &write_elem2);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
FAIL_PUTS_ERROR("should fail to write to dataset when allocation time is not early");
} /* end for */
@@ -10477,7 +10476,7 @@ test_chunk_expand(hid_t fapl)
status =
H5Dwrite(dsid, H5T_NATIVE_UINT, scalar_sid, sid, H5P_DEFAULT, &write_elem);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
FAIL_PUTS_ERROR(
"should fail to write to dataset when allocation time is not early");
@@ -10487,7 +10486,7 @@ test_chunk_expand(hid_t fapl)
status =
H5Dwrite(dsid2, H5T_NATIVE_UINT, scalar_sid, sid2, H5P_DEFAULT, &write_elem2);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
FAIL_PUTS_ERROR(
"should fail to write to dataset when allocation time is not early");
@@ -10616,7 +10615,7 @@ test_chunk_expand(hid_t fapl)
{
status = H5Dwrite(dsid, H5T_NATIVE_UINT, scalar_sid, sid, H5P_DEFAULT, &write_elem);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
FAIL_PUTS_ERROR("should fail to write to dataset when allocation time is not early");
@@ -10625,7 +10624,7 @@ test_chunk_expand(hid_t fapl)
status =
H5Dwrite(dsid2, H5T_NATIVE_UINT, scalar_sid, sid2, H5P_DEFAULT, &write_elem2);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
FAIL_PUTS_ERROR("should fail to write to dataset when allocation time is not early");
} /* end for */
@@ -10685,7 +10684,7 @@ error:
H5Sclose(scalar_sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_chunk_expand() */
@@ -11217,7 +11216,7 @@ error:
H5Sclose(mem_id);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(wbuf_big);
HDfree(rbuf_big);
@@ -11516,7 +11515,7 @@ error:
H5Sclose(sid_max);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (wbuf)
HDfree(wbuf);
if (rbuf)
@@ -11603,7 +11602,7 @@ error:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_idx_compatible() */
@@ -11744,7 +11743,7 @@ error:
H5Sclose(sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_unfiltered_edge_chunks() */
@@ -11880,7 +11879,7 @@ error:
H5Sclose(scalar_sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_large_chunk_shrink() */
@@ -11924,7 +11923,7 @@ test_zero_dim_dset(hid_t fapl)
{
ret = H5Pset_libver_bounds(fapl, low, high);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret < 0) /* Invalid low/high combinations */
continue;
@@ -11986,7 +11985,7 @@ error:
H5Sclose(sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_zero_dim_dset() */
@@ -12257,7 +12256,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* test_swmr_non_latest() */
@@ -12378,7 +12377,7 @@ error:
H5Sclose(sid);
H5Sclose(msid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* test_earray_hdr_fd() */
@@ -12499,7 +12498,7 @@ error:
H5Sclose(sid);
H5Sclose(msid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_farray_hdr_fd() */
@@ -12626,7 +12625,7 @@ error:
H5Sclose(sid);
H5Sclose(msid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_bt2_hdr_fd() */
@@ -13116,7 +13115,7 @@ error:
H5Sclose(sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_storage_size() */
@@ -13184,7 +13183,7 @@ test_power2up(hid_t fapl)
{
status = H5Dset_extent(did, ext_dims);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
TEST_ERROR;
@@ -13211,7 +13210,7 @@ error:
H5Pclose(dcpl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_power2up() */
@@ -13523,7 +13522,7 @@ error:
{
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_scatter() */
@@ -13890,7 +13889,7 @@ error:
{
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_gather() */
@@ -14123,7 +14122,7 @@ error:
{
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_scatter_error() */
@@ -14289,7 +14288,7 @@ error:
{
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_gather_error() */
@@ -14653,7 +14652,7 @@ test_compact_open_close_dirty(hid_t fapl)
{
did = H5Dopen2(fid, DSET_COMPACT_MAX_NAME, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (did < 0)
TEST_ERROR;
if (H5Dclose(did) < 0)
@@ -14699,7 +14698,7 @@ error:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_compact_open_close_dirty() */
@@ -14784,7 +14783,7 @@ test_versionbounds(void)
{
ret = H5Pset_libver_bounds(fapl, low, high);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret < 0) /* Invalid low/high combinations */
continue;
@@ -14805,7 +14804,7 @@ test_versionbounds(void)
{
vdset = H5Dcreate2(vfile, V_DSET, H5T_NATIVE_INT, vspace, H5P_DEFAULT, dcpl, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (vdset > 0) /* dataset created successfully */
{
@@ -14862,7 +14861,7 @@ error:
H5Fclose(srcfile);
H5Fclose(vfile);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_versionbounds() */
@@ -14940,7 +14939,7 @@ test_object_header_minimization_dcpl(void)
{
ret = H5Pget_dset_no_attrs_hint(H5I_INVALID_HID, &minimize);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret == SUCCEED)
TEST_ERROR;
@@ -14949,7 +14948,7 @@ test_object_header_minimization_dcpl(void)
{
ret = H5Pset_dset_no_attrs_hint(H5I_INVALID_HID, FALSE);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret == SUCCEED)
TEST_ERROR;
@@ -14958,7 +14957,7 @@ test_object_header_minimization_dcpl(void)
{
ret = H5Pset_dset_no_attrs_hint(H5I_INVALID_HID, TRUE);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret == SUCCEED)
TEST_ERROR;
@@ -14967,7 +14966,7 @@ test_object_header_minimization_dcpl(void)
{
ret = H5Pget_dset_no_attrs_hint(dcpl_id, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret == SUCCEED)
TEST_ERROR;
@@ -14990,7 +14989,7 @@ error:
H5Pclose(dcpl_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_object_header_minimization_dcpl() */
@@ -15048,7 +15047,7 @@ test_h5s_block(void)
{
ret = H5Dwrite(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_BLOCK, H5P_DEFAULT, buf);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret == SUCCEED)
TEST_ERROR;
@@ -15111,7 +15110,7 @@ error:
H5Dclose(dset_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_h5s_block() */
@@ -15180,7 +15179,7 @@ test_h5s_plist(void)
ret = H5Pset_dataset_io_hyperslab_selection(dxpl_id, 0, H5S_SELECT_SET, &start, &stride, &count,
&block);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret == SUCCEED)
TEST_ERROR;
H5E_BEGIN_TRY
@@ -15189,7 +15188,7 @@ test_h5s_plist(void)
ret = H5Pset_dataset_io_hyperslab_selection(dxpl_id, 1, H5S_SELECT_NOOP, &start, &stride, &count,
&block);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret == SUCCEED)
TEST_ERROR;
H5E_BEGIN_TRY
@@ -15198,7 +15197,7 @@ test_h5s_plist(void)
ret =
H5Pset_dataset_io_hyperslab_selection(dxpl_id, 1, H5S_SELECT_SET, NULL, &stride, &count, &block);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret == SUCCEED)
TEST_ERROR;
H5E_BEGIN_TRY
@@ -15209,7 +15208,7 @@ test_h5s_plist(void)
&block);
stride = 1;
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret == SUCCEED)
TEST_ERROR;
H5E_BEGIN_TRY
@@ -15218,7 +15217,7 @@ test_h5s_plist(void)
ret =
H5Pset_dataset_io_hyperslab_selection(dxpl_id, 1, H5S_SELECT_SET, &start, &stride, NULL, &block);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret == SUCCEED)
TEST_ERROR;
@@ -15229,7 +15228,7 @@ test_h5s_plist(void)
/* H5S_PLIST for memory dataspace */
ret = H5Dwrite(dset_id, H5T_NATIVE_INT, H5S_PLIST, H5S_ALL, H5P_DEFAULT, buf);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret == SUCCEED)
TEST_ERROR;
@@ -15288,7 +15287,7 @@ test_h5s_plist(void)
ret = H5Pset_dataset_io_hyperslab_selection(dxpl_id_copy, H5S_MAX_RANK + 1, H5S_SELECT_OR, &start,
&stride, &count, &block);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret == SUCCEED)
TEST_ERROR;
@@ -15353,7 +15352,7 @@ error:
H5Dclose(dset_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_h5s_plist() */
@@ -15547,7 +15546,7 @@ error:
H5Dclose(dset_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_0sized_dset_metadata_alloc() */
diff --git a/test/dt_arith.c b/test/dt_arith.c
index a26945f..b9b8830 100644
--- a/test/dt_arith.c
+++ b/test/dt_arith.c
@@ -106,7 +106,7 @@ static int without_hardware_g = 0;
* This algorithm is mainly to avoid any casting and comparison between source and destination types
* for compiler, because we're testing conversions. */
#define INIT_INTEGER(TYPE, SRC_MAX, SRC_MIN, SRC_SIZE, DST_SIZE, SRC_PREC, BUF, SAVED, NELMTS) \
- { \
+ do { \
unsigned char *buf_p, *saved_p; \
unsigned int n; \
TYPE value1 = 1; \
@@ -160,13 +160,13 @@ static int without_hardware_g = 0;
if (n < SRC_PREC - 1) \
value2 = (TYPE)(value2 << 1); \
} \
- }
+ } while (0)
/* Change a buffer's byte order from big endian to little endian. It's mainly for library's
* bit operations which handle only little endian order.
*/
#define CHANGE_ORDER(EBUF, EORDER, ESIZE) \
- { \
+ do { \
unsigned int m; \
if (H5T_ORDER_BE == EORDER) { \
unsigned char mediator; \
@@ -190,14 +190,14 @@ static int without_hardware_g = 0;
EBUF[(ESIZE - 1) - m] = mediator2; \
} \
} \
- }
+ } while (0)
/* Allocate buffer and initialize it with floating-point normalized values.
* It's for conversion test of floating-point as the source.
*/
#define INIT_FP_NORM(TYPE, SRC_MAX, SRC_MIN, SRC_MAX_10_EXP, SRC_MIN_10_EXP, SRC_SIZE, DST_SIZE, BUF, SAVED, \
NELMTS) \
- { \
+ do { \
unsigned char *buf_p, *saved_p; \
size_t num_norm, factor, n; \
TYPE value1, value2; \
@@ -270,13 +270,13 @@ static int without_hardware_g = 0;
HDmemcpy(saved_p, &value2, SRC_SIZE); \
buf_p += SRC_SIZE; \
saved_p += SRC_SIZE; \
- }
+ } while (0)
/* Allocate buffer and initialize it with floating-point denormalized values.
* It's for conversion test of floating-point as the source.
*/
#define INIT_FP_DENORM(TYPE, SRC_MANT_DIG, SRC_SIZE, SRC_PREC, SRC_ORDR, DST_SIZE, BUF, SAVED, NELMTS) \
- { \
+ do { \
unsigned char *buf_p, *saved_p; \
unsigned char *tmp1, *tmp2; \
size_t n; \
@@ -322,13 +322,13 @@ static int without_hardware_g = 0;
} \
HDfree(tmp1); \
HDfree(tmp2); \
- }
+ } while (0)
/* Allocate buffer and initialize it with floating-point special values, +/-0, +/-infinity,
* +/-QNaN, +/-SNaN. It's for conversion test of floating-point as the source.
*/
#define INIT_FP_SPECIAL(SRC_SIZE, SRC_PREC, SRC_ORDR, SRC_MANT_DIG, DST_SIZE, BUF, SAVED, NELMTS) \
- { \
+ do { \
unsigned char *buf_p; \
unsigned char *value; \
int n; \
@@ -386,7 +386,7 @@ static int without_hardware_g = 0;
\
HDmemcpy(SAVED, BUF, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \
HDfree(value); \
- }
+ } while (0)
static hbool_t overflows(unsigned char *origin_bits, hid_t src_id, size_t dst_num_bits);
static int my_isnan(dtype_t type, void *val);
@@ -763,7 +763,7 @@ error:
{
H5Pclose(dxpl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (buf1)
HDfree(buf1);
if (buf2)
@@ -1220,7 +1220,7 @@ error:
H5Pclose(dxpl_id);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Restore the default error handler (set in h5_reset()) */
h5_restore_err();
@@ -1532,7 +1532,7 @@ error:
H5Pclose(dxpl_id);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Restore the default error handler (set in h5_reset()) */
h5_restore_err();
diff --git a/test/dtransform.c b/test/dtransform.c
index d73bc1a..9bbac8f 100644
--- a/test/dtransform.c
+++ b/test/dtransform.c
@@ -214,7 +214,7 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22,
}
#define TEST_TYPE_CHUNK(XFORM, TYPE, HDF_TYPE, TEST_STR, COMPARE_DATA, SIGNED) \
- { \
+ do { \
struct { \
TYPE arr[ROWS][COLS]; \
} *array = NULL; \
@@ -298,10 +298,10 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22,
TEST_ERROR; \
\
HDfree(array); \
- }
+ } while (0)
#define INVALID_SET_TEST(TRANSFORM) \
- { \
+ do { \
if (H5Pset_data_transform(dxpl_id, TRANSFORM) < 0) { \
PASSED(); \
} \
@@ -310,7 +310,7 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22,
HDfprintf(stderr, " ERROR: Data transform allowed invalid TRANSFORM transform to be set\n"); \
goto error; \
} \
- }
+ } while (0)
int
main(void)
diff --git a/test/dtypes.c b/test/dtypes.c
index bd55491..c7d845d 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -315,7 +315,7 @@ test_copy(void)
{
status = H5Tclose(H5T_NATIVE_SCHAR);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" Should not be able to close a predefined type!");
@@ -599,7 +599,7 @@ test_compound_1(void)
{
ret = H5Tinsert(complex_id, "compound", (size_t)0, complex_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0) {
FAIL_PUTS_ERROR("Inserted compound datatype into itself?");
} /* end if */
@@ -616,7 +616,7 @@ test_compound_1(void)
{
ret = H5Tset_size(complex_id, sizeof(double));
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
@@ -625,7 +625,7 @@ test_compound_1(void)
{
size = H5Tget_precision(complex_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (size > 0) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
@@ -635,7 +635,7 @@ test_compound_1(void)
{
ret = H5Tset_precision(complex_id, size);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
@@ -644,7 +644,7 @@ test_compound_1(void)
{
ret = H5Tget_pad(complex_id, &lsb, &msb);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
@@ -653,7 +653,7 @@ test_compound_1(void)
{
size = H5Tget_ebias(complex_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (size > 0) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
@@ -662,7 +662,7 @@ test_compound_1(void)
{
lsb = H5Tget_inpad(complex_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (lsb >= 0) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
@@ -671,7 +671,7 @@ test_compound_1(void)
{
cset = H5Tget_cset(complex_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (cset > -1) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
@@ -680,7 +680,7 @@ test_compound_1(void)
{
strpad = H5Tget_strpad(complex_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (strpad > -1) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
@@ -689,7 +689,7 @@ test_compound_1(void)
{
offset = H5Tget_offset(complex_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (offset >= 0) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
@@ -704,7 +704,7 @@ test_compound_1(void)
{
sign = H5Tget_sign(complex_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (sign > -1) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
@@ -713,7 +713,7 @@ test_compound_1(void)
{
tag = H5Tget_tag(complex_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (tag) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
@@ -722,7 +722,7 @@ test_compound_1(void)
{
super = H5Tget_super(complex_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (super >= 0) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
@@ -1412,7 +1412,7 @@ test_compound_7(void)
{
ret = H5Tinsert(tid2, "d", HOFFSET(struct s2, d), H5T_NATIVE_DOUBLE);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0) {
H5_FAILED();
HDprintf("Inserted field 'd'?\n");
@@ -1424,7 +1424,7 @@ test_compound_7(void)
{
ret = H5Tset_size(tid2, sizeof(struct s1) / 2);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0) {
H5_FAILED();
HDprintf("Shrunk compound type?\n");
@@ -1656,7 +1656,7 @@ test_compound_8(void)
{
ret = H5Tpack(tid3);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0) {
H5_FAILED();
AT();
@@ -2563,7 +2563,7 @@ test_compound_12(void)
{
ret = H5Tset_size(complex_id, size);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0) {
H5_FAILED();
HDputs(" Tries to cut off the last member. Should have failed.");
@@ -3461,7 +3461,7 @@ error:
H5Sclose(space_id);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_compound_15_attr() */
@@ -3783,7 +3783,7 @@ test_compound_18(void)
{
did = H5Dcreate2(file, "dataset", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (did > 0) {
H5Dclose(did);
FAIL_PUTS_ERROR("created dataset with bad compound datatype");
@@ -3798,7 +3798,7 @@ test_compound_18(void)
{
aid = H5Acreate2(gid, "attr", tid, sid, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (aid > 0) {
H5Aclose(aid);
FAIL_PUTS_ERROR("created attribute with bad compound datatype");
@@ -3809,7 +3809,7 @@ test_compound_18(void)
{
ret = H5Tcommit2(file, "cmpnd", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0) {
FAIL_PUTS_ERROR("committed named datatype with bad compound datatype");
} /* end if */
@@ -3838,7 +3838,7 @@ test_compound_18(void)
{
tid = H5Topen2(file, "cmpnd", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (tid > 0) {
H5Tclose(tid);
FAIL_PUTS_ERROR("opened named datatype with bad compound datatype");
@@ -3849,7 +3849,7 @@ test_compound_18(void)
{
did = H5Dopen2(file, "dataset", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (did > 0) {
H5Dclose(did);
FAIL_PUTS_ERROR("opened dataset with bad compound datatype");
@@ -3864,7 +3864,7 @@ test_compound_18(void)
{
aid = H5Aopen(gid, "attr", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (aid > 0) {
H5Aclose(aid);
FAIL_PUTS_ERROR("opened attribute with bad compound datatype");
@@ -4122,7 +4122,7 @@ error:
H5Tclose(tid2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -4163,7 +4163,7 @@ test_transient(hid_t fapl)
{
status = H5Tset_precision(H5T_NATIVE_INT, (size_t)256);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" Predefined types should not be modifiable!");
@@ -4173,7 +4173,7 @@ test_transient(hid_t fapl)
{
status = H5Tclose(H5T_NATIVE_INT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" Predefined types should not be closable!");
@@ -4191,7 +4191,7 @@ test_transient(hid_t fapl)
{
ret_id = H5Acreate2(type, "attr1", H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret_id >= 0) {
H5_FAILED();
HDputs(" Attributes should not be allowed for transient types!");
@@ -4213,7 +4213,7 @@ test_transient(hid_t fapl)
{
status = H5Tset_precision(t2, (size_t)256);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" Dataset datatypes should not be modifiable!");
@@ -4236,7 +4236,7 @@ test_transient(hid_t fapl)
{
status = H5Tset_precision(t2, (size_t)256);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" Dataset datatypes should not be modifiable!");
@@ -4277,7 +4277,7 @@ error:
H5Dclose(dset);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -4320,7 +4320,7 @@ test_named(hid_t fapl)
status = H5Tcommit2(file, "test_named_1 (should not exist)", H5T_NATIVE_INT, H5P_DEFAULT, H5P_DEFAULT,
H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" Predefined types should not be committable!");
@@ -4345,7 +4345,7 @@ test_named(hid_t fapl)
{
status = H5Tset_precision(type, (size_t)256);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" Committed type is not constant!");
@@ -4358,7 +4358,7 @@ test_named(hid_t fapl)
status =
H5Tcommit2(file, "test_named_2 (should not exist)", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" Committed types should not be recommitted!");
@@ -4532,7 +4532,7 @@ test_named(hid_t fapl)
status =
H5Tcommit2(file, "test_named_3 (should not exist)", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" Types should not be committable to a read-only file!");
@@ -4546,7 +4546,7 @@ test_named(hid_t fapl)
{
status = H5Tcommit_anon(file, type, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" Types should not be committable to a read-only file!");
@@ -4572,7 +4572,7 @@ error:
H5Dclose(dset);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -5010,7 +5010,7 @@ error:
H5Tclose(src_type);
H5Tclose(dst_type);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (buf)
HDfree(buf);
@@ -5081,7 +5081,7 @@ error:
H5Tclose(c_type);
H5Tclose(f_type);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (buf)
HDfree(buf);
@@ -5159,7 +5159,7 @@ test_conv_str_3(void)
{
ret = H5Tset_precision(type, nelmts);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
@@ -5168,7 +5168,7 @@ test_conv_str_3(void)
{
size = H5Tget_ebias(type);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (size > 0) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
@@ -5177,7 +5177,7 @@ test_conv_str_3(void)
{
inpad = H5Tget_inpad(type);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (inpad > -1) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
@@ -5186,7 +5186,7 @@ test_conv_str_3(void)
{
sign = H5Tget_sign(type);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (sign > -1) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
@@ -5195,7 +5195,7 @@ test_conv_str_3(void)
{
tag = H5Tget_tag(type);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (tag) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
@@ -5204,7 +5204,7 @@ test_conv_str_3(void)
{
super = H5Tget_super(type);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (super >= 0) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
@@ -5218,7 +5218,7 @@ error:
H5Tclose(type);
H5Tclose(super);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (buf)
HDfree(buf);
@@ -5299,7 +5299,7 @@ error:
H5Tclose(t1);
H5Tclose(t2);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (buf)
HDfree(buf);
@@ -5538,7 +5538,7 @@ test_bitfield_funcs(void)
{
size = H5Tget_ebias(type);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (size > 0) {
H5_FAILED();
HDprintf("Operation not allowed for this type.\n");
@@ -5549,7 +5549,7 @@ test_bitfield_funcs(void)
{
inpad = H5Tget_inpad(type);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (inpad > -1) {
H5_FAILED();
HDprintf("Operation not allowed for this type.\n");
@@ -5560,7 +5560,7 @@ test_bitfield_funcs(void)
{
cset = H5Tget_cset(type);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (cset > -1) {
H5_FAILED();
HDprintf("Operation not allowed for this type.\n");
@@ -5571,7 +5571,7 @@ test_bitfield_funcs(void)
{
strpad = H5Tget_strpad(type);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (strpad > -1) {
H5_FAILED();
HDprintf("Operation not allowed for this type.\n");
@@ -5582,7 +5582,7 @@ test_bitfield_funcs(void)
{
ret = H5Tset_sign(type, H5T_SGN_2);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0) {
H5_FAILED();
HDprintf("Operation not allowed for this type.\n");
@@ -5593,7 +5593,7 @@ test_bitfield_funcs(void)
{
tag = H5Tget_tag(type);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (tag) {
H5_FAILED();
HDprintf("Operation not allowed for this type.\n");
@@ -5604,7 +5604,7 @@ test_bitfield_funcs(void)
{
super = H5Tget_super(type);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (super >= 0) {
H5_FAILED();
HDprintf("Operation not allowed for this type.\n");
@@ -5732,7 +5732,7 @@ opaque_check(int tag_it)
{
status = H5Tconvert(st, dt, (size_t)OPAQUE_NELMTS, buf, NULL, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDprintf(" opaque conversion should have failed but succeeded\n");
@@ -5804,7 +5804,7 @@ opaque_long(void)
{
ret = H5Tset_tag(dt, long_tag);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret != FAIL)
TEST_ERROR;
@@ -5863,7 +5863,7 @@ opaque_funcs(void)
{
ret = H5Tset_precision(type, (size_t)32);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0) {
HDprintf("Operation not allowed for this type.\n");
TEST_ERROR;
@@ -5873,7 +5873,7 @@ opaque_funcs(void)
{
ret = H5Tset_pad(type, H5T_PAD_ZERO, H5T_PAD_ONE);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0) {
HDprintf("Operation not allowed for this type.\n");
TEST_ERROR;
@@ -5883,7 +5883,7 @@ opaque_funcs(void)
{
size = H5Tget_ebias(type);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (size > 0) {
HDprintf("Operation not allowed for this type.\n");
TEST_ERROR;
@@ -5893,7 +5893,7 @@ opaque_funcs(void)
{
inpad = H5Tget_inpad(type);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (inpad > -1) {
HDprintf("Operation not allowed for this type.\n");
TEST_ERROR;
@@ -5903,7 +5903,7 @@ opaque_funcs(void)
{
cset = H5Tget_cset(type);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (cset > -1) {
HDprintf("Operation not allowed for this type.\n");
TEST_ERROR;
@@ -5913,7 +5913,7 @@ opaque_funcs(void)
{
strpad = H5Tget_strpad(type);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (strpad > -1) {
HDprintf("Operation not allowed for this type.\n");
TEST_ERROR;
@@ -5923,7 +5923,7 @@ opaque_funcs(void)
{
ret = H5Tset_offset(type, (size_t)16);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0) {
HDprintf("Operation not allowed for this type.\n");
TEST_ERROR;
@@ -5933,7 +5933,7 @@ opaque_funcs(void)
{
sign = H5Tget_sign(type);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (sign > -1) {
HDprintf("Operation not allowed for this type.\n");
TEST_ERROR;
@@ -5943,7 +5943,7 @@ opaque_funcs(void)
{
super = H5Tget_super(type);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (super >= 0) {
HDprintf("Operation not allowed for this type.\n");
TEST_ERROR;
@@ -6100,7 +6100,7 @@ test_encode(void)
{
ret_id = H5Tdecode(cmpd_buf);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret_id != FAIL) {
H5_FAILED();
HDprintf("Decoded an empty buffer!\n");
@@ -6452,7 +6452,7 @@ test_encode(void)
{
ret = H5Tclose(decoded_tid1);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret != FAIL) {
H5_FAILED();
HDprintf("Decoded datatype should have been closed\n");
@@ -6463,7 +6463,7 @@ test_encode(void)
{
ret = H5Tclose(decoded_tid2);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret != FAIL) {
H5_FAILED();
HDprintf("Decoded datatype should have been closed\n");
@@ -6474,7 +6474,7 @@ test_encode(void)
{
ret = H5Tclose(decoded_tid3);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret != FAIL) {
H5_FAILED();
HDprintf("Decoded datatype should have been closed\n");
@@ -6525,7 +6525,7 @@ error:
H5Tclose(decoded_tid3);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -6713,7 +6713,7 @@ error:
H5Fclose(file);
H5Pclose(fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_latest() */
@@ -6910,7 +6910,7 @@ error:
{
H5Pclose(dxpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
#endif /* H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 */
} /* end test_int_float_except() */
@@ -7144,7 +7144,7 @@ test_set_order(void)
error:
H5E_BEGIN_TRY
H5Tclose(dtype);
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_set_order() */
@@ -7312,7 +7312,7 @@ error:
H5Tclose(cmpd);
H5Tclose(cmpd_array);
H5Fclose(file);
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_set_order_compound() */
@@ -7575,7 +7575,7 @@ error:
H5Dclose(dset);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (tag_ret)
H5free_memory(tag_ret);
return 1;
@@ -7802,7 +7802,7 @@ error:
H5Fclose(filea2);
H5Fclose(fileb);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_delete_obj_named() */
@@ -8004,7 +8004,7 @@ error:
H5Fclose(attr_fid);
H5Fclose(type_fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_delete_obj_named_fileid() */
@@ -8091,7 +8091,7 @@ test_deprec(hid_t fapl)
{
status = H5Tcommit1(file, "test_named_1 (should not exist)", H5T_NATIVE_INT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
FAIL_PUTS_ERROR(" Predefined types should not be committable!");
@@ -8110,7 +8110,7 @@ test_deprec(hid_t fapl)
{
status = H5Tset_precision(type, (size_t)256);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
FAIL_PUTS_ERROR(" Committed type is not constant!");
@@ -8119,7 +8119,7 @@ test_deprec(hid_t fapl)
{
status = H5Tcommit1(file, "test_named_2 (should not exist)", type);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
FAIL_PUTS_ERROR(" Committed types should not be recommitted!");
@@ -8152,7 +8152,7 @@ test_deprec(hid_t fapl)
{
status = H5Tcommit1(file, "test_named_3 (should not exist)", type);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" Types should not be committable to a read-only file!");
@@ -8174,7 +8174,7 @@ error:
H5Tclose(type);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_deprec() */
#endif /* H5_NO_DEPRECATED_SYMBOLS */
@@ -8435,7 +8435,7 @@ error:
H5Sclose(sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -8578,7 +8578,7 @@ error:
H5Tclose(base_dtype);
H5Tclose(mem_dtype);
}
- H5E_END_TRY;
+ H5E_END_TRY
return ret;
} /* end of verify_version */
@@ -8780,7 +8780,7 @@ test_versionbounds(void)
{
ret = H5Pset_libver_bounds(fapl, versions[low], versions[high]);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret < 0) /* Invalid low/high combinations */
continue;
@@ -8847,7 +8847,7 @@ error:
H5Pclose(fapl);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_versionbounds() */
diff --git a/test/earray.c b/test/earray.c
index eed4bd2..1f82058 100644
--- a/test/earray.c
+++ b/test/earray.c
@@ -626,7 +626,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
{
ea = H5EA_create(f, &test_cparam, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ea) {
/* Close opened extensible array */
H5EA_close(ea);
@@ -643,7 +643,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
{
ea = H5EA_create(f, &test_cparam, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ea) {
/* Close opened extensible array */
H5EA_close(ea);
@@ -659,7 +659,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
{
ea = H5EA_create(f, &test_cparam, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ea) {
/* Close opened extensible array */
H5EA_close(ea);
@@ -676,7 +676,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
{
ea = H5EA_create(f, &test_cparam, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ea) {
/* Close opened extensible array */
H5EA_close(ea);
@@ -691,7 +691,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
{
ea = H5EA_create(f, &test_cparam, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ea) {
/* Close opened extensible array */
H5EA_close(ea);
@@ -706,7 +706,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
{
ea = H5EA_create(f, &test_cparam, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ea) {
/* Close opened extensible array */
H5EA_close(ea);
@@ -723,7 +723,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
{
ea = H5EA_create(f, &test_cparam, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ea) {
/* Close opened extensible array */
H5EA_close(ea);
@@ -742,7 +742,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
{
ea = H5EA_create(f, &test_cparam, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ea) {
/* Close opened extensible array */
H5EA_close(ea);
@@ -759,7 +759,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
{
ea = H5EA_create(f, &test_cparam, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ea) {
/* Close opened extensible array */
H5EA_close(ea);
@@ -774,7 +774,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
{
ea = H5EA_create(f, &test_cparam, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ea) {
/* Close opened extensible array */
H5EA_close(ea);
@@ -825,7 +825,7 @@ error:
H5EA_close(ea);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_create() */
@@ -896,7 +896,7 @@ error:
H5EA_close(ea);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_reopen() */
@@ -1004,7 +1004,7 @@ error:
H5Fclose(file);
H5Fclose(file2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_open_twice() */
@@ -1146,7 +1146,7 @@ error:
H5Fclose(file0);
H5Fclose(file00);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_open_twice_diff() */
@@ -1211,7 +1211,7 @@ test_delete_open(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
{
ea2 = H5EA_open(f, ea_addr, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ea2) {
/* Close opened array */
H5EA_close(ea2);
@@ -1234,7 +1234,7 @@ test_delete_open(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
{
ea = H5EA_open(f, ea_addr, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ea) {
/* Close opened array */
H5EA_close(ea);
@@ -1269,7 +1269,7 @@ error:
H5EA_close(ea2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_delete_open() */
@@ -2224,7 +2224,7 @@ error:
H5EA_close(ea);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_set_elmts() */
@@ -2383,7 +2383,7 @@ error:
H5EA_close(ea);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_skip_elmts() */
@@ -2608,7 +2608,7 @@ error:
{
H5Pclose(fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (api_ctx_pushed)
H5CX_pop(FALSE);
diff --git a/test/enc_dec_plist.c b/test/enc_dec_plist.c
index 5b75178..55c80fb 100644
--- a/test/enc_dec_plist.c
+++ b/test/enc_dec_plist.c
@@ -105,7 +105,7 @@ error:
H5Pclose(pl);
H5Pclose(fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (-1);
} /* end test_encode_decode() */
diff --git a/test/enum.c b/test/enum.c
index 90cbe68..24f8160 100644
--- a/test/enum.c
+++ b/test/enum.c
@@ -116,7 +116,7 @@ error:
H5Tclose(tid);
H5Gclose(gid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -286,7 +286,7 @@ error:
H5Tclose(tid);
H5Gclose(gid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -389,7 +389,7 @@ error:
H5Tclose(f_tid);
H5Gclose(gid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -490,7 +490,7 @@ error:
H5Tclose(f_tid);
H5Gclose(gid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -597,7 +597,7 @@ error:
{
H5Tclose(tid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -662,7 +662,7 @@ test_funcs(void)
{
size = H5Tget_ebias(tid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (size > 0)
FAIL_PUTS_ERROR("H5Tget_ebias should not work with enum types");
@@ -670,7 +670,7 @@ test_funcs(void)
{
inpad = H5Tget_inpad(tid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (inpad > -1)
FAIL_PUTS_ERROR("H5Tget_inpad should not work with enum types");
@@ -678,7 +678,7 @@ test_funcs(void)
{
cset = H5Tget_cset(tid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (cset > -1)
FAIL_PUTS_ERROR("H5Tget_cset should not work with enum types");
@@ -687,7 +687,7 @@ test_funcs(void)
{
ret = H5Tset_offset(tid, size);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
FAIL_PUTS_ERROR("H5Tset_offset should not work with enum types");
@@ -695,7 +695,7 @@ test_funcs(void)
{
ret = H5Tset_order(tid, H5T_ORDER_BE);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
FAIL_PUTS_ERROR("H5Tset_order should not work with enum types");
@@ -710,7 +710,7 @@ error:
{
H5Tclose(tid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
diff --git a/test/err_compat.c b/test/err_compat.c
index 1f7eb45..500b69f 100644
--- a/test/err_compat.c
+++ b/test/err_compat.c
@@ -366,7 +366,7 @@ test_h5epush1(hid_t file)
did =
H5Dcreate2(H5I_INVALID_HID, DSET_NAME, H5T_STD_I32BE, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Create the dataset */
if ((did = H5Dcreate2(file, DSET_NAME, H5T_STD_I32BE, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
diff --git a/test/error_test.c b/test/error_test.c
index 3aa4970..1bcbcd4 100644
--- a/test/error_test.c
+++ b/test/error_test.c
@@ -113,7 +113,7 @@ test_error(hid_t file)
{
dataset = H5Dcreate2(FAKE_ID, DSET_NAME, H5T_STD_I32BE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Create the dataset */
if ((dataset = H5Dcreate2(file, DSET_NAME, H5T_STD_I32BE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) <
diff --git a/test/event_set.c b/test/event_set.c
index df6b8cb..e9bd070 100644
--- a/test/event_set.c
+++ b/test/event_set.c
@@ -238,7 +238,7 @@ error:
{
H5ESclose(es_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -645,7 +645,7 @@ error:
{
H5ESclose(es_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
diff --git a/test/evict_on_close.c b/test/evict_on_close.c
index 7efe0e8..07efc98 100644
--- a/test/evict_on_close.c
+++ b/test/evict_on_close.c
@@ -562,7 +562,7 @@ error:
H5Pclose(dcpl_id);
H5Pclose(fapl_copy_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(data);
@@ -678,7 +678,7 @@ error:
H5Gclose(gid1);
H5Gclose(gid2);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return FAIL;
@@ -781,7 +781,7 @@ error:
{
H5Dclose(did);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5_FAILED();
return FAIL;
@@ -847,7 +847,7 @@ check_evict_on_close_api(void)
{
status = H5Pset_evict_on_close(dapl_id, evict_on_close);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
FAIL_PUTS_ERROR("H5Pset_evict_on_close() accepted invalid access plist.");
@@ -856,7 +856,7 @@ check_evict_on_close_api(void)
{
status = H5Pget_evict_on_close(H5I_INVALID_HID, &evict_on_close);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
FAIL_PUTS_ERROR("H5Pget_evict_on_close() accepted invalid hid_t.");
@@ -969,7 +969,7 @@ error:
H5Fclose(fid);
H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDexit(EXIT_FAILURE);
@@ -1006,7 +1006,7 @@ check_evict_on_close_parallel_fail(void)
{
status = H5Pset_evict_on_close(fapl_id, evict_on_close);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
FAIL_PUTS_ERROR("H5Pset_evict_on_close() did not fail in parallel HDF5.");
diff --git a/test/external.c b/test/external.c
index d0d7f60..bca7da1 100644
--- a/test/external.c
+++ b/test/external.c
@@ -137,7 +137,7 @@ test_non_extendible(hid_t file)
{
dset_addr = H5Dget_offset(dset);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (dset_addr != HADDR_UNDEF)
FAIL_STACK_ERROR;
@@ -184,7 +184,7 @@ error:
H5Sclose(space);
H5Dclose(dset);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_non_extendible() */
@@ -225,7 +225,7 @@ test_too_small(hid_t file)
{
dset = H5Dcreate2(file, "dset2", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (dset >= 0)
FAIL_PUTS_ERROR(" Small external file succeeded instead of failing.");
if (H5Sclose(space) < 0)
@@ -243,7 +243,7 @@ error:
H5Pclose(dcpl);
H5Dclose(dset);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_too_small() */
@@ -299,7 +299,7 @@ error:
H5Pclose(dcpl);
H5Sclose(space);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_large_enough_current_eventual() */
@@ -340,7 +340,7 @@ test_large_enough_current_not_eventual(hid_t file)
{
dset = H5Dcreate2(file, "dset4", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (dset >= 0)
FAIL_PUTS_ERROR(" Small external file succeeded instead of failing.");
@@ -359,7 +359,7 @@ error:
H5Pclose(dcpl);
H5Sclose(space);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_large_enough_current_not_eventual() */
@@ -452,7 +452,7 @@ error:
H5Pclose(dcpl);
H5Sclose(space);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_unlimited() */
@@ -558,7 +558,7 @@ test_multiple_files(hid_t file)
{
dset = H5Dcreate2(file, "dset7", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (dset >= 0)
FAIL_PUTS_ERROR(" Small external files succeeded instead of failing.");
@@ -577,7 +577,7 @@ error:
H5Pclose(dcpl);
H5Sclose(space);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_multiple_files() */
@@ -613,7 +613,7 @@ test_add_to_unlimited(void)
{
status = H5Pset_external(dcpl, "ext2.data", (off_t)0, (hsize_t)100);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
FAIL_PUTS_ERROR(" H5Pset_external() succeeded when it should have failed.");
@@ -632,7 +632,7 @@ error:
{
H5Pclose(dcpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_add_to_unlimited() */
@@ -667,7 +667,7 @@ test_overflow(void)
{
status = H5Pset_external(dcpl, "ext2.data", (off_t)0, (hsize_t)100);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
FAIL_PUTS_ERROR(" H5Pset_external() succeeded when it should have failed.");
@@ -682,7 +682,7 @@ error:
{
H5Pclose(dcpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_overflow() */
@@ -807,7 +807,7 @@ error:
H5Sclose(hs_space);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_read_file_set() */
@@ -933,7 +933,7 @@ error:
H5Sclose(file_space);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_write_file_set() */
@@ -1030,7 +1030,7 @@ error:
H5Pclose(dcpl);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_path_absolute() */
@@ -1120,7 +1120,7 @@ error:
H5Sclose(space);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_path_relative() */
@@ -1213,7 +1213,7 @@ test_path_relative_cwd(hid_t fapl)
{
dset3 = H5Dopen2(file, "dset1", dapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (dset3 >= 0)
FAIL_PUTS_ERROR("reopening the dataset with a different efile_prefix succeeded");
@@ -1250,7 +1250,7 @@ test_path_relative_cwd(hid_t fapl)
{
dset3 = H5Dopen2(file, "dset1", dapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (dset3 >= 0)
FAIL_PUTS_ERROR("reopening the dataset with a different efile_prefix succeeded");
@@ -1291,7 +1291,7 @@ error:
H5Sclose(space);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_path_relative_cwd() */
@@ -1396,7 +1396,7 @@ error:
H5Sclose(sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_h5d_get_access_plist() */
@@ -1525,7 +1525,7 @@ error:
H5Pclose(fapl_id_new);
H5Gclose(gid);
}
- H5E_END_TRY;
+ H5E_END_TRY
nerrors = MAX(1, nerrors);
HDprintf("%d TEST%s FAILED.\n", nerrors, 1 == nerrors ? "" : "s");
return EXIT_FAILURE;
diff --git a/test/external_env.c b/test/external_env.c
index 3718dc2..b39358f 100644
--- a/test/external_env.c
+++ b/test/external_env.c
@@ -124,7 +124,7 @@ error:
H5Sclose(space);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_path_env() */
@@ -212,7 +212,7 @@ error:
H5Pclose(fapl_id_new);
H5Gclose(gid);
}
- H5E_END_TRY;
+ H5E_END_TRY
nerrors = MAX(1, nerrors);
HDprintf("%d TEST%s FAILED.\n", nerrors, 1 == nerrors ? "" : "s");
return EXIT_FAILURE;
diff --git a/test/farray.c b/test/farray.c
index e5bd6b6..0f522fb 100644
--- a/test/farray.c
+++ b/test/farray.c
@@ -443,7 +443,7 @@ test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t H5_ATTR_UNUSE
{
fa = H5FA_create(f, &test_cparam, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fa) {
/* Close opened fixed array */
H5FA_close(fa);
@@ -460,7 +460,7 @@ test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t H5_ATTR_UNUSE
{
fa = H5FA_create(f, &test_cparam, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fa) {
/* Close opened fixed array */
H5FA_close(fa);
@@ -477,7 +477,7 @@ test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t H5_ATTR_UNUSE
{
fa = H5FA_create(f, &test_cparam, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fa) {
/* Close opened fixed array */
H5FA_close(fa);
@@ -528,7 +528,7 @@ error:
H5FA_close(fa);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_create() */
@@ -596,7 +596,7 @@ error:
H5FA_close(fa);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_reopen() */
@@ -699,7 +699,7 @@ error:
H5Fclose(fid);
H5Fclose(fid2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_open_twice() */
@@ -835,7 +835,7 @@ error:
H5Fclose(fid0);
H5Fclose(fid00);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_open_twice_diff() */
@@ -897,7 +897,7 @@ test_delete_open(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam)
{
fa2 = H5FA_open(f, fa_addr, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fa2) {
/* Close opened array */
H5FA_close(fa2);
@@ -920,7 +920,7 @@ test_delete_open(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam)
{
fa = H5FA_open(f, fa_addr, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fa) {
/* Close opened array */
H5FA_close(fa);
@@ -955,7 +955,7 @@ error:
H5FA_close(fa2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_delete_open() */
@@ -1481,7 +1481,7 @@ error:
H5FA_close(fa);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_set_elmts() */
@@ -1609,7 +1609,7 @@ error:
H5FA_close(fa);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_skip_elmts() */
@@ -1801,7 +1801,7 @@ error:
{
H5Pclose(fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (api_ctx_pushed)
H5CX_pop(FALSE);
diff --git a/test/fheap.c b/test/fheap.c
index bcf1ab0..f256ec9 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -1905,7 +1905,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_create() */
@@ -2058,7 +2058,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_reopen() */
@@ -2235,7 +2235,7 @@ error:
H5Fclose(file);
H5Fclose(file2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_open_twice() */
@@ -2338,7 +2338,7 @@ test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
{
fh2 = H5HF_open(f, fh_addr);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fh2) {
/* Close opened heap */
H5HF_close(fh2);
@@ -2378,7 +2378,7 @@ test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
{
fh = H5HF_open(f, fh_addr);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fh) {
/* Close opened heap */
H5HF_close(fh);
@@ -2414,7 +2414,7 @@ error:
H5HF_close(fh2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_delete_open() */
@@ -2568,7 +2568,7 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl)
{
fh = H5HF_create(f, &tmp_cparam);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (NULL != fh)
FAIL_STACK_ERROR;
@@ -2732,7 +2732,7 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl)
{
fh = H5HF_create(f, &tmp_cparam);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (NULL != fh)
FAIL_STACK_ERROR;
@@ -2752,7 +2752,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_id_limits() */
@@ -2874,7 +2874,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_filtered_create() */
@@ -3013,7 +3013,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_size() */
@@ -3148,7 +3148,7 @@ error:
H5Fclose(file1);
H5Fclose(file2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_reopen_hdr() */
@@ -3222,7 +3222,7 @@ test_man_insert_weird(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa
{
ret = H5HF_insert(fh, (size_t)0, shared_wobj_g, heap_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
H5Eclear2(H5E_DEFAULT);
@@ -3260,7 +3260,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_insert_weird() */
@@ -3363,7 +3363,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_insert_first() */
@@ -3458,7 +3458,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_insert_second() */
@@ -3556,7 +3556,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_insert_root_mult() */
@@ -3662,7 +3662,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_insert_force_indirect() */
@@ -3768,7 +3768,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_insert_fill_second() */
@@ -3880,7 +3880,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_insert_third_direct() */
@@ -3976,7 +3976,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_first_row() */
@@ -4079,7 +4079,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_start_second_row() */
@@ -4179,7 +4179,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_second_row() */
@@ -4290,7 +4290,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_start_third_row() */
@@ -4388,7 +4388,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_fourth_row() */
@@ -4484,7 +4484,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_all_root_direct() */
@@ -4585,7 +4585,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_first_recursive_indirect() */
@@ -4695,7 +4695,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_second_direct_recursive_indirect() */
@@ -4797,7 +4797,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_first_recursive_indirect() */
@@ -4907,7 +4907,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_second_recursive_indirect() */
@@ -5015,7 +5015,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_second_recursive_indirect() */
@@ -5115,7 +5115,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_recursive_indirect_row() */
@@ -5224,7 +5224,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_start_2nd_recursive_indirect() */
@@ -5326,7 +5326,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_recursive_indirect_two_deep() */
@@ -5436,7 +5436,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_start_3rd_recursive_indirect() */
@@ -5547,7 +5547,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_first_3rd_recursive_indirect() */
@@ -5655,7 +5655,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_3rd_recursive_indirect_row() */
@@ -5763,7 +5763,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_all_3rd_recursive_indirect() */
@@ -5878,7 +5878,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_start_4th_recursive_indirect() */
@@ -5999,7 +5999,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_first_4th_recursive_indirect() */
@@ -6111,7 +6111,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_4th_recursive_indirect_row() */
@@ -6223,7 +6223,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_all_4th_recursive_indirect() */
#endif /* ALL_INSERT_TESTS */
@@ -6357,7 +6357,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_start_5th_recursive_indirect() */
@@ -6452,7 +6452,7 @@ HDfprintf(stderr, "Random # seed was: %lu\n", seed);
{
ret = H5HF_remove(fh, heap_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
FAIL_STACK_ERROR;
@@ -6481,7 +6481,7 @@ HDfprintf(stderr, "Random # seed was: %lu\n", seed);
{
ret = H5HF_remove(fh, heap_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
H5Eclear2(H5E_DEFAULT);
@@ -6491,7 +6491,7 @@ HDfprintf(stderr, "Random # seed was: %lu\n", seed);
{
ret = H5HF_read(fh, heap_id, shared_robj_g);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
H5Eclear2(H5E_DEFAULT);
@@ -6517,7 +6517,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_remove_bogus() */
@@ -6681,7 +6681,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_remove_one() */
@@ -6874,7 +6874,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_remove_two() */
@@ -7043,7 +7043,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_remove_one_larger() */
@@ -7283,7 +7283,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_remove_two_larger() */
@@ -7583,7 +7583,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_remove_three_larger() */
@@ -7707,7 +7707,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(heap_id);
HDfree(heap_id_data);
@@ -7784,7 +7784,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_remove_root_direct() */
@@ -7872,7 +7872,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_remove_two_direct() */
@@ -7942,7 +7942,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_remove_first_row() */
@@ -8014,7 +8014,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_remove_first_two_rows() */
@@ -8090,7 +8090,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_remove_first_four_rows() */
@@ -8160,7 +8160,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_remove_all_root_direct() */
@@ -8234,7 +8234,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_remove_2nd_indirect() */
@@ -8312,7 +8312,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_remove_3rd_indirect() */
@@ -8392,7 +8392,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_skip_start_block() */
@@ -8490,7 +8490,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_skip_start_block_add_back() */
@@ -8600,7 +8600,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_skip_start_block_add_skipped() */
@@ -8694,7 +8694,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_skip_2nd_block() */
@@ -8837,7 +8837,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_skip_2nd_block_add_skipped() */
@@ -9005,7 +9005,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_one_partial_skip_2nd_block_add_skipped() */
@@ -9135,7 +9135,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_row_skip_add_skipped() */
@@ -9264,7 +9264,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_skip_direct_skip_indirect_two_rows_add_skipped() */
@@ -9388,7 +9388,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_direct_skip_indirect_start_block_add_skipped() */
@@ -9519,7 +9519,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_direct_skip_2nd_indirect_start_block_add_skipped() */
@@ -9662,7 +9662,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_2nd_direct_less_one_wrap_start_block_add_skipped() */
@@ -9830,7 +9830,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_direct_skip_2nd_indirect_skip_2nd_block_add_skipped() */
@@ -9984,7 +9984,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_direct_skip_indirect_two_rows_add_skipped() */
@@ -10169,7 +10169,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_direct_skip_indirect_two_rows_skip_indirect_row_add_skipped() */
@@ -10298,7 +10298,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_2nd_direct_skip_start_block_add_skipped() */
@@ -10440,7 +10440,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_2nd_direct_skip_2nd_indirect_start_block_add_skipped() */
@@ -10592,7 +10592,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped() */
@@ -10749,7 +10749,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_2nd_direct_fill_direct_skip2_3rd_indirect_start_block_add_skipped() */
@@ -10912,7 +10912,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_3rd_direct_less_one_fill_direct_wrap_start_block_add_skipped() */
@@ -11082,7 +11082,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_1st_row_3rd_direct_fill_2nd_direct_less_one_wrap_start_block_add_skipped() */
@@ -11243,7 +11243,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_3rd_direct_fill_direct_skip_start_block_add_skipped() */
@@ -11423,7 +11423,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped() */
@@ -11640,7 +11640,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_two_rows_start_block_add_skipped()
*/
@@ -11841,7 +11841,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_start_block_add_skipped() */
@@ -12078,7 +12078,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_fill_4th_direct_less_one_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_start_block_add_skipped()
*/
@@ -12211,7 +12211,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_frag_simple() */
@@ -12380,7 +12380,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_frag_direct() */
@@ -12491,7 +12491,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_frag_2nd_direct() */
@@ -12611,7 +12611,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_man_frag_3rd_direct() */
@@ -12761,7 +12761,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_huge_insert_one() */
@@ -12991,7 +12991,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_huge_insert_two() */
@@ -13296,7 +13296,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_huge_insert_three() */
@@ -13721,7 +13721,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_huge_insert_mix() */
@@ -13932,7 +13932,7 @@ error:
H5O_msg_reset(H5O_PLINE_ID, &tmp_cparam.pline); /* Release the I/O pipeline filter information */
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_filtered_huge() */
@@ -14082,7 +14082,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_tiny_insert_one() */
@@ -14312,7 +14312,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_tiny_insert_two() */
@@ -14919,7 +14919,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_tiny_insert_mix() */
@@ -15092,7 +15092,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_filtered_man_root_direct() */
@@ -15418,7 +15418,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_filtered_man_root_indirect() */
@@ -15621,7 +15621,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_random() */
@@ -15838,7 +15838,7 @@ error:
H5O_msg_reset(H5O_PLINE_ID, &tmp_cparam.pline); /* Release the I/O pipeline filter information */
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_random_pow2() */
@@ -15955,7 +15955,7 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
{
ret = H5HF_write(fh, huge_heap_id, &id_changed, shared_wobj_g);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDassert(!id_changed);
if (tparam->comp == FHEAP_TEST_COMPRESS) {
if (ret >= 0)
@@ -15971,7 +15971,7 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
{
ret = H5HF_write(fh, tiny_heap_id, &id_changed, shared_wobj_g);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDassert(!id_changed);
if (ret >= 0)
TEST_ERROR;
@@ -16129,7 +16129,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_write() */
@@ -16301,7 +16301,7 @@ error:
H5HF_close(fh);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_bug1() */
@@ -16926,7 +16926,7 @@ error:
H5Pclose(def_fcpl);
H5Pclose(fcpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (api_ctx_pushed)
H5CX_pop(FALSE);
diff --git a/test/file_image.c b/test/file_image.c
index e9f50c3..638ec8d 100644
--- a/test/file_image.c
+++ b/test/file_image.c
@@ -1069,7 +1069,7 @@ test_get_file_image_error_rejection(void)
{
bytes_read = H5Fget_file_image(file_id, image_ptr, (size_t)(image_size - 1));
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(bytes_read < 0, "H5Fget_file_image(2 -- test 1) succeeded.");
/* Call H5Fget_file_image() with good buffer and buffer size,
@@ -1079,7 +1079,7 @@ test_get_file_image_error_rejection(void)
{
bytes_read = H5Fget_file_image((hid_t)0, image_ptr, (size_t)(image_size));
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(bytes_read < 0, "H5Fget_file_image(3 -- test 1) succeeded.");
/* Call H5Fget_file_image() with good buffer and buffer size,
@@ -1089,7 +1089,7 @@ test_get_file_image_error_rejection(void)
{
bytes_read = H5Fget_file_image(dset_id, image_ptr, (size_t)(image_size));
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(bytes_read < 0, "H5Fget_file_image(4 -- test 1) succeeded.");
/* Close dset and space */
@@ -1193,7 +1193,7 @@ test_get_file_image_error_rejection(void)
{
image_size = H5Fget_file_image(file_id, NULL, (size_t)0);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(image_size == -1, "H5Fget_file_image(5) succeeded.");
/* Close dset and space */
@@ -1255,7 +1255,7 @@ test_get_file_image_error_rejection(void)
{
image_size = H5Fget_file_image(file_id, NULL, (size_t)0);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(image_size == -1, "H5Fget_file_image(6) succeeded.");
/* Close dset and space */
@@ -1315,7 +1315,7 @@ test_get_file_image_error_rejection(void)
{
image_size = H5Fget_file_image(file_id, NULL, (size_t)0);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(image_size == -1, "H5Fget_file_image(7) succeeded.");
/* Close dset and space */
diff --git a/test/fillval.c b/test/fillval.c
index 489aa76..a9f4297 100644
--- a/test/fillval.c
+++ b/test/fillval.c
@@ -87,7 +87,7 @@ error:
{
H5Tclose(ret_value);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -140,7 +140,7 @@ error:
H5Tclose(str_id);
H5Tclose(ret_value);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end create_compound_vl_type() */
@@ -199,7 +199,7 @@ test_getset(void)
{
H5Pget_fill_value(dcpl, H5T_NATIVE_INT, &fill_i);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fill_i != 0) {
H5_FAILED();
HDputs(" H5Pget_fill_value() should return default 0");
@@ -268,7 +268,7 @@ error:
H5Tclose(type_si);
H5Tclose(type_ss);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -384,7 +384,7 @@ error:
H5E_BEGIN_TRY
{
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_getset_vl() */
@@ -513,7 +513,7 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
if (H5Dcreate2(file, "dset7", H5T_NATIVE_LONG, space, H5P_DEFAULT, dcpl, H5P_DEFAULT) != FAIL)
goto error;
}
- H5E_END_TRY;
+ H5E_END_TRY
}
/* II. Test early space allocation cases */
@@ -566,7 +566,7 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
if (H5Dcreate2(file, "dset7", H5T_NATIVE_LONG, space, H5P_DEFAULT, dcpl, H5P_DEFAULT) != FAIL)
goto error;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Close everything */
if (H5D_COMPACT != layout) {
@@ -842,7 +842,7 @@ error:
H5Dclose(dset8);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -1178,7 +1178,7 @@ error:
H5Sclose(fspace);
H5Sclose(mspace);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -1377,7 +1377,7 @@ error:
H5Tclose(ctype_id);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return nerrors;
}
@@ -2027,7 +2027,7 @@ error:
H5Sclose(fspace);
H5Sclose(mspace);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_extend_cases() */
@@ -2177,7 +2177,7 @@ error:
H5Pclose(dcpl);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
skip:
@@ -2189,7 +2189,7 @@ skip:
H5Pclose(dcpl);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 0;
} /* end test_extend() */
@@ -2343,7 +2343,7 @@ error:
H5Dclose(dset2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -2466,7 +2466,7 @@ error:
H5Sclose(fspace);
H5Sclose(rspace);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -2613,7 +2613,7 @@ error:
H5Pclose(dcpl);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return nerrors;
}
diff --git a/test/filter_fail.c b/test/filter_fail.c
index 172027c..f2f1c3d 100644
--- a/test/filter_fail.c
+++ b/test/filter_fail.c
@@ -165,7 +165,7 @@ test_filter_write(char *file_name, hid_t my_fapl, hbool_t cache_enabled)
{
ret = H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, sid, H5P_DEFAULT, points);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0) {
H5_FAILED();
HDputs(" Data writing is supposed to fail because the chunk can't be written to file.");
@@ -186,7 +186,7 @@ test_filter_write(char *file_name, hid_t my_fapl, hbool_t cache_enabled)
{
ret = H5Dclose(dataset);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0) {
H5_FAILED();
HDputs(" Dataset is supposed to fail because the chunk can't be flushed to file.");
@@ -214,7 +214,7 @@ error:
H5Dclose(dataset);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_filter_write() */
@@ -355,7 +355,7 @@ error:
H5Dclose(dataset);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_filter_read() */
diff --git a/test/filter_plugin.c b/test/filter_plugin.c
index 96e114a..1e853e7 100644
--- a/test/filter_plugin.c
+++ b/test/filter_plugin.c
@@ -1333,7 +1333,7 @@ test_filter_numbers(void)
id = H5Z_FILTER_MAX + 1;
status = H5Pget_filter_by_id2(dcpl_id, id, &flags, &nelmts, NULL, 0, NULL, &filter_config);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (status != FAIL)
@@ -1344,7 +1344,7 @@ test_filter_numbers(void)
id = -1;
status = H5Pget_filter_by_id2(dcpl_id, id, &flags, &nelmts, NULL, 0, NULL, &filter_config);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (status != FAIL)
@@ -1358,7 +1358,7 @@ test_filter_numbers(void)
id = H5Z_FILTER_MAX + 1;
status = H5Pget_filter_by_id1(dcpl_id, id, &flags, &nelmts, NULL, 0, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (status != FAIL)
@@ -1369,7 +1369,7 @@ test_filter_numbers(void)
id = -1;
status = H5Pget_filter_by_id1(dcpl_id, id, &flags, &nelmts, NULL, 0, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (status != FAIL)
@@ -1388,7 +1388,7 @@ error:
{
H5Pclose(dcpl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_filter_numbers() */
diff --git a/test/flush1.c b/test/flush1.c
index f0f1093..f9fcf9c 100644
--- a/test/flush1.c
+++ b/test/flush1.c
@@ -99,7 +99,7 @@ error:
H5Gclose(gid);
H5Gclose(top_gid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end create_file() */
@@ -163,7 +163,7 @@ error:
H5Sclose(sid);
H5Dclose(did);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(data);
@@ -330,7 +330,7 @@ error:
{
H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDexit(EXIT_FAILURE);
} /* end main() */
diff --git a/test/flush2.c b/test/flush2.c
index d5461d6..bc5d409 100644
--- a/test/flush2.c
+++ b/test/flush2.c
@@ -100,7 +100,7 @@ error:
H5Sclose(sid);
H5Dclose(did);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(data);
@@ -164,7 +164,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FALSE;
} /* end file_ok() */
@@ -217,7 +217,7 @@ error:
H5Pclose(new_fapl_id);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end clear_status_flags() */
diff --git a/test/flushrefresh.c b/test/flushrefresh.c
index 28d4638..5201404 100644
--- a/test/flushrefresh.c
+++ b/test/flushrefresh.c
@@ -1084,7 +1084,7 @@ flush_verification(const char *obj_pathname, const char *expected)
oid = H5Oopen(fid, obj_pathname, H5P_DEFAULT);
status = H5Oget_info3(oid, &oinfo, H5O_INFO_BASIC);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Compare to expected result */
if (HDstrcmp(expected, FLUSHED) == 0) {
@@ -1112,7 +1112,7 @@ flush_verification(const char *obj_pathname, const char *expected)
H5Oclose(oid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return SUCCEED;
diff --git a/test/freespace.c b/test/freespace.c
index 60238d8..e163152 100644
--- a/test/freespace.c
+++ b/test/freespace.c
@@ -551,7 +551,7 @@ error:
H5FS_close(f, frsp);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_fs_create() */
@@ -899,7 +899,7 @@ error:
H5FS_close(f, frsp);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_fs_sect_add() */
@@ -1271,7 +1271,7 @@ error:
H5FS_close(f, frsp);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_fs_sect_find() */
@@ -1747,7 +1747,7 @@ error:
H5FS_close(f, frsp);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_fs_sect_merge() */
@@ -2111,7 +2111,7 @@ error:
H5FS_close(f, frsp);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_sect_shrink() */
@@ -2386,7 +2386,7 @@ error:
H5FS_close(f, frsp);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_sect_change_class() */
@@ -2764,7 +2764,7 @@ error:
H5FS_close(f, frsp);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_sect_extend() */
@@ -2868,7 +2868,7 @@ error:
H5FS_close(f, frsp);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_fs_sect_iterate() */
@@ -2927,7 +2927,7 @@ error:
{
H5Pclose(fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (api_ctx_pushed)
H5CX_pop(FALSE);
diff --git a/test/gen_bad_offset.c b/test/gen_bad_offset.c
index d07ff96..e9e3393 100644
--- a/test/gen_bad_offset.c
+++ b/test/gen_bad_offset.c
@@ -139,7 +139,7 @@ error:
H5Sclose(sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return EXIT_FAILURE;
} /* end main() */
diff --git a/test/gen_bad_ohdr.c b/test/gen_bad_ohdr.c
index 812d9a8..917ebc0 100644
--- a/test/gen_bad_ohdr.c
+++ b/test/gen_bad_ohdr.c
@@ -110,7 +110,7 @@ error:
H5Pclose(gcpl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
#else /* H5O_ENABLE_BAD_MESG_COUNT */
HDputs("H5O_BAD_MESG_COUNT compiler macro not defined!");
#endif /* H5O_ENABLE_BAD_MESG_COUNT */
diff --git a/test/gen_bogus.c b/test/gen_bogus.c
index c7c3964..99e459f 100644
--- a/test/gen_bogus.c
+++ b/test/gen_bogus.c
@@ -133,7 +133,7 @@ error:
H5Sclose(sid);
H5Pclose(dcpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* generate_datasets() */
@@ -177,7 +177,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
#else /* H5O_ENABLE_BOGUS */
HDputs("H5O_ENABLE_BOGUS compiler macro not defined!");
#endif /* H5O_ENABLE_BOGUS */
diff --git a/test/gen_bounds.c b/test/gen_bounds.c
index fb765f7..4ff9799 100644
--- a/test/gen_bounds.c
+++ b/test/gen_bounds.c
@@ -236,7 +236,7 @@ error:
H5Fclose(fid);
HDfree(buf);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* gen_earliest_latest */
@@ -351,7 +351,7 @@ error:
H5Fclose(fid);
HDfree(buf);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* gen_earliest_v18 */
@@ -461,7 +461,7 @@ error:
H5Fclose(fid);
HDfree(buf);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* gen_latest_latest */
@@ -577,7 +577,7 @@ error:
H5Fclose(fid);
HDfree(buf);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* gen_v18_latest */
@@ -739,7 +739,7 @@ error:
H5Fclose(fid);
HDfree(buf);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* gen_v18_v18 */
@@ -952,7 +952,7 @@ error:
H5Pclose(fapl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
@@ -1203,7 +1203,7 @@ error:
H5Fclose(fid);
HDfree(dwbuf);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
diff --git a/test/gen_cross.c b/test/gen_cross.c
index c468039..143451d 100644
--- a/test/gen_cross.c
+++ b/test/gen_cross.c
@@ -176,7 +176,7 @@ error:
H5Pclose(dcpl);
H5Dclose(dataset);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -264,7 +264,7 @@ error:
H5Pclose(dcpl);
H5Dclose(dataset);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -352,7 +352,7 @@ error:
H5Pclose(dcpl);
H5Dclose(dataset);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -448,7 +448,7 @@ error:
H5Pclose(dcpl);
H5Dclose(dataset);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -544,7 +544,7 @@ error:
H5Pclose(dcpl);
H5Dclose(dataset);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -640,7 +640,7 @@ error:
H5Pclose(dcpl);
H5Dclose(dataset);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -737,7 +737,7 @@ error:
H5Pclose(dcpl);
H5Dclose(dataset);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -825,7 +825,7 @@ error:
H5Pclose(dcpl);
H5Dclose(dataset);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -921,7 +921,7 @@ error:
H5Pclose(dcpl);
H5Dclose(dataset);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
#endif /* H5_HAVE_FILTER_DEFLATE */
@@ -1012,7 +1012,7 @@ error:
H5Pclose(dcpl);
H5Dclose(dataset);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -1101,7 +1101,7 @@ error:
H5Pclose(dcpl);
H5Dclose(dataset);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -1210,7 +1210,7 @@ error:
H5Pclose(dcpl);
H5Dclose(dataset);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
diff --git a/test/gen_deflate.c b/test/gen_deflate.c
index b103559..a3ba2c6 100644
--- a/test/gen_deflate.c
+++ b/test/gen_deflate.c
@@ -111,7 +111,7 @@ error:
H5Sclose(sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return EXIT_FAILURE;
} /* end main() */
diff --git a/test/gen_file_image.c b/test/gen_file_image.c
index 03065c6..b2faefd 100644
--- a/test/gen_file_image.c
+++ b/test/gen_file_image.c
@@ -87,7 +87,7 @@ error:
H5Sclose(sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return EXIT_FAILURE;
} /* end main() */
diff --git a/test/gen_filespace.c b/test/gen_filespace.c
index b9baa82..69c1c1e 100644
--- a/test/gen_filespace.c
+++ b/test/gen_filespace.c
@@ -114,6 +114,6 @@ error:
H5Pclose(fcpl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
diff --git a/test/gen_filters.c b/test/gen_filters.c
index c171538..35bfc04 100644
--- a/test/gen_filters.c
+++ b/test/gen_filters.c
@@ -101,7 +101,7 @@ error:
H5Sclose(sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_filters_endianess() */
@@ -217,7 +217,7 @@ error:
H5Sclose(sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
diff --git a/test/gen_new_fill.c b/test/gen_new_fill.c
index 5669802..c0b11b5 100644
--- a/test/gen_new_fill.c
+++ b/test/gen_new_fill.c
@@ -98,6 +98,6 @@ error:
H5Dclose(dset2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
diff --git a/test/gen_new_group.c b/test/gen_new_group.c
index d58d159..a9d9af7 100644
--- a/test/gen_new_group.c
+++ b/test/gen_new_group.c
@@ -117,6 +117,6 @@ error:
H5Pclose(fapl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
diff --git a/test/gen_old_group.c b/test/gen_old_group.c
index f777ed3..393c3f5 100644
--- a/test/gen_old_group.c
+++ b/test/gen_old_group.c
@@ -58,6 +58,6 @@ error:
H5Dclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
diff --git a/test/getname.c b/test/getname.c
index f1d43ea..7900279 100644
--- a/test/getname.c
+++ b/test/getname.c
@@ -1531,7 +1531,7 @@ test_main(hid_t file_id, hid_t fapl)
if (H5Iget_name(type_id, name, NAME_BUF_SIZE) > 0)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Get name for dataspace, it should fail */
H5E_BEGIN_TRY
@@ -1539,7 +1539,7 @@ test_main(hid_t file_id, hid_t fapl)
if (H5Iget_name(space_id, name, NAME_BUF_SIZE) > 0)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
}
/* Close */
@@ -3080,7 +3080,7 @@ test_main(hid_t file_id, hid_t fapl)
if ((size = H5Iget_name(dtype, NULL, 0)) >= 0)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
if (H5Tcommit_anon(file2_id, dtype, H5P_DEFAULT, H5P_DEFAULT))
TEST_ERROR;
@@ -3805,7 +3805,7 @@ error:
{
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDputs("***** GET NAME TESTS FAILED *****");
diff --git a/test/gheap.c b/test/gheap.c
index 58b7fe2..5a37f9e 100644
--- a/test/gheap.c
+++ b/test/gheap.c
@@ -37,15 +37,15 @@
#define GHEAP_TEST_NOBJS 1024
#define GHEAP_REPEATED_ERR(MSG) \
- { \
+ do { \
nerrors++; \
if (nerrors <= GHEAP_REPEATED_ERR_LIM) { \
H5_FAILED(); \
HDputs(MSG); \
if (nerrors == GHEAP_REPEATED_ERR_LIM) \
HDputs(" Suppressing further errors..."); \
- } /* end if */ \
- } /* end GHEAP_REPEATED_ERR */
+ } /* end if */ \
+ } while (0) /* end GHEAP_REPEATED_ERR */
const char *FILENAME[] = {"gheap1", "gheap2", "gheap3", "gheap4", "gheapooo", NULL};
@@ -152,7 +152,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (obj)
HDfree(obj);
return MAX(1, nerrors);
@@ -252,7 +252,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (obj)
HDfree(obj);
return MAX(1, nerrors);
@@ -342,7 +342,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (obj)
HDfree(obj);
return MAX(1, nerrors);
@@ -438,7 +438,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (obj)
HDfree(obj);
return MAX(1, nerrors);
@@ -499,7 +499,7 @@ test_ooo_indices(hid_t fapl)
H5Eclear2(H5E_DEFAULT);
status = H5HG_insert(f, sizeof(j), &j, &obj[j]);
if (status < 0)
- GHEAP_REPEATED_ERR(" Unable to insert object into global heap")
+ GHEAP_REPEATED_ERR(" Unable to insert object into global heap");
/* Check that the index is as expected */
if (obj[j].idx != ((1000 * i) + j - (1000 * ((~i & 1)))) % ((1U << 16) - 1) + 1)
@@ -557,7 +557,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (obj)
HDfree(obj);
return MAX(1, nerrors);
@@ -615,7 +615,7 @@ error:
{
H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (api_ctx_pushed)
H5CX_pop(FALSE);
diff --git a/test/h5test.c b/test/h5test.c
index 5013135..c0e93b9 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -205,7 +205,7 @@ h5_delete_test_file(const char *base_name, hid_t fapl)
{
H5Fdelete(filename, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
} /* end h5_delete_test_file() */
@@ -369,7 +369,7 @@ h5_reset(void)
H5Fclose(file);
HDunlink(filename);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
#endif /* OLD_WAY */
}
@@ -1594,7 +1594,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
diff --git a/test/hdfs.c b/test/hdfs.c
index bf8e840..c1404f7 100644
--- a/test/hdfs.c
+++ b/test/hdfs.c
@@ -548,7 +548,7 @@ test_fapl_config_validation(void)
*/
success = H5Pset_fapl_hdfs(fapl_id, &case_ptr->config);
}
- H5E_END_TRY;
+ H5E_END_TRY
JSVERIFY(case_ptr->expected, success, case_ptr->msg)
@@ -590,7 +590,7 @@ error:
{
(void)H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
return 1;
#endif /* H5_HAVE_LIBHDFS */
@@ -674,7 +674,7 @@ error:
{
(void)H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
#endif /* H5_HAVE_LIBHDFS */
@@ -862,7 +862,7 @@ test_vfd_open(void)
{
fd = H5FDopen(T.url, T.flags, fapl_id, T.maxaddr);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (NULL != fd) {
if (TRUE == T.might_use_other_driver && H5FD_HDFS != fd->driver_id) {
HDfprintf(stderr, "\n!!!!! WARNING !!!!!\n"
@@ -926,7 +926,7 @@ error:
(void)H5Pclose(fapl_unconfigured);
}
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
@@ -1046,7 +1046,7 @@ error:
{
(void)H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
return 1;
@@ -1114,7 +1114,7 @@ test_H5FDread_without_eoa_set_fails(void)
H5E_BEGIN_TRY{/* mute stack trace on expected failure */
JSVERIFY(FAIL, H5FDread(file_shakespeare, H5FD_MEM_DRAW, H5P_DEFAULT, 1200699, 102, buffer),
- "cannot read before eoa is set")} H5E_END_TRY;
+ "cannot read before eoa is set")} H5E_END_TRY
for (i = 0; i < HDFS_TEST_MAX_BUF_SIZE; i++) {
JSVERIFY(0, (unsigned)buffer[i], "buffer was modified by write!")
}
@@ -1146,7 +1146,7 @@ error:
{
(void)H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
return 1;
@@ -1316,7 +1316,7 @@ test_read(void)
{
open_return = H5FDread(file_raven, H5FD_MEM_DRAW, H5P_DEFAULT, test.addr, test.len, buffer);
}
- H5E_END_TRY;
+ H5E_END_TRY
JSVERIFY(test.success, open_return, test.message)
@@ -1353,7 +1353,7 @@ error:
{
(void)H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
return 1;
@@ -1433,12 +1433,12 @@ test_noops_and_autofails(void)
/* auto-fail calls to write and truncate
*/
H5E_BEGIN_TRY{JSVERIFY(FAIL, H5FDwrite(file, H5FD_MEM_DRAW, H5P_DEFAULT, 1000, 35, data),
- "write must fail")} H5E_END_TRY;
+ "write must fail")} H5E_END_TRY
- H5E_BEGIN_TRY{JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, FALSE), "truncate must fail")} H5E_END_TRY;
+ H5E_BEGIN_TRY{JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, FALSE), "truncate must fail")} H5E_END_TRY
H5E_BEGIN_TRY{
- JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, TRUE), "truncate must fail (closing)")} H5E_END_TRY;
+ JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, TRUE), "truncate must fail (closing)")} H5E_END_TRY
/************
* TEARDOWN *
@@ -1464,7 +1464,7 @@ error:
{
(void)H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
if (file != NULL) {
(void)H5FDclose(file);
@@ -1566,12 +1566,11 @@ test_H5F_integration(void)
/* Read-Write Open access is not allowed with this file driver.
*/
- H5E_BEGIN_TRY{FAIL_IF(0 <= H5Fopen(filename_example_h5, H5F_ACC_RDWR, fapl_id))} H5E_END_TRY;
+ H5E_BEGIN_TRY{FAIL_IF(0 <= H5Fopen(filename_example_h5, H5F_ACC_RDWR, fapl_id))} H5E_END_TRY
/* H5Fcreate() is not allowed with this file driver.
*/
- H5E_BEGIN_TRY{
- FAIL_IF(0 <= H5Fcreate(filename_missing, H5F_ACC_RDONLY, H5P_DEFAULT, fapl_id))} H5E_END_TRY;
+ H5E_BEGIN_TRY{FAIL_IF(0 <= H5Fcreate(filename_missing, H5F_ACC_RDONLY, H5P_DEFAULT, fapl_id))} H5E_END_TRY
/* Successful open.
*/
@@ -1606,7 +1605,7 @@ error:
{
(void)H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
if (file > 0) {
(void)H5Fclose(file);
diff --git a/test/lheap.c b/test/lheap.c
index 7db032e..c527fe2 100644
--- a/test/lheap.c
+++ b/test/lheap.c
@@ -221,7 +221,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (api_ctx_pushed)
H5CX_pop(FALSE);
diff --git a/test/links.c b/test/links.c
index 516c195..2ab7f59 100644
--- a/test/links.c
+++ b/test/links.c
@@ -535,13 +535,13 @@ new_links(hid_t fapl, hbool_t new_format)
if (H5Lcreate_hard(H5L_SAME_LOC, "dataset1", H5L_SAME_LOC, "hard", H5P_DEFAULT, H5P_DEFAULT) != FAIL)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
H5E_BEGIN_TRY
{
if (H5Lcreate_soft("dataset1", H5L_SAME_LOC, "soft", H5P_DEFAULT, H5P_DEFAULT) != FAIL)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Create links across files with hard link. Should fail. */
H5E_BEGIN_TRY
@@ -549,7 +549,7 @@ new_links(hid_t fapl, hbool_t new_format)
if (H5Lcreate_hard(file_a, "dataset1", file_b, "hard", H5P_DEFAULT, H5P_DEFAULT) != FAIL)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Create hard link to test H5L_SAME_LOC */
if (H5Lcreate_hard(grp1_a, "dataset2", H5L_SAME_LOC, "hard1", H5P_DEFAULT, H5P_DEFAULT) < 0)
@@ -595,7 +595,7 @@ error:
H5Fclose(file_a);
H5Fclose(file_b);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
}
@@ -667,7 +667,7 @@ cklinks(hid_t fapl, hbool_t new_format)
{
status = H5Lexists(file, "no_grp1/hard", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" H5Lexists() should have failed for a path with missing components.");
@@ -677,7 +677,7 @@ cklinks(hid_t fapl, hbool_t new_format)
{
status = H5Lexists(file, "/no_grp1/hard", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" H5Lexists() should have failed for a path with missing components.");
@@ -715,7 +715,7 @@ cklinks(hid_t fapl, hbool_t new_format)
{
status = H5Oget_info_by_name3(file, "grp1/dangle", &oinfo2, H5O_INFO_BASIC, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" H5Oget_info_by_name() should have failed for a dangling link.");
@@ -746,7 +746,7 @@ cklinks(hid_t fapl, hbool_t new_format)
{
status = H5Oget_info_by_name3(file, "grp1/recursive", &oinfo2, H5O_INFO_BASIC, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" H5Oget_info_by_name() should have failed for a recursive link.");
@@ -924,7 +924,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(objname);
return FAIL;
}
@@ -1083,7 +1083,7 @@ toomany(hid_t fapl, hbool_t new_format)
{
gid = H5Gopen2(fid, "soft17", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (gid >= 0) {
H5_FAILED();
HDputs(" Should have failed for sequence of too many nested links.");
@@ -1124,7 +1124,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end toomany() */
@@ -1337,7 +1337,7 @@ error:
H5Sclose(space_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_lcpl() */
@@ -1394,7 +1394,7 @@ test_move(hid_t fapl, hbool_t new_format)
FAIL)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Move a group across files. Should fail. */
H5E_BEGIN_TRY
@@ -1402,7 +1402,7 @@ test_move(hid_t fapl, hbool_t new_format)
if (H5Lmove(grp_1, "group_move", file_b, "group_new_name", H5P_DEFAULT, H5P_DEFAULT) != FAIL)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Move a soft link across files. Should succeed. */
if (H5Lmove(grp_2, "soft", file_b, "soft_new_name", H5P_DEFAULT, H5P_DEFAULT) < 0)
@@ -1431,7 +1431,7 @@ test_move(hid_t fapl, hbool_t new_format)
{
moved_grp = H5Gopen2(grp_1, "group_move", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (moved_grp >= 0) {
H5_FAILED();
HDputs(" Group still in original location?");
@@ -1482,7 +1482,7 @@ test_move(hid_t fapl, hbool_t new_format)
if ((moved_grp = H5Gopen2(grp_1, "group_copy", H5P_DEFAULT)) >= 0)
FAIL_STACK_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
H5Gclose(grp_1);
H5Gclose(grp_2);
@@ -1504,7 +1504,7 @@ error:
H5Fclose(file_a);
H5Fclose(file_b);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -1561,7 +1561,7 @@ test_copy(hid_t fapl, hbool_t new_format)
FAIL)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Copy a group across files. Should fail. */
H5E_BEGIN_TRY
@@ -1569,7 +1569,7 @@ test_copy(hid_t fapl, hbool_t new_format)
if (H5Lcopy(grp_1, "group_copy", file_b, "group_new_name", H5P_DEFAULT, H5P_DEFAULT) != FAIL)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Copy a soft link across files. Should succeed. */
if (H5Lcopy(grp_2, "soft", file_b, "soft_new_name", H5P_DEFAULT, H5P_DEFAULT) < 0)
@@ -1678,7 +1678,7 @@ error:
H5Fclose(file_a);
H5Fclose(file_b);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -1918,7 +1918,7 @@ error:
H5Gclose(group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_move_preserves() */
@@ -1989,7 +1989,7 @@ test_deprec(hid_t fapl, hbool_t new_format)
if (H5Gget_objname_by_idx(group1_id, (hsize_t)1, tmpstr, sizeof(tmpstr)) >= 0)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Test getting the type for objects */
if ((obj_type = H5Gget_objtype_by_idx(group1_id, (hsize_t)0)) < 0)
@@ -2001,7 +2001,7 @@ test_deprec(hid_t fapl, hbool_t new_format)
if (H5Gget_objtype_by_idx(group1_id, (hsize_t)1) >= 0)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Test getting the number of objects in a group */
if (H5Gget_num_objs(file_id, &num_objs) < 0)
@@ -2058,7 +2058,7 @@ test_deprec(hid_t fapl, hbool_t new_format)
if (H5Gget_objinfo(file_id, "/group2/soft_link_no_exist", TRUE, NULL) >= 0)
FAIL_STACK_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Test the dangling soft link */
if (H5Gget_objinfo(file_id, "/group2/dangle_soft_link", FALSE, &sb_soft2) < 0)
@@ -2105,7 +2105,7 @@ test_deprec(hid_t fapl, hbool_t new_format)
if (H5Gopen2(file_id, "moved_group1/moved_group2", H5P_DEFAULT) >= 0)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
if (H5Fclose(file_id) < 0)
FAIL_STACK_ERROR;
@@ -2120,7 +2120,7 @@ error:
H5Gclose(group1_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_deprec() */
@@ -2185,7 +2185,7 @@ cklinks_deprec(hid_t fapl, hbool_t new_format)
{
exists = H5Lexists(file, "no_grp1/hard", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (exists >= 0) {
H5_FAILED();
HDputs(" H5Lexists() should have failed for a path with missing components.");
@@ -2195,7 +2195,7 @@ cklinks_deprec(hid_t fapl, hbool_t new_format)
{
exists = H5Lexists(file, "/no_grp1/hard", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (exists >= 0) {
H5_FAILED();
HDputs(" H5Lexists() should have failed for a path with missing components.");
@@ -2231,7 +2231,7 @@ cklinks_deprec(hid_t fapl, hbool_t new_format)
{
status = H5Oget_info_by_name2(file, "grp1/dangle", &oinfo2, H5O_INFO_BASIC, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" H5Oget_info_by_name() should have failed for a dangling link.");
@@ -2262,7 +2262,7 @@ cklinks_deprec(hid_t fapl, hbool_t new_format)
{
status = H5Oget_info_by_name2(file, "grp1/recursive", &oinfo2, H5O_INFO_BASIC, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" H5Oget_info_by_name() should have failed for a recursive link.");
@@ -2510,7 +2510,7 @@ error:
H5Sclose(space_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_lcpl_deprec() */
@@ -2751,7 +2751,7 @@ error:
H5Gclose(group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_move_preserves_deprec() */
@@ -2969,7 +2969,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_root_deprec() */
@@ -3123,7 +3123,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_query_deprec() */
@@ -3438,7 +3438,7 @@ error:
H5Fclose(fid2);
H5Fclose(fid1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* external_link_closing_deprec() */
@@ -3761,7 +3761,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end ud_hard_links_deprec() */
@@ -3945,7 +3945,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end ud_link_reregister_deprec() */
@@ -4112,7 +4112,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end ud_callbacks_deprec() */
@@ -4258,7 +4258,7 @@ lapl_nlinks_deprec(hid_t fapl, hbool_t new_format)
{
gid = H5Oopen(fid, "soft5", plist);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (gid >= 0) {
H5_FAILED();
HDputs(" Should have failed for sequence of too many nested links.");
@@ -4420,7 +4420,7 @@ error:
H5Pclose(plist);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end lapl_nlinks_deprec() */
@@ -4532,7 +4532,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end linkinfo_deprec() */
@@ -4674,7 +4674,7 @@ error:
H5Gclose(group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end corder_create_compact_deprec() */
@@ -4837,7 +4837,7 @@ error:
H5Gclose(group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end corder_create_dense_deprec() */
@@ -5126,7 +5126,7 @@ link_info_by_idx_deprec(hid_t fapl)
ret = H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, &linfo,
H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
H5E_BEGIN_TRY
@@ -5134,7 +5134,7 @@ link_info_by_idx_deprec(hid_t fapl)
name_len = H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0,
tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (name_len >= 0)
TEST_ERROR;
@@ -5178,7 +5178,7 @@ link_info_by_idx_deprec(hid_t fapl)
ret = H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &linfo,
H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
H5E_BEGIN_TRY
@@ -5186,7 +5186,7 @@ link_info_by_idx_deprec(hid_t fapl)
ret = H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)u, &linfo,
H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
H5E_BEGIN_TRY
@@ -5194,7 +5194,7 @@ link_info_by_idx_deprec(hid_t fapl)
name_len = H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u,
tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (name_len >= 0)
TEST_ERROR;
@@ -5238,7 +5238,7 @@ link_info_by_idx_deprec(hid_t fapl)
ret = H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &linfo,
H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
H5E_BEGIN_TRY
@@ -5246,7 +5246,7 @@ link_info_by_idx_deprec(hid_t fapl)
ret = H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)u, &linfo,
H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
H5E_BEGIN_TRY
@@ -5254,7 +5254,7 @@ link_info_by_idx_deprec(hid_t fapl)
name_len = H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u,
tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (name_len >= 0)
TEST_ERROR;
@@ -5283,7 +5283,7 @@ error:
H5Gclose(group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end link_info_by_idx_deprec() */
@@ -5454,7 +5454,7 @@ link_info_by_idx_old_deprec(hid_t fapl)
ret = H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &linfo,
H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
H5E_BEGIN_TRY
@@ -5462,7 +5462,7 @@ link_info_by_idx_old_deprec(hid_t fapl)
name_len = H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, tmpname,
(size_t)NAME_BUF_SIZE, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (name_len >= 0)
TEST_ERROR;
@@ -5489,7 +5489,7 @@ error:
H5Gclose(group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end link_info_by_idx_old_deprec() */
@@ -5596,7 +5596,7 @@ delete_by_idx_deprec(hid_t fapl)
{
ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -5605,7 +5605,7 @@ delete_by_idx_deprec(hid_t fapl)
{
ret = H5Ldelete_by_idx(group_id, "None", idx_type, order, (hsize_t)0, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -5637,7 +5637,7 @@ delete_by_idx_deprec(hid_t fapl)
{
ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -5711,7 +5711,7 @@ delete_by_idx_deprec(hid_t fapl)
{
ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -5763,7 +5763,7 @@ delete_by_idx_deprec(hid_t fapl)
{
ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -5897,7 +5897,7 @@ error:
H5Gclose(group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end delete_by_idx_deprec() */
@@ -5951,7 +5951,7 @@ delete_by_idx_old_deprec(hid_t fapl)
{
ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -5981,7 +5981,7 @@ delete_by_idx_old_deprec(hid_t fapl)
{
ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, order, (hsize_t)0, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -5990,7 +5990,7 @@ delete_by_idx_old_deprec(hid_t fapl)
{
ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -6037,7 +6037,7 @@ delete_by_idx_old_deprec(hid_t fapl)
{
ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -6163,7 +6163,7 @@ error:
H5Gclose(group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end delete_by_idx_old_deprec() */
@@ -6427,7 +6427,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o
{
ret = H5Literate1(group_id, idx_type, order, &skip, link_iterate_fail_deprec_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -6593,7 +6593,7 @@ link_iterate_deprec(hid_t fapl)
{
ret = H5Literate1(group_id, idx_type, order, &skip, link_iterate_deprec_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -6626,7 +6626,7 @@ link_iterate_deprec(hid_t fapl)
{
ret = H5Literate1(group_id, idx_type, order, &skip, link_iterate_deprec_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -6665,7 +6665,7 @@ error:
H5Gclose(group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (visited)
HDfree(visited);
@@ -6910,7 +6910,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma
{
ret = H5Literate1(group_id, H5_INDEX_NAME, order, &skip, link_iterate_fail_deprec_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -6920,7 +6920,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma
{
ret = H5Literate1((hid_t)(-1), H5_INDEX_NAME, order, &skip, link_iterate_fail_deprec_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -6928,7 +6928,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma
{
ret = H5Giterate((hid_t)(-1), ".", &gskip, group_iterate_old_deprec_cb, iter_info);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -7023,7 +7023,7 @@ link_iterate_old_deprec(hid_t fapl)
{
ret = H5Literate1(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_deprec_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -7034,7 +7034,7 @@ link_iterate_old_deprec(hid_t fapl)
{
ret = H5Literate1(group_id, H5_INDEX_CRT_ORDER, order, &skip, link_iterate_old_deprec_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -7066,7 +7066,7 @@ error:
H5Gclose(group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (visited)
HDfree(visited);
@@ -7289,7 +7289,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_root() */
@@ -7411,7 +7411,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_path() */
@@ -7610,7 +7610,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_mult() */
@@ -7791,7 +7791,7 @@ error:
H5Pclose(lcpl_id);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_self() */
@@ -7935,7 +7935,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_pingpong() */
@@ -8061,7 +8061,7 @@ external_link_toomany(hid_t fapl, hbool_t new_format)
{
gid = H5Gopen2(fid, "link1", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (gid >= 0) {
H5_FAILED();
HDprintf("%d: Should have failed for sequence of too many nested links.", __LINE__);
@@ -8104,7 +8104,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_toomany() */
@@ -8171,7 +8171,7 @@ external_link_dangling(hid_t fapl, hbool_t new_format)
{
gid = H5Gopen2(fid, "no_file", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (gid >= 0) {
H5_FAILED();
HDputs(" Should have failed for sequence of too many nested links.");
@@ -8183,7 +8183,7 @@ external_link_dangling(hid_t fapl, hbool_t new_format)
{
gid = H5Gopen2(fid, "no_object", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (gid >= 0) {
H5_FAILED();
HDputs(" Should have failed for sequence of too many nested links.");
@@ -8195,7 +8195,7 @@ external_link_dangling(hid_t fapl, hbool_t new_format)
{
status = H5Lget_name_by_idx(rid, "no_file", H5_INDEX_NAME, H5_ITER_INC, 0, NULL, 0, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(
@@ -8219,7 +8219,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_dangling() */
@@ -8294,7 +8294,7 @@ external_link_prefix(hid_t fapl, hbool_t new_format)
{
gid = H5Gopen2(fid, "ext_link", gapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* should be able to find the target file from pathnames set via H5Pset_elink_prefix() */
if (gid < 0) {
@@ -8318,7 +8318,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_prefix() */
@@ -8391,7 +8391,7 @@ external_link_abs_mainpath(hid_t fapl, hbool_t new_format)
{
gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* should be able to find the target file from absolute path set for main file */
if (gid < 0) {
@@ -8415,7 +8415,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_abs_mainpath() */
@@ -8479,7 +8479,7 @@ external_link_rel_mainpath(hid_t fapl, hbool_t new_format)
{
gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* should be able to find the target file from the main file's relative pathname */
if (gid < 0) {
@@ -8503,7 +8503,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_rel_mainpath() */
@@ -8572,7 +8572,7 @@ external_link_cwd(hid_t fapl, hbool_t new_format)
{
gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* should be able to find the target file from the current working directory */
if (gid < 0) {
@@ -8596,7 +8596,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_cwd() */
@@ -8670,7 +8670,7 @@ external_link_abstar(hid_t fapl, hbool_t new_format)
{
gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* should be able to find the target file with absolute path */
if (gid < 0) {
@@ -8694,7 +8694,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_abstar() */
@@ -8768,7 +8768,7 @@ external_link_abstar_cur(hid_t fapl, hbool_t new_format)
{
gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* should be able to find the target file from main file's current working directory */
if (gid < 0) {
@@ -8792,7 +8792,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_abstar_cur() */
@@ -8873,7 +8873,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_reltar() */
@@ -8943,7 +8943,7 @@ external_link_chdir(hid_t fapl, hbool_t new_format)
{
gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (HDchdir("..") < 0)
TEST_ERROR;
@@ -8973,7 +8973,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_chdir() */
@@ -9187,7 +9187,7 @@ error:
H5Oclose(oidB);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_set_elink_fapl1() */
@@ -9394,7 +9394,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(points);
HDfree(points_data);
@@ -9521,7 +9521,7 @@ error:
H5Pclose(core_fapl);
H5Pclose(stdio_fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_set_elink_fapl3() */
@@ -9578,7 +9578,7 @@ external_set_elink_acc_flags(const char *env_h5_drvr, hid_t fapl, hbool_t new_fo
{
group = H5Gcreate2(file1, "/ext_link/group", H5P_DEFAULT, H5P_DEFAULT, gapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (group != FAIL)
TEST_ERROR;
@@ -9609,7 +9609,7 @@ external_set_elink_acc_flags(const char *env_h5_drvr, hid_t fapl, hbool_t new_fo
{
subgroup = H5Gcreate2(file1, "/ext_link/group/subgroup", H5P_DEFAULT, H5P_DEFAULT, gapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (subgroup != FAIL)
TEST_ERROR;
@@ -9629,21 +9629,21 @@ external_set_elink_acc_flags(const char *env_h5_drvr, hid_t fapl, hbool_t new_fo
{
ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_TRUNC);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret != FAIL)
TEST_ERROR;
H5E_BEGIN_TRY
{
ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_EXCL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret != FAIL)
TEST_ERROR;
H5E_BEGIN_TRY
{
ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_CREAT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret != FAIL)
TEST_ERROR;
/* SWMR reader with write access */
@@ -9651,7 +9651,7 @@ external_set_elink_acc_flags(const char *env_h5_drvr, hid_t fapl, hbool_t new_fo
{
ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_RDWR | H5F_ACC_SWMR_READ);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret != FAIL)
TEST_ERROR;
/* SWMR writer with read-only access */
@@ -9659,7 +9659,7 @@ external_set_elink_acc_flags(const char *env_h5_drvr, hid_t fapl, hbool_t new_fo
{
ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_RDONLY | H5F_ACC_SWMR_WRITE);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret != FAIL)
TEST_ERROR;
@@ -9775,28 +9775,28 @@ external_set_elink_acc_flags(const char *env_h5_drvr, hid_t fapl, hbool_t new_fo
{
file1 = H5Fcreate(filename1, H5F_ACC_DEFAULT, H5P_DEFAULT, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (file1 != FAIL)
TEST_ERROR;
H5E_BEGIN_TRY
{
file1 = H5Fcreate(filename1, H5F_ACC_TRUNC | H5F_ACC_DEFAULT, H5P_DEFAULT, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (file1 != FAIL)
TEST_ERROR;
H5E_BEGIN_TRY
{
file1 = H5Fopen(filename1, H5F_ACC_DEFAULT, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (file1 != FAIL)
TEST_ERROR;
H5E_BEGIN_TRY
{
file1 = H5Fopen(filename1, H5F_ACC_RDWR | H5F_ACC_DEFAULT, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (file1 != FAIL)
TEST_ERROR;
@@ -9816,7 +9816,7 @@ error:
H5Fclose(file2);
H5Pclose(gapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_set_elink_acc_flags() */
@@ -9981,7 +9981,7 @@ external_set_elink_cb(hid_t fapl, hbool_t new_format)
{
group = H5Gopen2(file1, "/group1/ext_link/group2", gapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (group != FAIL)
TEST_ERROR;
@@ -9993,7 +9993,7 @@ external_set_elink_cb(hid_t fapl, hbool_t new_format)
{
group = H5Gopen2(file1, "/group1/ext_link/group2", gapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (group != FAIL)
TEST_ERROR;
@@ -10016,7 +10016,7 @@ error:
H5Pclose(ret_fapl);
H5Pclose(fam_fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_set_elink_cb() */
@@ -10074,7 +10074,7 @@ external_reset_register(void)
{
H5Fdelete(filename, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
PASSED();
return SUCCEED;
@@ -10084,7 +10084,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_reset_register() */
@@ -10156,7 +10156,7 @@ external_link_win1(hid_t fapl, hbool_t new_format)
{
gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* should be able to find the target file via main file's CWD*/
if (gid < 0) {
@@ -10180,7 +10180,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_win1() */
@@ -10253,7 +10253,7 @@ external_link_win2(hid_t fapl, hbool_t new_format)
{
gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* should be able to find the target file directly */
if (gid < 0) {
@@ -10277,7 +10277,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_win2() */
@@ -10347,7 +10347,7 @@ external_link_win3(hid_t fapl, hbool_t new_format)
{
gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* should be able to find the target file directly */
if (gid < 0) {
@@ -10371,7 +10371,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_win3() */
@@ -10438,7 +10438,7 @@ external_link_win4(hid_t fapl, hbool_t new_format)
{
gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* should be able to find the target file via main file's absolute drive/relative path */
if (gid < 0) {
@@ -10462,7 +10462,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_win4() */
@@ -10539,7 +10539,7 @@ external_link_win5(hid_t fapl, hbool_t new_format)
{
gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* should be able to find the target file via main file's rel drive/abs path */
if (gid < 0) {
@@ -10563,7 +10563,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_win5() */
@@ -10637,7 +10637,7 @@ external_link_win6(hid_t fapl, hbool_t new_format)
{
gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* should be able to find the target file via target file's rel path in current drive */
if (gid < 0) {
@@ -10661,7 +10661,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_win6() */
@@ -10732,7 +10732,7 @@ external_link_win7(hid_t fapl, hbool_t new_format)
{
gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* should be able to find the target file via main file's local host/main drive*/
if (gid < 0) {
@@ -10756,7 +10756,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_win7() */
@@ -10832,7 +10832,7 @@ external_link_win8(hid_t fapl, hbool_t new_format)
{
gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* should be able to find the target file directly */
if (gid < 0) {
@@ -10856,7 +10856,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_win8() */
@@ -10927,7 +10927,7 @@ external_link_win9(hid_t fapl, hbool_t new_format)
{
gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* should be able to find the target file via main file's local host/main drive*/
if (gid < 0) {
@@ -10951,7 +10951,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_win9() */
@@ -11002,7 +11002,7 @@ external_link_recursive(hid_t fapl, hbool_t new_format)
{
gid = H5Gopen2(fid, "recursive", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (gid >= 0) {
H5_FAILED();
HDputs(" Should have failed for recursive external links.");
@@ -11022,7 +11022,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_recursive() */
@@ -11176,7 +11176,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_query() */
@@ -11269,7 +11269,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_unlink_compact() */
@@ -11446,7 +11446,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_unlink_dense() */
@@ -11680,7 +11680,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_move() */
@@ -11912,7 +11912,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_ride() */
@@ -12227,7 +12227,7 @@ error:
H5Fclose(fid2);
H5Fclose(fid1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* external_link_closing() */
@@ -12313,7 +12313,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
}
@@ -12418,7 +12418,7 @@ error:
H5Fclose(fid2);
H5Fclose(fid1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end external_link_strong() */
@@ -12695,7 +12695,7 @@ error:
H5Fclose(file2);
H5Fclose(file1);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(filename1);
HDfree(filename2a);
@@ -14150,7 +14150,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end ud_hard_links() */
@@ -14362,7 +14362,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end ud_link_reregister() */
@@ -14673,7 +14673,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end ud_callbacks() */
@@ -14828,7 +14828,7 @@ error:
H5Gclose(gid2);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end lapl_udata() */
@@ -15100,7 +15100,7 @@ ud_link_errors(hid_t fapl, hbool_t new_format)
if (H5Lcreate_ud(fid, "/ud_link", (H5L_type_t)UD_CBFAIL_TYPE, NULL, 1, H5P_DEFAULT, H5P_DEFAULT) >= 0)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Create a user-defined link to the group. */
HDstrcpy(group_name, "/group");
@@ -15208,7 +15208,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end ud_link_errors() */
@@ -15354,7 +15354,7 @@ lapl_nlinks(hid_t fapl, hbool_t new_format)
{
gid = H5Oopen(fid, "soft5", plist);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (gid >= 0) {
H5_FAILED();
HDputs(" Should have failed for sequence of too many nested links.");
@@ -15516,7 +15516,7 @@ error:
H5Pclose(plist);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end lapl_nlinks() */
@@ -15628,7 +15628,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end linkinfo() */
@@ -15680,7 +15680,7 @@ error:
{
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end check_all_closed() */
@@ -15809,7 +15809,7 @@ error:
{
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end build_visit_file() */
@@ -15912,7 +15912,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end link_visit() */
@@ -16000,7 +16000,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end link_visit_by_name() */
@@ -16107,7 +16107,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end obj_visit() */
@@ -16204,7 +16204,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end obj_visit_by_name() */
@@ -16287,7 +16287,7 @@ error:
{
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end obj_visit_stop() */
@@ -16765,7 +16765,7 @@ error:
H5Pclose(gcpl2);
H5Pclose(fcpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end link_filters() */
@@ -17094,7 +17094,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end obj_exists() */
@@ -17139,7 +17139,7 @@ corder_create_empty(hid_t fapl)
{
ret = H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_INDEXED);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret > 0) {
H5_FAILED();
HDputs(
@@ -17223,7 +17223,7 @@ error:
H5Gclose(group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end corder_create_empty() */
@@ -17365,7 +17365,7 @@ error:
H5Gclose(group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end corder_create_compact() */
@@ -17528,7 +17528,7 @@ error:
H5Gclose(group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end corder_create_dense() */
@@ -17824,7 +17824,7 @@ error:
H5Gclose(group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end corder_transition() */
@@ -17975,7 +17975,7 @@ error:
H5Gclose(group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end corder_delete() */
@@ -18259,7 +18259,7 @@ link_info_by_idx(hid_t fapl)
ret = H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, &linfo,
H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
H5E_BEGIN_TRY
@@ -18267,7 +18267,7 @@ link_info_by_idx(hid_t fapl)
name_len = H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0,
tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (name_len >= 0)
TEST_ERROR;
@@ -18311,7 +18311,7 @@ link_info_by_idx(hid_t fapl)
ret = H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &linfo,
H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
H5E_BEGIN_TRY
@@ -18319,7 +18319,7 @@ link_info_by_idx(hid_t fapl)
ret = H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)u, &linfo,
H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
H5E_BEGIN_TRY
@@ -18327,7 +18327,7 @@ link_info_by_idx(hid_t fapl)
name_len = H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u,
tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (name_len >= 0)
TEST_ERROR;
@@ -18371,7 +18371,7 @@ link_info_by_idx(hid_t fapl)
ret = H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &linfo,
H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
H5E_BEGIN_TRY
@@ -18379,7 +18379,7 @@ link_info_by_idx(hid_t fapl)
ret = H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)u, &linfo,
H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
H5E_BEGIN_TRY
@@ -18387,7 +18387,7 @@ link_info_by_idx(hid_t fapl)
name_len = H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u,
tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (name_len >= 0)
TEST_ERROR;
@@ -18416,7 +18416,7 @@ error:
H5Gclose(group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end link_info_by_idx() */
@@ -18605,7 +18605,7 @@ link_info_by_idx_old(hid_t fapl)
ret = H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &linfo,
H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
H5E_BEGIN_TRY
@@ -18613,7 +18613,7 @@ link_info_by_idx_old(hid_t fapl)
name_len = H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, tmpname,
(size_t)NAME_BUF_SIZE, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (name_len >= 0)
TEST_ERROR;
@@ -18640,7 +18640,7 @@ error:
H5Gclose(group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end link_info_by_idx_old() */
@@ -18747,7 +18747,7 @@ delete_by_idx(hid_t fapl)
{
ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -18756,7 +18756,7 @@ delete_by_idx(hid_t fapl)
{
ret = H5Ldelete_by_idx(group_id, "None", idx_type, order, (hsize_t)0, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -18788,7 +18788,7 @@ delete_by_idx(hid_t fapl)
{
ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -18862,7 +18862,7 @@ delete_by_idx(hid_t fapl)
{
ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -18914,7 +18914,7 @@ delete_by_idx(hid_t fapl)
{
ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -19048,7 +19048,7 @@ error:
H5Gclose(group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end delete_by_idx() */
@@ -19111,7 +19111,7 @@ delete_by_idx_old(hid_t fapl)
{
ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -19142,7 +19142,7 @@ delete_by_idx_old(hid_t fapl)
{
ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, order, (hsize_t)0, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -19151,7 +19151,7 @@ delete_by_idx_old(hid_t fapl)
{
ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -19202,7 +19202,7 @@ delete_by_idx_old(hid_t fapl)
{
ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -19337,7 +19337,7 @@ error:
H5Gclose(group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end delete_by_idx_old() */
@@ -19616,7 +19616,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u
{
ret = H5Literate2(group_id, idx_type, order, &skip, link_iterate_fail_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -19782,7 +19782,7 @@ link_iterate(hid_t fapl)
{
ret = H5Literate2(group_id, idx_type, order, &skip, link_iterate_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -19815,7 +19815,7 @@ link_iterate(hid_t fapl)
{
ret = H5Literate2(group_id, idx_type, order, &skip, link_iterate_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -19854,7 +19854,7 @@ error:
H5Gclose(group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (visited)
HDfree(visited);
@@ -20113,7 +20113,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links
{
ret = H5Literate2(group_id, H5_INDEX_NAME, order, &skip, link_iterate_fail_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -20123,7 +20123,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links
{
ret = H5Literate2((hid_t)(-1), H5_INDEX_NAME, order, &skip, link_iterate_fail_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -20132,7 +20132,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links
{
ret = H5Giterate((hid_t)(-1), ".", &gskip, group_iterate_old_cb, iter_info);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
#endif /* H5_NO_DEPRECATED_SYMBOLS */
@@ -20225,7 +20225,7 @@ link_iterate_old(hid_t fapl)
{
ret = H5Literate2(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -20236,7 +20236,7 @@ link_iterate_old(hid_t fapl)
{
ret = H5Literate2(group_id, H5_INDEX_CRT_ORDER, order, &skip, link_iterate_old_cb, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -20268,7 +20268,7 @@ error:
H5Gclose(group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (visited)
HDfree(visited);
@@ -20518,7 +20518,7 @@ open_by_idx(hid_t fapl)
{
ret = H5Oopen_by_idx(group_id, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -20558,7 +20558,7 @@ open_by_idx(hid_t fapl)
{
ret = H5Oopen_by_idx(group_id, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -20602,7 +20602,7 @@ open_by_idx(hid_t fapl)
{
ret = H5Oopen_by_idx(group_id, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -20649,7 +20649,7 @@ error:
H5Fclose(file_id);
H5Fclose(mount_file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (objno)
HDfree(objno);
@@ -20833,7 +20833,7 @@ open_by_idx_old(hid_t fapl)
{
ret = H5Oopen_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -20872,7 +20872,7 @@ open_by_idx_old(hid_t fapl)
{
ret = H5Oopen_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -20881,7 +20881,7 @@ open_by_idx_old(hid_t fapl)
{
ret = H5Oopen_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, order, (hsize_t)(u - 1), H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -20917,7 +20917,7 @@ error:
H5Fclose(file_id);
H5Fclose(mount_file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end open_by_idx_old() */
@@ -21141,7 +21141,7 @@ object_info(hid_t fapl)
ret = H5Oget_info_by_idx3(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, &oinfo,
H5O_INFO_BASIC, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -21198,7 +21198,7 @@ object_info(hid_t fapl)
ret = H5Oget_info_by_idx3(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &oinfo,
H5O_INFO_BASIC, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -21259,7 +21259,7 @@ object_info(hid_t fapl)
ret = H5Oget_info_by_idx3(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &oinfo,
H5O_INFO_BASIC, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -21302,7 +21302,7 @@ error:
H5Gclose(soft_group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (objno)
HDfree(objno);
@@ -21459,7 +21459,7 @@ object_info_old(hid_t fapl)
ret = H5Oget_info_by_idx3(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, &oinfo, H5O_INFO_BASIC,
H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -21515,7 +21515,7 @@ object_info_old(hid_t fapl)
ret = H5Oget_info_by_idx3(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &oinfo, H5O_INFO_BASIC,
H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -21525,7 +21525,7 @@ object_info_old(hid_t fapl)
ret = H5Oget_info_by_idx3(group_id, ".", H5_INDEX_CRT_ORDER, order, (hsize_t)(u - 1), &oinfo,
H5O_INFO_BASIC, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -21561,7 +21561,7 @@ error:
H5Gclose(soft_group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end object_info_old() */
@@ -21692,7 +21692,7 @@ group_info(hid_t fapl)
ret = H5Gget_info_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, &grp_info,
H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -21884,7 +21884,7 @@ group_info(hid_t fapl)
ret = H5Gget_info_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &grp_info,
H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -22076,7 +22076,7 @@ group_info(hid_t fapl)
ret = H5Gget_info_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &grp_info,
H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -22110,7 +22110,7 @@ error:
H5Gclose(soft_group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end group_info() */
@@ -22172,7 +22172,7 @@ group_info_old(hid_t fapl)
{
ret = H5Gget_info_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, &grp_info, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -22362,7 +22362,7 @@ group_info_old(hid_t fapl)
{
ret = H5Gget_info_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &grp_info, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -22372,7 +22372,7 @@ group_info_old(hid_t fapl)
ret = H5Gget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, order, (hsize_t)0, &grp_info,
H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -22399,7 +22399,7 @@ error:
H5Gclose(soft_group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end group_info_old() */
@@ -22636,7 +22636,7 @@ error:
H5Gclose(group_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end timestamps() */
diff --git a/test/links_env.c b/test/links_env.c
index 27e29ea..69a35f6 100644
--- a/test/links_env.c
+++ b/test/links_env.c
@@ -107,7 +107,7 @@ external_link_env(hid_t fapl, hbool_t new_format)
{
gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should be able to find the target file from pathnames set via HDF5_EXT_PREFIX */
if (gid < 0) {
@@ -131,7 +131,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end external_link_env() */
diff --git a/test/mf.c b/test/mf.c
index 11550ef..a154c42 100644
--- a/test/mf.c
+++ b/test/mf.c
@@ -336,7 +336,7 @@ error:
H5Pclose(fapl_new);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_eoa() */
@@ -627,7 +627,7 @@ error:
H5Pclose(fapl_new);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_eoa_shrink() */
@@ -834,7 +834,7 @@ error:
H5Pclose(fapl_new);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_eoa_extend() */
@@ -942,14 +942,14 @@ test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
{
status = H5F_block_read(f, H5FD_MEM_SUPER, tmp_addr, sizeof(buf), &buf);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
TEST_ERROR;
H5E_BEGIN_TRY
{
status = H5F_block_write(f, H5FD_MEM_SUPER, tmp_addr, sizeof(buf), &buf);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
TEST_ERROR;
@@ -958,7 +958,7 @@ test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
{
status = H5MF_xfree(f, H5FD_MEM_SUPER, tmp_addr, (hsize_t)TBLOCK_SIZE30);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
TEST_ERROR;
@@ -999,7 +999,7 @@ test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
{
check_addr = H5MF_alloc_tmp(f, (hsize_t)(maxaddr / 3));
}
- H5E_END_TRY;
+ H5E_END_TRY
if (H5_addr_defined(check_addr))
TEST_ERROR;
@@ -1008,7 +1008,7 @@ test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
{
check_addr = H5MF_alloc(f, H5FD_MEM_DRAW, (hsize_t)(maxaddr / 3));
}
- H5E_END_TRY;
+ H5E_END_TRY
if (H5_addr_defined(check_addr))
TEST_ERROR;
@@ -1042,7 +1042,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_tmp() */
@@ -1134,7 +1134,7 @@ error:
H5Pclose(fapl_new);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_fs_start() */
@@ -1451,7 +1451,7 @@ error:
H5Pclose(fapl_new);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_fs_alloc_free() */
@@ -1972,7 +1972,7 @@ error:
H5Pclose(fapl_new);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_fs_extend() */
@@ -2155,7 +2155,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_fs_absorb() */
@@ -2301,7 +2301,7 @@ error:
H5Fclose(file);
H5Pclose(fcpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_aggr_alloc1() */
@@ -2445,7 +2445,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_aggr_alloc2() */
@@ -2611,7 +2611,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_aggr_alloc3() */
@@ -2779,7 +2779,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_aggr_alloc4() */
@@ -2905,7 +2905,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_aggr_alloc5() */
@@ -3068,7 +3068,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_aggr_alloc6() */
@@ -3260,7 +3260,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_aggr_alloc7() */
@@ -3559,7 +3559,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_aggr_extend() */
@@ -3799,7 +3799,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_aggr_absorb() */
@@ -4096,7 +4096,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_align_eoa() */
@@ -4391,7 +4391,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_align_fs() */
@@ -4667,7 +4667,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_align_alloc1() */
@@ -4961,7 +4961,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_align_alloc2() */
@@ -5347,7 +5347,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_align_alloc3() */
@@ -5563,7 +5563,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_align_alloc4() */
@@ -5793,7 +5793,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_align_alloc5() */
@@ -6108,7 +6108,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_mf_align_alloc6() */
@@ -6285,7 +6285,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_bug1() */
@@ -6564,7 +6564,7 @@ error:
H5Pclose(fcpl);
H5Pclose(fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_fs_persist_split() */
@@ -6921,7 +6921,7 @@ error:
H5Pclose(fcpl);
H5Pclose(fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_fs_persist_multi() */
#endif /* PB_OUT */
@@ -7097,7 +7097,7 @@ error:
H5Pclose(fcpl);
H5Pclose(fapl2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_fs_persist() */
@@ -7286,7 +7286,7 @@ error:
H5Pclose(fcpl);
H5Pclose(fapl2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_fs_gone() */
@@ -7455,7 +7455,7 @@ error:
H5Pclose(fapl2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_strat_thres_persist() */
@@ -7644,7 +7644,7 @@ error:
H5Pclose(fapl2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_mf_strat_thres_gone() */
@@ -7735,7 +7735,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_dichotomy() */
@@ -8017,7 +8017,7 @@ error:
H5Pclose(fcpl);
H5Pclose(fapl_new);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_page_alloc_xfree() */
@@ -8148,7 +8148,7 @@ error:
H5Fclose(fid);
H5Pclose(fcpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_page_try_shrink() */
@@ -8328,7 +8328,7 @@ error:
H5Fclose(fid);
H5Pclose(fcpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_page_small_try_extend() */
@@ -8491,7 +8491,7 @@ error:
H5Fclose(fid);
H5Pclose(fcpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_page_large_try_extend() */
@@ -8646,7 +8646,7 @@ error:
{
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_page_large() */
@@ -8818,7 +8818,7 @@ error:
H5Fclose(fid);
H5Pclose(fcpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_page_small() */
@@ -9133,7 +9133,7 @@ error:
H5Pclose(fcpl);
H5Pclose(fapl_new);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* test_page_alignment() */
@@ -9294,7 +9294,7 @@ error:
H5Pclose(fapl);
H5Pclose(new_fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (api_ctx_pushed)
H5CX_pop(FALSE);
diff --git a/test/mirror_vfd.c b/test/mirror_vfd.c
index 489a9c0..f950db0 100644
--- a/test/mirror_vfd.c
+++ b/test/mirror_vfd.c
@@ -262,7 +262,7 @@ error:
{
H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_fapl_configuration() */
@@ -1274,7 +1274,7 @@ error:
H5Pclose(splitter_config->rw_fapl_id);
H5Pclose(ret_value);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(splitter_config);
return H5I_INVALID_HID;
@@ -1329,7 +1329,7 @@ error:
H5Fclose(file_id);
H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_create_and_close() */
@@ -1497,7 +1497,7 @@ error:
*/
H5Pclose(dcpl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
LOGPRINT(1, "_create_chunking_ids() FAILED\n");
@@ -1815,7 +1815,7 @@ error:
H5Sclose(dspace_id);
H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_basic_dataset_write() */
@@ -1903,7 +1903,7 @@ error:
H5Fclose(file_id);
H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_chunked_dataset_write() */
@@ -1995,7 +1995,7 @@ error:
H5Gclose(grp_id);
H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_on_disk_zoo() */
@@ -2137,7 +2137,7 @@ error:
H5Dclose(dset_id);
H5Sclose(dspace_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* test_vanishing_datasets() */
@@ -2274,7 +2274,7 @@ error:
H5Pclose(bundle[i].fapl_id);
}
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(bundle);
HDfree(buf);
return -1;
diff --git a/test/mount.c b/test/mount.c
index 6807f36..8ea5fe9 100644
--- a/test/mount.c
+++ b/test/mount.c
@@ -97,7 +97,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end setup() */
@@ -151,7 +151,7 @@ error:
H5Fclose(file1);
H5Fclose(file2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_basic() */
@@ -197,7 +197,7 @@ test_illegal(hid_t fapl)
{
status = H5Fmount(file1, "/mnt1", file1, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" Mounting a file on itself should have failed.");
@@ -217,7 +217,7 @@ test_illegal(hid_t fapl)
{
status = H5Fmount(mnt, ".", file3, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" Mounting two files at one mount point should have failed.");
@@ -242,7 +242,7 @@ test_illegal(hid_t fapl)
{
status = H5Fmount(mnt, ".", file3b, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" Mounting same file opened twice at one mount point should have failed.");
@@ -260,7 +260,7 @@ test_illegal(hid_t fapl)
{
status = H5Fmount(file2, "/mnt1/file2", file1b, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" Creating a cycle with mount points should have failed.");
@@ -294,7 +294,7 @@ error:
H5Fclose(file3);
H5Fclose(file3b);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_illegal() */
@@ -365,7 +365,7 @@ test_samefile(hid_t fapl)
{
status = H5Fmount(mnt1b, ".", file3, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
FAIL_PUTS_ERROR(" Mounting different files at one mount point should have failed.");
if (H5Funmount(mnt1a, ".") < 0)
@@ -404,7 +404,7 @@ test_samefile(hid_t fapl)
{
status = H5Fmount(mnt1b, ".", file2, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
FAIL_PUTS_ERROR(" Mounting same files at one mount point should have failed.");
if (H5Funmount(mnt1a, ".") < 0)
@@ -437,7 +437,7 @@ error:
H5Fclose(file2);
H5Fclose(file3);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_samefile() */
@@ -486,7 +486,7 @@ test_hide(hid_t fapl)
{
grp = H5Gopen2(file1, "/mnt1/file1", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (grp >= 0) {
H5_FAILED();
HDputs(" Name is still accessible under mount point.");
@@ -536,7 +536,7 @@ error:
H5Fclose(file1);
H5Fclose(file2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_hide() */
@@ -622,7 +622,7 @@ error:
H5Fclose(file2);
H5Fclose(file1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_assoc() */
@@ -690,7 +690,7 @@ error:
H5Fclose(file1);
H5Fclose(file2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_mntlnk() */
@@ -735,7 +735,7 @@ test_move(hid_t fapl)
{
status = H5Lmove(file1, "/mnt1/rename_b/y", H5L_SAME_LOC, "/y", H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" Moving an object across files shouldn't have been possible");
@@ -759,7 +759,7 @@ error:
H5Fclose(file1);
H5Fclose(file2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_move() */
@@ -825,7 +825,7 @@ error:
H5Fclose(file2);
H5Fclose(file1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_preopen() */
@@ -898,7 +898,7 @@ error:
H5Fclose(file2);
H5Fclose(file1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_postopen() */
@@ -965,7 +965,7 @@ test_unlink(hid_t fapl)
{
status = H5Oget_info_by_name3(mnt, "file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" Incorrect traversal from mount point!");
@@ -986,7 +986,7 @@ test_unlink(hid_t fapl)
{
status = H5Oget_info_by_name3(mnt, "file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" Traversal through mount point should not have worked!");
@@ -996,7 +996,7 @@ test_unlink(hid_t fapl)
{
status = H5Oget_info_by_name3(file2, "/mnt_unlink/file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" Traversal through mount point should not have worked!");
@@ -1012,7 +1012,7 @@ test_unlink(hid_t fapl)
{
status = H5Funmount(file1, "/mnt_unlink");
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDprintf(" %d: Unmount by name should not have been allowed!\n", __LINE__);
@@ -1022,7 +1022,7 @@ test_unlink(hid_t fapl)
{
status = H5Funmount(file2, "/");
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDprintf(" %d: Unmount by name should not have been allowed!\n", __LINE__);
@@ -1052,7 +1052,7 @@ error:
H5Fclose(file2);
H5Fclose(file1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_unlink() */
@@ -1113,7 +1113,7 @@ error:
H5Fclose(file1);
H5Fclose(file2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_mvmpt() */
@@ -1158,7 +1158,7 @@ test_interlink(hid_t fapl)
{
status = H5Lcreate_hard(file1, "/mnt1/file2", H5L_SAME_LOC, "/file2", H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" Interfile hard link should not have been allowed!");
@@ -1170,7 +1170,7 @@ test_interlink(hid_t fapl)
{
status = H5Lmove(file1, "/mnt1/file2", H5L_SAME_LOC, "/file2", H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0) {
H5_FAILED();
HDputs(" Interfile renaming should not have been allowed!");
@@ -1193,7 +1193,7 @@ test_interlink(hid_t fapl)
{
dset = H5Dcreate2(file1, "/mnt1/file2/dset", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (dset >= 0) {
H5_FAILED();
HDputs(" Dataset and shared type must be in the same file!");
@@ -1232,7 +1232,7 @@ error:
H5Fclose(file1);
H5Fclose(file2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_interlink() */
@@ -1310,7 +1310,7 @@ error:
H5Fclose(file1);
H5Fclose(file2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_uniformity() */
@@ -1397,7 +1397,7 @@ error:
H5Fclose(file1);
H5Fclose(file2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_close() */
@@ -1630,7 +1630,7 @@ error:
H5Fclose(fid1);
H5Fclose(fid2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_mount_after_close() */
@@ -1897,7 +1897,7 @@ error:
H5Fclose(fid2);
H5Fclose(fid1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -2047,7 +2047,7 @@ error:
H5Fclose(fid2);
H5Fclose(fid1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_missing_unmount() */
@@ -2175,7 +2175,7 @@ error:
H5Fclose(fid2);
H5Fclose(fid1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_hold_open_file() */
@@ -2329,7 +2329,7 @@ error:
H5Fclose(fid2);
H5Fclose(fid1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_hold_open_group() */
@@ -2411,7 +2411,7 @@ test_fcdegree_same(hid_t fapl)
{
ret = H5Fmount(gidA, ".", fid2, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -2471,7 +2471,7 @@ error:
H5Fclose(fid2);
H5Fclose(fid1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_fcdegree_same() */
@@ -2565,7 +2565,7 @@ test_fcdegree_semi(hid_t fapl)
{
ret = H5Fclose(fid2);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -2578,7 +2578,7 @@ test_fcdegree_semi(hid_t fapl)
{
ret = H5Fclose(fid2);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -2612,7 +2612,7 @@ error:
H5Fclose(fid2);
H5Fclose(fid1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_fcdegree_semi() */
@@ -2717,14 +2717,14 @@ test_fcdegree_strong(hid_t fapl)
{
ret = H5Oget_info3(gidA, &oinfo, H5O_INFO_BASIC);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
H5E_BEGIN_TRY
{
ret = H5Oget_info3(gidAM, &oinfo, H5O_INFO_BASIC);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -2750,7 +2750,7 @@ error:
H5Fclose(fid2);
H5Fclose(fid1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_fcdegree_strong() */
@@ -2859,14 +2859,14 @@ test_acc_perm(hid_t fapl)
{
bad_id = H5Gcreate2(gidAM, "Z", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (bad_id >= 0)
TEST_ERROR;
H5E_BEGIN_TRY
{
bad_id = H5Gcreate2(fid1, "/A/L", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (bad_id >= 0)
TEST_ERROR;
@@ -2909,7 +2909,7 @@ test_acc_perm(hid_t fapl)
{
bad_id = H5Gcreate2(fid1, "/A/L", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (bad_id >= 0)
TEST_ERROR;
@@ -2954,7 +2954,7 @@ error:
H5Fclose(fid2);
H5Fclose(fid1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_acc_perm() */
@@ -3175,7 +3175,7 @@ error:
H5Fclose(fid2);
H5Fclose(fid1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_mult_mount() */
@@ -3307,7 +3307,7 @@ test_nested_survive(hid_t fapl)
{
gidAMS = H5Gopen2(fid1, "A/M/S", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (gidAMS >= 0)
TEST_ERROR;
@@ -3386,7 +3386,7 @@ error:
H5Fclose(fid2);
H5Fclose(fid1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_nested_survive() */
@@ -3520,7 +3520,7 @@ error:
H5Fclose(fid2);
H5Fclose(fid1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_close_parent() */
@@ -3820,7 +3820,7 @@ test_cut_graph(hid_t fapl)
{
gidK = H5Gopen2(gidQ, "/A/D/K", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (gidK >= 0)
TEST_ERROR;
@@ -3843,7 +3843,7 @@ test_cut_graph(hid_t fapl)
{
gidO = H5Gopen2(gidM, "/B/H/O", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (gidO >= 0)
TEST_ERROR;
@@ -3945,7 +3945,7 @@ error:
H5Fclose(fid2);
H5Fclose(fid1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_cut_graph() */
@@ -4055,7 +4055,7 @@ test_symlink(hid_t fapl)
{
gidL = H5Gopen2(fid1, "L", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (gidL >= 0)
TEST_ERROR;
@@ -4109,7 +4109,7 @@ error:
H5Fclose(fid2);
H5Fclose(fid1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_symlink() */
@@ -4212,7 +4212,7 @@ error:
H5Fclose(fid2[i]);
}
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_sharedacc() */
@@ -4369,7 +4369,7 @@ error:
H5Fclose(fid2);
H5Fclose(fid3);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_sharedclose() */
@@ -4522,7 +4522,7 @@ error:
H5Fclose(fid2);
H5Fclose(fid2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_multisharedclose() */
diff --git a/test/ntypes.c b/test/ntypes.c
index 707c71d..decd1c2 100644
--- a/test/ntypes.c
+++ b/test/ntypes.c
@@ -292,7 +292,7 @@ error:
H5Tclose(dtype);
H5Sclose(space);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(ipoints2);
HDfree(icheck2);
@@ -614,7 +614,7 @@ error:
H5Tclose(dtype);
H5Tclose(native_type);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -825,7 +825,7 @@ error:
H5Tclose(native_type);
H5Tclose(tid2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -1064,7 +1064,7 @@ error:
H5Tclose(tid_m);
H5Tclose(tid_m2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -1289,7 +1289,7 @@ error:
H5Tclose(tid2);
H5Tclose(tid_m);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -1446,7 +1446,7 @@ error:
H5Tclose(tid);
H5Tclose(tid_m);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -1632,7 +1632,7 @@ error:
H5Tclose(tid3);
H5Tclose(tid_m);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -1779,7 +1779,7 @@ error:
H5Tclose(tid);
H5Tclose(tid_m);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(ipoints3);
HDfree(icheck3);
@@ -1986,7 +1986,7 @@ error:
H5Tclose(tid_m);
H5Tclose(tid_m2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_vl_type() */
@@ -2124,7 +2124,7 @@ error:
H5Tclose(sid1);
H5Tclose(tid1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_vlstr_dtype() */
@@ -2244,7 +2244,7 @@ error:
H5Tclose(tid1);
H5Tclose(sid1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_str_dtype() */
@@ -2415,7 +2415,7 @@ error:
H5Tclose(native_type);
H5Dclose(dataset);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* test_refer_dtype() */
@@ -2627,7 +2627,7 @@ error:
H5Dclose(dset2);
H5Dclose(dset1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* test_refer_dtype2() */
@@ -2724,7 +2724,7 @@ error:
H5Dclose(dset);
H5Dclose(dataset);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* test_opaque_dtype */
@@ -2878,7 +2878,7 @@ error:
H5Dclose(dataset1);
H5Dclose(dataset2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* test_bitfield_dtype */
@@ -3088,7 +3088,7 @@ error:
H5Fclose(fid1);
H5Fclose(fid2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_ninteger() */
@@ -3166,7 +3166,7 @@ error:
H5Fclose(file);
h5_cleanup(FILENAME, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
nerrors = MAX(1, nerrors);
HDprintf("***** %d DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
diff --git a/test/objcopy.c b/test/objcopy.c
index eac99e0..d5c4947 100644
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -330,7 +330,7 @@ error:
H5Dclose(did2);
H5Aclose(aid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (-1);
}
@@ -426,7 +426,7 @@ error:
H5Dclose(dsetv_id);
H5Aclose(aid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (-1);
}
@@ -551,7 +551,7 @@ error:
H5Dclose(dsetv_id);
H5Pclose(pid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (-1);
}
@@ -919,7 +919,7 @@ error:
H5Tclose(tid2);
H5Tclose(tid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FALSE;
} /* end compare_attribute() */
@@ -1006,7 +1006,7 @@ error:
H5Aclose(aid2);
H5Aclose(aid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FALSE;
} /* end compare_std_attributes() */
@@ -1533,7 +1533,7 @@ error:
H5Tclose(tid2);
H5Tclose(tid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FALSE;
} /* end compare_datasets() */
@@ -1736,7 +1736,7 @@ error:
H5E_BEGIN_TRY
{
}
- H5E_END_TRY;
+ H5E_END_TRY
return FALSE;
} /* end compare_groups() */
@@ -1887,7 +1887,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_named_datatype */
@@ -1997,7 +1997,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_named_datatype_vl */
@@ -2115,7 +2115,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_named_datatype_vl_vl */
@@ -2298,7 +2298,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_named_datatype_attr_self */
@@ -2435,7 +2435,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_simple */
@@ -2550,7 +2550,7 @@ test_copy_dataset_versionbounds(hid_t fcpl_src, hid_t fapl_src)
{
ret = H5Pset_libver_bounds(fapl_dst, low, high);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret < 0) /* Invalid low/high combinations */
continue;
@@ -2571,7 +2571,7 @@ test_copy_dataset_versionbounds(hid_t fcpl_src, hid_t fapl_src)
ret = H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT,
H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* If copy failed, check if the failure is expected */
if (ret < 0) {
@@ -2639,7 +2639,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_versionbounds */
@@ -2761,7 +2761,7 @@ error:
H5Sclose(sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_simple_samefile */
@@ -2902,7 +2902,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_simple_empty */
@@ -3057,7 +3057,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_compound */
@@ -3583,7 +3583,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_chunked */
@@ -4086,7 +4086,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_chunked_empty */
@@ -4467,7 +4467,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_chunked_sparse */
@@ -4884,7 +4884,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
#endif /* H5_HAVE_FILTER_DEFLATE */
} /* end test_copy_dataset_compressed */
@@ -5071,7 +5071,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
#endif /* H5_HAVE_FILTER_DEFLATE */
} /* end test_copy_dataset_no_edge_filt */
@@ -5233,7 +5233,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_compact */
@@ -5381,7 +5381,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_external */
@@ -5526,7 +5526,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_named_dtype */
@@ -5693,7 +5693,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_named_dtype_hier */
@@ -5861,7 +5861,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_named_dtype_hier_outside */
@@ -6040,7 +6040,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_multi_ohdr_chunks */
@@ -6211,7 +6211,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_attr_named_dtype */
@@ -6371,7 +6371,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_contig_vl */
@@ -6588,7 +6588,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_chunked_vl */
@@ -6759,7 +6759,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_compact_vl */
@@ -6900,7 +6900,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_simple_empty */
@@ -7084,7 +7084,7 @@ error:
H5Tclose(tid2);
H5Pclose(dxpl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FALSE;
} /* compare_attribute_compound_vlstr() */
@@ -7251,7 +7251,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_attribute_compound_vlstr() */
@@ -7441,7 +7441,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
#endif /* H5_HAVE_FILTER_DEFLATE */
} /* end test_copy_dataset_compressed_vl */
@@ -7552,7 +7552,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_group_empty */
@@ -7711,7 +7711,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_root_group */
@@ -7870,7 +7870,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_group */
@@ -8039,7 +8039,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_group_deep */
@@ -8171,7 +8171,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_group_loop */
@@ -8324,7 +8324,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_group_wide_loop */
@@ -8649,7 +8649,7 @@ error:
H5Fclose(fid_src);
H5Pclose(plid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_group_links */
@@ -8811,7 +8811,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_soft_link */
@@ -8975,7 +8975,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_ext_link */
@@ -9079,7 +9079,7 @@ test_copy_exist(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl)
{
ret = H5Ocopy(fid_src, NAME_DATASET_SIMPLE, fid_dst, NAME_DATASET_SIMPLE, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -9102,7 +9102,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_exist */
@@ -9203,7 +9203,7 @@ test_copy_path(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fapl)
{
ret = H5Ocopy(fid_src, NAME_DATASET_SUB_SUB, fid_dst, NAME_DATASET_SUB_SUB, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -9268,7 +9268,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_path */
@@ -9346,7 +9346,7 @@ error:
H5Tclose(tid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_same_file_named_datatype */
@@ -9462,7 +9462,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_old_layout */
@@ -9647,7 +9647,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_compact_named_vl */
@@ -9820,7 +9820,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_contig_named_vl */
@@ -10020,7 +10020,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_chunked_named_vl */
@@ -10208,7 +10208,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_compressed_named_vl */
@@ -10400,7 +10400,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_compact_vl_vl */
@@ -10603,7 +10603,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_contig_vl_vl */
@@ -10838,7 +10838,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_chunked_vl_vl */
@@ -11045,7 +11045,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_compressed_vl_vl */
@@ -11230,7 +11230,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_contig_cmpd_vl */
@@ -11416,7 +11416,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_chunked_cmpd_vl */
@@ -11601,7 +11601,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_compact_cmpd_vl */
@@ -11792,7 +11792,7 @@ error:
H5Fclose(fid2);
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_null_ref */
@@ -12007,7 +12007,7 @@ error:
H5Fclose(fid2);
H5Fclose(fid3);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_null_ref_open */
@@ -12143,7 +12143,7 @@ error:
H5Fclose(fid1);
H5Fclose(fid2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_attr_crt_order */
@@ -12462,7 +12462,7 @@ error:
H5Dclose(did);
H5Pclose(ocpypl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_committed_datatype_merge */
@@ -12857,7 +12857,7 @@ error:
H5Dclose(did);
H5Pclose(ocpypl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_committed_datatype_merge_same_file */
@@ -13155,7 +13155,7 @@ error:
H5Dclose(did);
H5Pclose(ocpypl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_committed_dt_merge_sugg */
@@ -13385,7 +13385,7 @@ error:
H5Gclose(gid);
H5Pclose(ocpypl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_committed_dt_merge_attr */
@@ -13888,7 +13888,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_cdt_hier_merge */
@@ -14218,7 +14218,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_cdt_merge_cdt */
@@ -14533,7 +14533,7 @@ error:
H5Tclose(tid);
H5Pclose(ocpypl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_cdt_merge_suggs */
@@ -14909,7 +14909,7 @@ error:
H5Dclose(did);
H5Pclose(ocpypl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_cdt_merge_dset_suggs */
@@ -15537,7 +15537,7 @@ error:
H5Sclose(sid);
H5Pclose(ocpypl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_cdt_merge_all_suggs */
@@ -16009,7 +16009,7 @@ error:
H5Dclose(did);
H5Pclose(ocpypl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_set_mcdt_search_cb */
@@ -16364,7 +16364,7 @@ error:
H5Dclose(did);
H5Pclose(ocpypl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_set_get_mcdt_search_cb */
@@ -16531,7 +16531,7 @@ error:
H5Fclose(fid1);
H5Fclose(fid2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_iterate */
@@ -16914,7 +16914,7 @@ error:
H5Fclose(fid_src);
H5Fclose(fid_ext);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_option */
@@ -17349,7 +17349,7 @@ error:
H5Fclose(fid_dst);
H5Fclose(fid_src);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_dataset_open */
diff --git a/test/objcopy_ref.c b/test/objcopy_ref.c
index ebce96b..3ad5091 100644
--- a/test/objcopy_ref.c
+++ b/test/objcopy_ref.c
@@ -241,7 +241,7 @@ error:
H5Rdestroy(&ref[0]);
H5Rdestroy(&ref[1]);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (-1);
}
@@ -341,7 +341,7 @@ error:
H5Rdestroy(&ref[0]);
H5Rdestroy(&ref[1]);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (-1);
}
@@ -472,7 +472,7 @@ error:
H5Rdestroy(&ref[0]);
H5Rdestroy(&ref[1]);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (-1);
}
@@ -703,7 +703,7 @@ error:
H5Tclose(tid2);
H5Tclose(tid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FALSE;
} /* end compare_attribute() */
@@ -790,7 +790,7 @@ error:
H5Aclose(aid2);
H5Aclose(aid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FALSE;
} /* end compare_std_attributes() */
@@ -1245,7 +1245,7 @@ error:
H5Tclose(tid2);
H5Tclose(tid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FALSE;
} /* end compare_datasets() */
@@ -1448,7 +1448,7 @@ error:
H5E_BEGIN_TRY
{
}
- H5E_END_TRY;
+ H5E_END_TRY
return FALSE;
} /* end compare_groups() */
@@ -1831,7 +1831,7 @@ error:
H5Fclose(fid_src);
H5Fclose(fid_ext);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_copy_option */
diff --git a/test/ohdr.c b/test/ohdr.c
index 85e10a2..b62f391 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -168,7 +168,7 @@ error:
H5O_close(&oh_locB, NULL);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_cont() */
@@ -306,7 +306,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* test_ohdr_cache() */
@@ -457,7 +457,7 @@ error:
HDremove(FILE_OHDR_SWMR);
HDfree(wbuf);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* test_ohdr_swmr() */
@@ -496,7 +496,7 @@ test_ohdr_badness(hid_t fapl)
*/
fid = H5Fopen(CVE_2020_10810_FILENAME, H5F_ACC_RDWR, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fid >= 0)
FAIL_PUTS_ERROR("should not have been able to open malformed file");
@@ -510,7 +510,7 @@ error:
{
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
}
@@ -615,7 +615,7 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
{
did = H5Dopen2(loc_bogus, "Dataset3", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (did >= 0) {
H5Dclose(did);
TEST_ERROR;
@@ -782,7 +782,7 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
{
did = H5Dopen2(loc_bogus, "Dataset2", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (did >= 0) {
H5Dclose(did);
TEST_ERROR;
@@ -797,7 +797,7 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
{
did = H5Dopen2(loc_bogus, "Dataset3", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (did >= 0) {
H5Dclose(did);
TEST_ERROR;
@@ -825,7 +825,7 @@ error:
H5Sclose(sid);
H5Aclose(aid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* test_unknown() */
@@ -1067,7 +1067,7 @@ error:
(void)H5Aclose(aid);
(void)H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(in_buf);
HDfree(out_buf);
@@ -1298,7 +1298,7 @@ error:
(void)H5Dclose(dset_F_N_id);
(void)H5Dclose(dset_F_Y_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* test_minimized_dset_ohdr_size_comparisons */
@@ -1454,7 +1454,7 @@ error:
(void)H5Dclose(dset_mZ_id);
(void)H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* test_minimized_dset_ohdr_with_filter */
@@ -1676,7 +1676,7 @@ error:
(void)H5Fclose(file_id);
(void)H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* test_minimized_dset_ohdr_modification_times */
@@ -1810,7 +1810,7 @@ error:
(void)H5Dclose(dset_1_id);
(void)H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* test_minimized_dset_ohdr_fillvalue_backwards_compatability */
@@ -1874,7 +1874,7 @@ main(void)
{
ret = H5Pset_libver_bounds(fapl, low, high);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret < 0) /* Invalid low/high combinations */
continue;
@@ -2070,7 +2070,7 @@ main(void)
{
ret = H5O_msg_write(&oh_loc, H5O_MTIME_NEW_ID, 0, 0, &time_new);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
if (H5O_msg_remove(&oh_loc, H5O_MTIME_NEW_ID, H5O_ALL, TRUE) < 0)
@@ -2163,7 +2163,7 @@ error:
{
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (api_ctx_pushed)
H5CX_pop(FALSE);
diff --git a/test/onion.c b/test/onion.c
index 03730a7..830220d 100644
--- a/test/onion.c
+++ b/test/onion.c
@@ -734,7 +734,7 @@ test_fapl(void)
{
ret = H5Pset_fapl_onion(H5I_INVALID_HID, &info_in);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (SUCCEED == ret)
TEST_ERROR;
@@ -743,7 +743,7 @@ test_fapl(void)
{
ret = H5Pset_fapl_onion(fapl_id, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (SUCCEED == ret)
TEST_ERROR;
@@ -753,7 +753,7 @@ test_fapl(void)
{
ret = H5Pset_fapl_onion(fapl_id, &info_in);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (SUCCEED == ret)
TEST_ERROR;
info_in.version--;
@@ -764,7 +764,7 @@ test_fapl(void)
{
ret = H5Pset_fapl_onion(fapl_id, &info_in);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (SUCCEED == ret)
TEST_ERROR;
@@ -774,7 +774,7 @@ test_fapl(void)
{
ret = H5Pset_fapl_onion(fapl_id, &info_in);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (SUCCEED == ret)
TEST_ERROR;
info_in.page_size = ONION_TEST_PAGE_SIZE_1;
@@ -785,7 +785,7 @@ test_fapl(void)
{
ret = H5Pset_fapl_onion(fapl_id, &info_in);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (SUCCEED == ret)
TEST_ERROR;
@@ -795,7 +795,7 @@ test_fapl(void)
{
ret = H5Pset_fapl_onion(fapl_id, &info_in);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (SUCCEED == ret)
TEST_ERROR;
info_in.backing_fapl_id = H5P_DEFAULT;
@@ -810,7 +810,7 @@ test_fapl(void)
{
ret = H5Pget_fapl_onion(fapl_id, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (SUCCEED == ret)
TEST_ERROR;
@@ -819,7 +819,7 @@ test_fapl(void)
{
ret = H5Pget_fapl_onion(H5I_INVALID_HID, &info_out);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (SUCCEED == ret)
TEST_ERROR;
@@ -828,7 +828,7 @@ test_fapl(void)
{
ret = H5Pget_fapl_onion(fapl_id_sec2, &info_out);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (SUCCEED == ret)
TEST_ERROR;
@@ -945,7 +945,7 @@ test_header_encode_decode(void)
{
size_ret = H5FD__onion_header_decode(exp, &hdr_out);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (0 != size_ret)
TEST_ERROR;
@@ -959,7 +959,7 @@ test_header_encode_decode(void)
{
size_ret = H5FD__onion_header_decode(exp, &hdr_out);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (0 != size_ret)
TEST_ERROR;
@@ -968,7 +968,7 @@ test_header_encode_decode(void)
{
size_ret = H5FD__onion_header_decode(exp, &hdr_out);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (0 != size_ret)
TEST_ERROR;
@@ -1059,7 +1059,7 @@ test_history_encode_decode_empty(void)
{
size_ret = H5FD__onion_history_decode(exp, &history_out);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (0 != size_ret)
TEST_ERROR;
@@ -1072,7 +1072,7 @@ test_history_encode_decode_empty(void)
{
size_ret = H5FD__onion_history_decode(exp, &history_out);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (0 != size_ret)
TEST_ERROR;
@@ -1081,7 +1081,7 @@ test_history_encode_decode_empty(void)
{
size_ret = H5FD__onion_history_decode(exp, &history_out);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (0 != size_ret)
TEST_ERROR;
@@ -1421,7 +1421,7 @@ test_revision_record_encode_decode(void)
{
size_ret = H5FD__onion_revision_record_decode(exp, &r_out);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (0 != size_ret)
TEST_ERROR;
exp[2] = 'R'; /* reset */
@@ -1432,7 +1432,7 @@ test_revision_record_encode_decode(void)
{
size_ret = H5FD__onion_revision_record_decode(exp, &r_out);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (0 != size_ret)
TEST_ERROR;
@@ -1442,7 +1442,7 @@ test_revision_record_encode_decode(void)
{
size_ret = H5FD__onion_revision_record_decode(exp, &r_out);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (0 != size_ret)
TEST_ERROR;
exp[4] = H5FD_ONION_REVISION_RECORD_VERSION_CURR; /* reset */
@@ -1858,7 +1858,7 @@ verify_stored_onion_create_0_open(struct onion_filepaths *paths, H5FD_onion_fapl
{
err_ret = H5FDread(file, H5FD_MEM_DRAW, H5P_DEFAULT, 0, 1, act_buf);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (err_ret != FAIL)
TEST_ERROR;
@@ -1972,7 +1972,7 @@ test_create_oniontarget(hbool_t truncate_canonical, hbool_t with_initial_data)
{
vfile_raw = H5FDopen(paths->canon, H5F_ACC_RDONLY, fapl_id, HADDR_UNDEF);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Check if onion history for onion-open created file */
if (NULL != vfile_raw)
@@ -2008,7 +2008,7 @@ test_create_oniontarget(hbool_t truncate_canonical, hbool_t with_initial_data)
{
vfile_ro = H5FDopen(paths->canon, H5F_ACC_RDONLY, fapl_id, HADDR_UNDEF);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* check if onionization (creation) not complete; nothing to open */
if (vfile_ro != NULL)
TEST_ERROR;
@@ -2095,7 +2095,7 @@ test_create_oniontarget(hbool_t truncate_canonical, hbool_t with_initial_data)
{
vfile_raw = H5FDopen(paths->recovery, H5F_ACC_RDONLY, onion_info.backing_fapl_id, HADDR_UNDEF);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (NULL != vfile_raw)
TEST_ERROR;
@@ -2192,7 +2192,7 @@ error:
{
H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_create_oniontarget() */
@@ -2546,7 +2546,7 @@ error:
H5Pclose(fapl_id);
H5Pclose(onion_info.backing_fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_several_revisions_with_logical_gaps() */
@@ -2643,7 +2643,7 @@ error:
{
H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(buf_vfy);
@@ -2854,7 +2854,7 @@ error:
H5Pclose(fapl_id);
H5Pclose(onion_info.backing_fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_page_aligned_history_create() */
@@ -3190,7 +3190,7 @@ error:
H5Pclose(fapl_id);
H5Pclose(onion_info.backing_fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(wdata);
HDfree(rdata);
@@ -3449,7 +3449,7 @@ error:
H5Pclose(fapl_id);
H5Pclose(onion_info.backing_fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(wdata);
HDfree(rdata);
@@ -3811,7 +3811,7 @@ error:
H5Sclose(space);
H5Pclose(onion_info.backing_fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_integration_create_delete_objects */
@@ -4086,7 +4086,7 @@ error:
H5Pclose(fapl_id);
H5Pclose(onion_info.backing_fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_integration_dset_extension */
@@ -4266,7 +4266,7 @@ error:
H5Pclose(fapl_id);
H5Pclose(onion_info.backing_fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -4648,7 +4648,7 @@ error:
H5Pclose(fapl_id);
H5Pclose(onion_info.backing_fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -4888,7 +4888,7 @@ error:
H5Fclose(file_id);
H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(wdata);
HDfree(rdata);
diff --git a/test/page_buffer.c b/test/page_buffer.c
index a6f7f0a..b15aff5 100644
--- a/test/page_buffer.c
+++ b/test/page_buffer.c
@@ -198,7 +198,7 @@ error:
if (data)
HDfree(data);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (1);
} /* create_file */
@@ -292,7 +292,7 @@ error:
if (data)
HDfree(data);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
#endif /* H5_HAVE_PARALLEL */
@@ -411,7 +411,7 @@ test_args(hid_t orig_fapl, const char *env_h5_drvr)
{
file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (file_id >= 0)
TEST_ERROR;
@@ -432,7 +432,7 @@ test_args(hid_t orig_fapl, const char *env_h5_drvr)
{
file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (file_id >= 0)
TEST_ERROR;
@@ -444,7 +444,7 @@ test_args(hid_t orig_fapl, const char *env_h5_drvr)
{
ret = H5Pset_page_buffer_size(fapl, 512, 50, 51);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -535,7 +535,7 @@ error:
H5Pclose(fapl);
H5Pclose(fcpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_args */
@@ -800,7 +800,7 @@ error:
if (data)
HDfree(data);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_raw_data_handling */
@@ -1042,7 +1042,7 @@ error:
if (data)
HDfree(data);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_lru_processing */
@@ -1662,7 +1662,7 @@ error:
if (data)
HDfree(data);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
@@ -1952,7 +1952,7 @@ error:
if (data)
HDfree(data);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* test_stats_collection */
@@ -2013,7 +2013,7 @@ verify_page_buffering_disabled(hid_t orig_fapl, const char *env_h5_drvr)
{
file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (file_id >= 0)
TEST_ERROR;
@@ -2045,7 +2045,7 @@ verify_page_buffering_disabled(hid_t orig_fapl, const char *env_h5_drvr)
{
file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (file_id >= 0)
TEST_ERROR;
@@ -2068,7 +2068,7 @@ error:
H5Pclose(fcpl);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
@@ -2160,7 +2160,7 @@ error:
{
H5Pclose(fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (api_ctx_pushed)
H5CX_pop(FALSE);
diff --git a/test/ros3.c b/test/ros3.c
index bc9eb86..7eb4230 100644
--- a/test/ros3.c
+++ b/test/ros3.c
@@ -588,7 +588,7 @@ test_fapl_config_validation(void)
*/
success = H5Pset_fapl_ros3(fapl_id, &case_ptr->config);
}
- H5E_END_TRY;
+ H5E_END_TRY
JSVERIFY(case_ptr->expected, success, case_ptr->msg)
@@ -629,7 +629,7 @@ error:
{
(void)H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
return 1;
} /* test_fapl_config_validation */
@@ -706,7 +706,7 @@ error:
{
(void)H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
@@ -877,7 +877,7 @@ test_vfd_open(void)
{
fd = H5FDopen(T.url, T.flags, _fapl_id, T.maxaddr);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (NULL != fd)
JSVERIFY(1, 0, T.message); /* wrapper to print message and fail */
}
@@ -921,14 +921,14 @@ error:
{
(void)H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
if (fapl_file_access >= 0) {
H5E_BEGIN_TRY
{
(void)H5Pclose(fapl_file_access);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
if (curl_ready == TRUE) {
curl_global_cleanup();
@@ -1062,7 +1062,7 @@ error:
{
(void)H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
return 1;
@@ -1131,7 +1131,7 @@ test_H5FDread_without_eoa_set_fails(void)
H5E_BEGIN_TRY{/* mute stack trace on expected failure */
JSVERIFY(FAIL, H5FDread(file_shakespeare, H5FD_MEM_DRAW, H5P_DEFAULT, 1200699, 102, buffer),
- "cannot read before eoa is set")} H5E_END_TRY;
+ "cannot read before eoa is set")} H5E_END_TRY
JSVERIFY_STR("", buffer, "buffer should remain untouched")
/************
@@ -1160,7 +1160,7 @@ error:
{
(void)H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
return 1;
@@ -1330,7 +1330,7 @@ test_read(void)
{
open_return = H5FDread(file_raven, H5FD_MEM_DRAW, H5P_DEFAULT, test.addr, test.len, buffer);
}
- H5E_END_TRY;
+ H5E_END_TRY
JSVERIFY(test.success, open_return, test.message)
if (open_return == SUCCEED)
@@ -1363,7 +1363,7 @@ error:
{
(void)H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
return 1;
@@ -1443,12 +1443,12 @@ test_noops_and_autofails(void)
/* auto-fail calls to write and truncate
*/
H5E_BEGIN_TRY{JSVERIFY(FAIL, H5FDwrite(file, H5FD_MEM_DRAW, H5P_DEFAULT, 1000, 35, data),
- "write must fail")} H5E_END_TRY;
+ "write must fail")} H5E_END_TRY
- H5E_BEGIN_TRY{JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, FALSE), "truncate must fail")} H5E_END_TRY;
+ H5E_BEGIN_TRY{JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, FALSE), "truncate must fail")} H5E_END_TRY
H5E_BEGIN_TRY{
- JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, TRUE), "truncate must fail (closing)")} H5E_END_TRY;
+ JSVERIFY(FAIL, H5FDtruncate(file, H5P_DEFAULT, TRUE), "truncate must fail (closing)")} H5E_END_TRY
/************
* TEARDOWN *
@@ -1476,7 +1476,7 @@ error:
{
(void)H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
if (file) {
(void)H5FDclose(file);
@@ -1610,7 +1610,7 @@ error:
{
(void)H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
return 1;
@@ -1683,11 +1683,11 @@ test_H5F_integration(void)
/* Read-Write Open access is not allowed with this file driver.
*/
- H5E_BEGIN_TRY{FAIL_IF(0 <= H5Fopen(url_h5_public, H5F_ACC_RDWR, fapl_id))} H5E_END_TRY;
+ H5E_BEGIN_TRY{FAIL_IF(0 <= H5Fopen(url_h5_public, H5F_ACC_RDWR, fapl_id))} H5E_END_TRY
/* H5Fcreate() is not allowed with this file driver.
*/
- H5E_BEGIN_TRY{FAIL_IF(0 <= H5Fcreate(url_missing, H5F_ACC_RDONLY, H5P_DEFAULT, fapl_id))} H5E_END_TRY;
+ H5E_BEGIN_TRY{FAIL_IF(0 <= H5Fcreate(url_missing, H5F_ACC_RDONLY, H5P_DEFAULT, fapl_id))} H5E_END_TRY
/* Successful open.
*/
@@ -1719,7 +1719,7 @@ error:
{
(void)H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
if (file > 0)
(void)H5Fclose(file);
diff --git a/test/set_extent.c b/test/set_extent.c
index f3281d0..4dc5d7c 100644
--- a/test/set_extent.c
+++ b/test/set_extent.c
@@ -431,7 +431,7 @@ do_layouts(hid_t fapl)
{
ret = H5Pset_libver_bounds(new_fapl, low, high);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret < 0) /* Invalid low/high combinations */
{
@@ -460,7 +460,7 @@ error:
{
H5Pclose(new_fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -792,7 +792,7 @@ error:
H5Pclose(fcpl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_rank1() */
@@ -1287,7 +1287,7 @@ error:
H5Pclose(fcpl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -1722,7 +1722,7 @@ error:
H5Pclose(fcpl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -1983,7 +1983,7 @@ test_external(hid_t fapl)
TEST_ERROR;
}
}
- H5E_END_TRY;
+ H5E_END_TRY
/*-------------------------------------------------------------------------
* close property list
@@ -2012,7 +2012,7 @@ error:
H5Pclose(dcpl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -2098,7 +2098,7 @@ test_layouts(H5D_layout_t layout, hid_t fapl)
{
ret = H5Dset_extent(did, dims_e);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -2147,7 +2147,7 @@ test_layouts(H5D_layout_t layout, hid_t fapl)
{
ret = H5Dset_extent(did, dims_s);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -2220,7 +2220,7 @@ error:
H5Pclose(dcpl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -2434,7 +2434,7 @@ error:
H5Dclose(dset);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(rbuf);
HDfree(wbuf);
@@ -2729,7 +2729,7 @@ error:
H5Tclose(type);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(rbuf);
HDfree(wbuf);
diff --git a/test/stab.c b/test/stab.c
index 697bce0..45010d5 100644
--- a/test/stab.c
+++ b/test/stab.c
@@ -178,7 +178,7 @@ error:
H5Gclose(g3);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -261,7 +261,7 @@ error:
HDfree(name2);
HDfree(name1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_long() */
@@ -335,7 +335,7 @@ error:
H5Gclose(cwg);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_large() */
@@ -622,7 +622,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end lifecycle() */
@@ -785,7 +785,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (objname)
HDfree(objname);
@@ -895,7 +895,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end read_old() */
@@ -1036,7 +1036,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end no_compact() */
@@ -1189,7 +1189,7 @@ error:
H5Gclose(fcpl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end gcpl_on_root() */
@@ -1293,7 +1293,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
#endif /* H5_NO_DEPRECATED_SYMBOLS */
} /* end old_api() */
@@ -1387,7 +1387,7 @@ error:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end corrupt_stab_msg() */
diff --git a/test/swmr.c b/test/swmr.c
index 4abf779..94110f4 100644
--- a/test/swmr.c
+++ b/test/swmr.c
@@ -170,7 +170,7 @@ test_metadata_read_attempts(hid_t in_fapl)
{
ret = H5Pset_metadata_read_attempts(fapl, 0);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -834,7 +834,7 @@ error:
H5Fclose(fid1);
H5Fclose(fid2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
@@ -1531,7 +1531,7 @@ error:
H5Fclose(fid);
H5Fclose(fid1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
@@ -1662,7 +1662,7 @@ test_start_swmr_write(hid_t in_fapl, hbool_t new_format)
{
ret = H5Fstart_swmr_write(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (new_format) {
if (ret < 0)
TEST_ERROR;
@@ -1879,7 +1879,7 @@ error:
H5Sclose(sid2);
H5Sclose(sid3);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* test_start_swmr_write() */
@@ -1990,7 +1990,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
{
ret = H5Fstart_swmr_write(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -2016,7 +2016,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
{
ret = H5Fstart_swmr_write(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -2043,7 +2043,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
{
ret = H5Fstart_swmr_write(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -2072,7 +2072,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
{
ret = H5Fstart_swmr_write(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -2091,7 +2091,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
{
ret = H5Fstart_swmr_write(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -2110,7 +2110,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
{
ret = H5Fstart_swmr_write(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -2143,7 +2143,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
{
ret = H5Fstart_swmr_write(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -2156,7 +2156,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
{
ret = H5Fstart_swmr_write(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -2204,7 +2204,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
{
ret = H5Fstart_swmr_write(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -2231,7 +2231,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
{
ret = H5Fstart_swmr_write(fid2);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -2260,7 +2260,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
{
ret = H5Fstart_swmr_write(fid2);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -2290,7 +2290,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
{
bad_fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, new_fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (bad_fid >= 0)
TEST_ERROR;
@@ -2302,7 +2302,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
{
bad_fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (bad_fid >= 0)
TEST_ERROR;
@@ -2317,7 +2317,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
{
ret = H5Fstart_swmr_write(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -2335,7 +2335,7 @@ test_err_start_swmr_write(hid_t in_fapl, hbool_t new_format)
{
ret = H5Fstart_swmr_write(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -2368,7 +2368,7 @@ error:
*/
H5Fclose(bad_fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* test_err_start_swmr_write() */
@@ -2523,7 +2523,7 @@ test_start_swmr_write_concur(hid_t in_fapl, hbool_t new_format)
/* Open the test file */
fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fid >= 0)
HDexit(EXIT_FAILURE);
@@ -2793,7 +2793,7 @@ test_start_swmr_write_concur(hid_t in_fapl, hbool_t new_format)
{
fid = H5Fopen(filename, H5F_ACC_RDONLY, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fid >= 0)
HDexit(EXIT_FAILURE);
@@ -2869,7 +2869,7 @@ test_start_swmr_write_concur(hid_t in_fapl, hbool_t new_format)
{
fid = H5Fopen(filename, H5F_ACC_RDWR, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fid >= 0)
HDexit(EXIT_FAILURE);
@@ -2949,7 +2949,7 @@ test_start_swmr_write_concur(hid_t in_fapl, hbool_t new_format)
{
fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fid >= 0)
HDexit(EXIT_FAILURE);
@@ -3012,7 +3012,7 @@ error:
H5Pclose(fapl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
@@ -3177,7 +3177,7 @@ error:
H5Pclose(fapl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* test_start_swmr_write_stress_ohdr() */
@@ -3287,7 +3287,7 @@ error:
H5Pclose(vds_dapl1);
H5Pclose(vds_dapl2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* tssw_persist_dapl_verify() */
@@ -3545,7 +3545,7 @@ error:
H5Dclose(vdsid2);
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* test_start_swmr_write_persist_dapl() */
@@ -3608,7 +3608,7 @@ test_object_flush_cb(hid_t in_fapl)
{
ret = H5Pset_object_flush_cb(fapl, NULL, &flush_ct);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -3812,7 +3812,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* test_object_flush_cb() */
@@ -3912,7 +3912,7 @@ test_append_flush_generic(void)
{
ret = H5Pset_append_flush(dapl, 0, NULL, NULL, &count);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -3921,7 +3921,7 @@ test_append_flush_generic(void)
{
ret = H5Pset_append_flush(dapl, H5S_MAX_RANK + 1, NULL, NULL, &count);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -3930,7 +3930,7 @@ test_append_flush_generic(void)
{
ret = H5Pset_append_flush(dapl, 2, NULL, NULL, &count);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -3943,7 +3943,7 @@ test_append_flush_generic(void)
{
ret = H5Pset_append_flush(dapl, 2, boundary, NULL, &count);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -3954,7 +3954,7 @@ test_append_flush_generic(void)
{
ret = H5Pset_append_flush(dapl, 2, boundary, append_cb, &count);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -3965,7 +3965,7 @@ test_append_flush_generic(void)
{
ret = H5Pset_append_flush(dapl, 2, boundary, append_cb, &count);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0)
TEST_ERROR;
@@ -4011,7 +4011,7 @@ error:
{
H5Pclose(dapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* test_append_flush_generic() */
@@ -4132,7 +4132,7 @@ test_append_flush_dataset_chunked(hid_t in_fapl)
{
did2 = H5Dcreate2(fid, "dataset2", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (did2 >= 0)
TEST_ERROR;
@@ -4146,7 +4146,7 @@ test_append_flush_dataset_chunked(hid_t in_fapl)
{
did2 = H5Dcreate2(fid, "dataset2", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, dapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (did2 >= 0)
TEST_ERROR;
@@ -4161,7 +4161,7 @@ test_append_flush_dataset_chunked(hid_t in_fapl)
{
did2 = H5Dopen2(fid, "dataset2", dapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (did2 >= 0)
TEST_ERROR;
@@ -4240,7 +4240,7 @@ error:
H5Sclose(sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* test_append_flush_dataset_chunked() */
@@ -4447,7 +4447,7 @@ error:
H5Sclose(sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* test_append_flush_dataset_fixed() */
@@ -4689,7 +4689,7 @@ error:
H5Sclose(sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* test_append_flush_dataset_multiple() */
@@ -4803,7 +4803,7 @@ test_file_lock_same(hid_t in_fapl)
{
fid2 = H5Fopen(filename, H5F_ACC_RDWR, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fid2 >= 0)
TEST_ERROR;
@@ -4857,7 +4857,7 @@ error:
H5Fclose(fid);
H5Fclose(fid2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_file_lock_same() */
@@ -4911,7 +4911,7 @@ test_file_lock_swmr_same(hid_t in_fapl)
{
fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_READ, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fid >= 0)
TEST_ERROR;
@@ -4922,7 +4922,7 @@ test_file_lock_swmr_same(hid_t in_fapl)
{
fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE | H5F_ACC_SWMR_READ, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fid >= 0)
TEST_ERROR;
@@ -4933,7 +4933,7 @@ test_file_lock_swmr_same(hid_t in_fapl)
{
fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_WRITE, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fid >= 0)
TEST_ERROR;
@@ -4944,7 +4944,7 @@ test_file_lock_swmr_same(hid_t in_fapl)
{
fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_WRITE | H5F_ACC_SWMR_READ, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fid >= 0)
TEST_ERROR;
@@ -4962,7 +4962,7 @@ test_file_lock_swmr_same(hid_t in_fapl)
{
fid2 = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fid2 >= 0)
TEST_ERROR;
@@ -5058,7 +5058,7 @@ test_file_lock_swmr_same(hid_t in_fapl)
{
fid2 = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fid2 >= 0)
TEST_ERROR;
@@ -5076,7 +5076,7 @@ test_file_lock_swmr_same(hid_t in_fapl)
{
fid2 = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fid2 >= 0)
TEST_ERROR;
@@ -5126,7 +5126,7 @@ test_file_lock_swmr_same(hid_t in_fapl)
{
fid2 = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fid2 >= 0)
TEST_ERROR;
@@ -5144,7 +5144,7 @@ test_file_lock_swmr_same(hid_t in_fapl)
{
fid2 = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fid2 >= 0)
TEST_ERROR;
@@ -5167,7 +5167,7 @@ error:
H5Fclose(fid);
H5Fclose(fid2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_file_lock_swmr_same() */
@@ -5258,7 +5258,7 @@ test_file_lock_concur(hid_t in_fapl)
{
child_fid = H5Fopen(filename, H5F_ACC_RDWR, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (child_fid == FAIL)
@@ -5335,7 +5335,7 @@ test_file_lock_concur(hid_t in_fapl)
{
child_fid = H5Fopen(filename, H5F_ACC_RDONLY, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (child_fid == FAIL)
@@ -5413,7 +5413,7 @@ test_file_lock_concur(hid_t in_fapl)
{
child_fid = H5Fopen(filename, H5F_ACC_RDWR, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (child_fid == FAIL)
@@ -5491,7 +5491,7 @@ test_file_lock_concur(hid_t in_fapl)
{
child_fid = H5Fopen(filename, H5F_ACC_RDONLY, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should succeed */
if (child_fid >= 0) {
@@ -5557,7 +5557,7 @@ error:
H5Pclose(fapl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
@@ -5655,7 +5655,7 @@ test_file_lock_swmr_concur(hid_t in_fapl)
{
child_fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (child_fid == FAIL)
@@ -5733,7 +5733,7 @@ test_file_lock_swmr_concur(hid_t in_fapl)
{
child_fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (child_fid == FAIL)
@@ -5811,7 +5811,7 @@ test_file_lock_swmr_concur(hid_t in_fapl)
{
child_fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (child_fid == FAIL)
@@ -5888,7 +5888,7 @@ test_file_lock_swmr_concur(hid_t in_fapl)
{
child_fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (child_fid == FAIL)
@@ -5965,7 +5965,7 @@ test_file_lock_swmr_concur(hid_t in_fapl)
{
child_fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should succeed */
if (child_fid >= 0) {
@@ -6045,7 +6045,7 @@ test_file_lock_swmr_concur(hid_t in_fapl)
{
child_fid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (child_fid == FAIL)
@@ -6123,7 +6123,7 @@ test_file_lock_swmr_concur(hid_t in_fapl)
{
child_fid = H5Fopen(filename, H5F_ACC_RDWR, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (child_fid == FAIL)
@@ -6201,7 +6201,7 @@ test_file_lock_swmr_concur(hid_t in_fapl)
{
child_fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (child_fid == FAIL)
@@ -6279,7 +6279,7 @@ test_file_lock_swmr_concur(hid_t in_fapl)
{
child_fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should succeed */
if (child_fid >= 0) {
@@ -6438,7 +6438,7 @@ test_file_lock_swmr_concur(hid_t in_fapl)
{
child_fid = H5Fopen(filename, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail */
if (child_fid == FAIL)
@@ -6516,7 +6516,7 @@ test_file_lock_swmr_concur(hid_t in_fapl)
{
child_fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should succeed */
if (child_fid >= 0) {
@@ -6580,7 +6580,7 @@ error:
H5Pclose(fapl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
@@ -6699,7 +6699,7 @@ test_file_locking(hid_t in_fapl, hbool_t turn_locking_on, hbool_t env_var_overri
child_fid = H5Fopen(filename, H5F_ACC_RDWR, fapl);
ret = H5Fclose(child_fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Close the pipe */
if (HDclose(out_pdf[0]) < 0)
@@ -6772,7 +6772,7 @@ error:
H5Pclose(fapl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
@@ -6826,7 +6826,7 @@ test_different_lock_flags(hid_t in_fapl)
{
fid3 = H5Fopen(filename, H5F_ACC_RDWR, fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (H5I_INVALID_HID != fid3)
FAIL_PUTS_ERROR("Should not have been able to open a file with different locking flags");
@@ -6852,7 +6852,7 @@ error:
H5Fclose(fid2);
H5Fclose(fid3);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_different_lock_flags() */
@@ -6897,7 +6897,7 @@ test_swmr_vfd_flag(void)
{
fid = H5Fcreate(filename, H5F_ACC_TRUNC | H5F_ACC_SWMR_WRITE, H5P_DEFAULT, bad_fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fid >= 0)
TEST_ERROR;
@@ -6917,7 +6917,7 @@ error:
H5Pclose(bad_fapl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* test_swmr_vfd_flag() */
@@ -7037,7 +7037,7 @@ error:
H5Pclose(fapl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* test_bug_refresh() */
@@ -7382,7 +7382,7 @@ error:
H5Pclose(fapl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
@@ -7714,7 +7714,7 @@ error:
H5Fclose(fid2);
H5Fclose(fid3);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
diff --git a/test/tarray.c b/test/tarray.c
index 06eac90..7f4cec4 100644
--- a/test/tarray.c
+++ b/test/tarray.c
@@ -239,14 +239,14 @@ test_array_funcs(void)
{
cset = H5Tget_cset(type);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(cset, FAIL, "H5Tget_cset");
H5E_BEGIN_TRY
{
strpad = H5Tget_strpad(type);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(strpad, FAIL, "H5Tget_strpad");
/* Close datatype */
diff --git a/test/tattr.c b/test/tattr.c
index 20dbd25..6f3ecb4 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -5853,9 +5853,9 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
for (use_index = FALSE; use_index <= TRUE; use_index++) {
/* Output message about test being performed */
if (use_index)
- MESSAGE(5, ("Testing Querying Attribute Info By Index w/Creation Order Index\n"))
+ MESSAGE(5, ("Testing Querying Attribute Info By Index w/Creation Order Index\n"));
else
- MESSAGE(5, ("Testing Querying Attribute Info By Index w/o Creation Order Index\n"))
+ MESSAGE(5, ("Testing Querying Attribute Info By Index w/o Creation Order Index\n"));
/* Create file */
fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl);
@@ -6088,7 +6088,7 @@ test_attr_info_null_info_pointer(hid_t fcpl, hid_t fapl)
{
err_ret = H5Aget_info(attr, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
CHECK(err_ret, SUCCEED, "H5Aget_info");
@@ -6096,7 +6096,7 @@ test_attr_info_null_info_pointer(hid_t fcpl, hid_t fapl)
{
err_ret = H5Aget_info_by_name(fid, ".", GET_INFO_NULL_POINTER_ATTR_NAME, NULL, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
CHECK(err_ret, SUCCEED, "H5Aget_info_by_name");
@@ -6104,7 +6104,7 @@ test_attr_info_null_info_pointer(hid_t fcpl, hid_t fapl)
{
err_ret = H5Aget_info_by_idx(fid, ".", H5_INDEX_NAME, H5_ITER_INC, 0, NULL, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
CHECK(err_ret, SUCCEED, "H5Aget_info_by_idx");
@@ -6152,7 +6152,7 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl)
{
err_ret = H5Arename(fid, NULL, INVALID_RENAME_TEST_NEW_ATTR_NAME);
}
- H5E_END_TRY;
+ H5E_END_TRY
CHECK(err_ret, SUCCEED, "H5Arename");
@@ -6160,7 +6160,7 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl)
{
err_ret = H5Arename(fid, "", INVALID_RENAME_TEST_NEW_ATTR_NAME);
}
- H5E_END_TRY;
+ H5E_END_TRY
CHECK(err_ret, SUCCEED, "H5Arename");
@@ -6168,7 +6168,7 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl)
{
err_ret = H5Arename(fid, INVALID_RENAME_TEST_ATTR_NAME, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
CHECK(err_ret, SUCCEED, "H5Arename");
@@ -6176,7 +6176,7 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl)
{
err_ret = H5Arename(fid, INVALID_RENAME_TEST_ATTR_NAME, "");
}
- H5E_END_TRY;
+ H5E_END_TRY
CHECK(err_ret, SUCCEED, "H5Arename");
@@ -6184,7 +6184,7 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl)
{
err_ret = H5Arename_by_name(fid, ".", NULL, INVALID_RENAME_TEST_NEW_ATTR_NAME, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
CHECK(err_ret, SUCCEED, "H5Arename_by_name");
@@ -6192,7 +6192,7 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl)
{
err_ret = H5Arename_by_name(fid, ".", "", INVALID_RENAME_TEST_NEW_ATTR_NAME, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
CHECK(err_ret, SUCCEED, "H5Arename_by_name");
@@ -6200,7 +6200,7 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl)
{
err_ret = H5Arename_by_name(fid, ".", INVALID_RENAME_TEST_ATTR_NAME, NULL, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
CHECK(err_ret, SUCCEED, "H5Arename_by_name");
@@ -6208,7 +6208,7 @@ test_attr_rename_invalid_name(hid_t fcpl, hid_t fapl)
{
err_ret = H5Arename_by_name(fid, ".", INVALID_RENAME_TEST_ATTR_NAME, "", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
CHECK(err_ret, SUCCEED, "H5Arename_by_name");
@@ -6258,7 +6258,7 @@ test_attr_get_name_invalid_buf(hid_t fcpl, hid_t fapl)
{
err_ret = H5Aget_name(attr, 1, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(err_ret, FAIL, "H5Aget_name");
@@ -6266,7 +6266,7 @@ test_attr_get_name_invalid_buf(hid_t fcpl, hid_t fapl)
{
err_ret = H5Aget_name_by_idx(fid, ".", H5_INDEX_NAME, H5_ITER_INC, 0, NULL, 1, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(err_ret, FAIL, "H5Aget_name_by_idx");
@@ -6315,7 +6315,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
unsigned u; /* Local index variable */
herr_t ret; /* Generic return value */
- MESSAGE(5, ("Testing Deleting Attribute By Index\n"))
+ MESSAGE(5, ("Testing Deleting Attribute By Index\n"));
/* Create dataspace for dataset & attributes */
sid = H5Screate(H5S_SCALAR);
@@ -6346,36 +6346,36 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
if (order == H5_ITER_INC) {
if (use_index)
MESSAGE(5, ("Testing Deleting Attribute By Creation Order Index in Increasing "
- "Order w/Creation Order Index\n"))
+ "Order w/Creation Order Index\n"));
else
MESSAGE(5, ("Testing Deleting Attribute By Creation Order Index in Increasing "
- "Order w/o Creation Order Index\n"))
+ "Order w/o Creation Order Index\n"));
} /* end if */
else {
if (use_index)
MESSAGE(5, ("Testing Deleting Attribute By Creation Order Index in Decreasing "
- "Order w/Creation Order Index\n"))
+ "Order w/Creation Order Index\n"));
else
MESSAGE(5, ("Testing Deleting Attribute By Creation Order Index in Decreasing "
- "Order w/o Creation Order Index\n"))
+ "Order w/o Creation Order Index\n"));
} /* end else */
} /* end if */
else {
if (order == H5_ITER_INC) {
if (use_index)
MESSAGE(5, ("Testing Deleting Attribute By Name Index in Increasing Order "
- "w/Creation Order Index\n"))
+ "w/Creation Order Index\n"));
else
MESSAGE(5, ("Testing Deleting Attribute By Name Index in Increasing Order w/o "
- "Creation Order Index\n"))
+ "Creation Order Index\n"));
} /* end if */
else {
if (use_index)
MESSAGE(5, ("Testing Deleting Attribute By Name Index in Decreasing Order "
- "w/Creation Order Index\n"))
+ "w/Creation Order Index\n"));
else
MESSAGE(5, ("Testing Deleting Attribute By Name Index in Decreasing Order w/o "
- "Creation Order Index\n"))
+ "Creation Order Index\n"));
} /* end else */
} /* end else */
@@ -7333,36 +7333,36 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl)
if (order == H5_ITER_INC) {
if (use_index)
MESSAGE(5, ("Testing Iterating over Attributes By Creation Order Index in "
- "Increasing Order w/Creation Order Index\n"))
+ "Increasing Order w/Creation Order Index\n"));
else
MESSAGE(5, ("Testing Iterating over Attributes By Creation Order Index in "
- "Increasing Order w/o Creation Order Index\n"))
+ "Increasing Order w/o Creation Order Index\n"));
} /* end if */
else {
if (use_index)
MESSAGE(5, ("Testing Iterating over Attributes By Creation Order Index in "
- "Decreasing Order w/Creation Order Index\n"))
+ "Decreasing Order w/Creation Order Index\n"));
else
MESSAGE(5, ("Testing Iterating over Attributes By Creation Order Index in "
- "Decreasing Order w/o Creation Order Index\n"))
+ "Decreasing Order w/o Creation Order Index\n"));
} /* end else */
} /* end if */
else {
if (order == H5_ITER_INC) {
if (use_index)
MESSAGE(5, ("Testing Iterating over Attributes By Name Index in Increasing Order "
- "w/Creation Order Index\n"))
+ "w/Creation Order Index\n"));
else
MESSAGE(5, ("Testing Iterating over Attributes By Name Index in Increasing Order "
- "w/o Creation Order Index\n"))
+ "w/o Creation Order Index\n"));
} /* end if */
else {
if (use_index)
MESSAGE(5, ("Testing Iterating over Attributes By Name Index in Decreasing Order "
- "w/Creation Order Index\n"))
+ "w/Creation Order Index\n"));
else
MESSAGE(5, ("Testing Iterating over Attributes By Name Index in Decreasing Order "
- "w/o Creation Order Index\n"))
+ "w/o Creation Order Index\n"));
} /* end else */
} /* end else */
@@ -7731,36 +7731,36 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
if (order == H5_ITER_INC) {
if (use_index)
MESSAGE(5, ("Testing Opening Attributes By Creation Order Index in Increasing "
- "Order w/Creation Order Index\n"))
+ "Order w/Creation Order Index\n"));
else
MESSAGE(5, ("Testing Opening Attributes By Creation Order Index in Increasing "
- "Order w/o Creation Order Index\n"))
+ "Order w/o Creation Order Index\n"));
} /* end if */
else {
if (use_index)
MESSAGE(5, ("Testing Opening Attributes By Creation Order Index in Decreasing "
- "Order w/Creation Order Index\n"))
+ "Order w/Creation Order Index\n"));
else
MESSAGE(5, ("Testing Opening Attributes By Creation Order Index in Decreasing "
- "Order w/o Creation Order Index\n"))
+ "Order w/o Creation Order Index\n"));
} /* end else */
} /* end if */
else {
if (order == H5_ITER_INC) {
if (use_index)
MESSAGE(5, ("Testing Opening Attributes By Name Index in Increasing Order "
- "w/Creation Order Index\n"))
+ "w/Creation Order Index\n"));
else
MESSAGE(5, ("Testing Opening Attributes By Name Index in Increasing Order w/o "
- "Creation Order Index\n"))
+ "Creation Order Index\n"));
} /* end if */
else {
if (use_index)
MESSAGE(5, ("Testing Opening Attributes By Name Index in Decreasing Order "
- "w/Creation Order Index\n"))
+ "w/Creation Order Index\n"));
else
MESSAGE(5, ("Testing Opening Attributes By Name Index in Decreasing Order w/o "
- "Creation Order Index\n"))
+ "Creation Order Index\n"));
} /* end else */
} /* end else */
@@ -8097,9 +8097,9 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl)
for (use_index = FALSE; use_index <= TRUE; use_index++) {
/* Print appropriate test message */
if (use_index)
- MESSAGE(5, ("Testing Opening Attributes By Name w/Creation Order Index\n"))
+ MESSAGE(5, ("Testing Opening Attributes By Name w/Creation Order Index\n"));
else
- MESSAGE(5, ("Testing Opening Attributes By Name w/o Creation Order Index\n"))
+ MESSAGE(5, ("Testing Opening Attributes By Name w/o Creation Order Index\n"));
/* Create file */
fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl);
@@ -8392,9 +8392,9 @@ test_attr_create_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl)
for (use_index = FALSE; use_index <= TRUE; use_index++) {
/* Print appropriate test message */
if (use_index)
- MESSAGE(5, ("Testing Creating Attributes By Name w/Creation Order Index\n"))
+ MESSAGE(5, ("Testing Creating Attributes By Name w/Creation Order Index\n"));
else
- MESSAGE(5, ("Testing Creating Attributes By Name w/o Creation Order Index\n"))
+ MESSAGE(5, ("Testing Creating Attributes By Name w/o Creation Order Index\n"));
/* Create file */
fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl);
diff --git a/test/testframe.c b/test/testframe.c
index f3cf781..cb730b7 100644
--- a/test/testframe.c
+++ b/test/testframe.c
@@ -325,7 +325,7 @@ PerformTests(void)
}
Test_parameters = NULL; /* clear it. */
- MESSAGE(2, ("\n\n"))
+ MESSAGE(2, ("\n\n"));
if (num_errs)
print_func("!!! %d Error(s) were detected !!!\n\n", (int)num_errs);
diff --git a/test/testhdf5.h b/test/testhdf5.h
index 4016fd4..1ebd619 100644
--- a/test/testhdf5.h
+++ b/test/testhdf5.h
@@ -38,7 +38,7 @@
} while (0)
#define CHECK_I(ret, where) \
- { \
+ do { \
if (VERBOSE_HI) { \
print_func(" Call to routine: %15s at line %4d in %s returned %ld\n", (where), (int)__LINE__, \
__FILE__, (long)(ret)); \
@@ -48,11 +48,11 @@
(int)__LINE__, __FILE__); \
H5Eprint2(H5E_DEFAULT, stdout); \
} \
- }
+ } while (0)
/* Check that a pointer is valid (i.e.: not NULL) */
#define CHECK_PTR(ret, where) \
- { \
+ do { \
if (VERBOSE_HI) { \
print_func(" Call to routine: %15s at line %4d in %s returned %p\n", (where), (int)__LINE__, \
__FILE__, ((const void *)ret)); \
@@ -62,11 +62,11 @@
__FILE__); \
H5Eprint2(H5E_DEFAULT, stdout); \
} \
- }
+ } while (0)
/* Check that a pointer is NULL */
#define CHECK_PTR_NULL(ret, where) \
- { \
+ do { \
if (VERBOSE_HI) { \
print_func(" Call to routine: %15s at line %4d in %s returned %p\n", (where), (int)__LINE__, \
__FILE__, ((const void *)ret)); \
@@ -76,11 +76,11 @@
(int)__LINE__, __FILE__); \
H5Eprint2(H5E_DEFAULT, stdout); \
} \
- }
+ } while (0)
/* Check that two pointers are equal */
#define CHECK_PTR_EQ(ret, val, where) \
- { \
+ do { \
if (VERBOSE_HI) { \
print_func(" Call to routine: %15s at line %4d in %s returned %p\n", (where), (int)__LINE__, \
__FILE__, (const void *)(ret)); \
@@ -91,7 +91,7 @@
(where), (const void *)(ret), (const void *)(val), (int)__LINE__, __FILE__); \
H5Eprint2(H5E_DEFAULT, stdout); \
} \
- }
+ } while (0)
/* Used to make certain a return value _is_ a value */
#define VERIFY(_x, _val, where) \
@@ -164,19 +164,19 @@
/* Used to document process through a test */
#if defined(H5_HAVE_PARALLEL) && defined(H5_PARALLEL_TEST)
#define MESSAGE(V, A) \
- { \
+ do { \
int mpi_rank; \
\
MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); \
if (mpi_rank == 0 && HDGetTestVerbosity() > (V)) \
print_func A; \
- }
+ } while (0)
#else /* H5_HAVE_PARALLEL */
#define MESSAGE(V, A) \
- { \
+ do { \
if (HDGetTestVerbosity() > (V)) \
print_func A; \
- }
+ } while (0)
#endif /* H5_HAVE_PARALLEL */
/* Used to indicate an error that is complex to check for */
diff --git a/test/tfile.c b/test/tfile.c
index f24b55d..ac931cc 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -342,43 +342,43 @@ test_file_create(void)
{
ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE1);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Pset_userblock");
H5E_BEGIN_TRY
{
ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE2);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Pset_userblock");
H5E_BEGIN_TRY
{
ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE3);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Pset_userblock");
H5E_BEGIN_TRY
{
ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE4);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Pset_userblock");
H5E_BEGIN_TRY
{
ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE5);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Pset_userblock");
H5E_BEGIN_TRY
{
ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE6);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Pset_userblock");
H5E_BEGIN_TRY
{
ret = H5Pset_userblock(tmpl1, BAD_USERBLOCK_SIZE7);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Pset_userblock");
/* Set the new file-creation parameters */
@@ -669,7 +669,7 @@ test_file_reopen(void)
/* Create a dataset in the file */
sid = H5Screate_simple(1, &dims, &dims);
- CHECK_I(sid, "H5Screate_simple")
+ CHECK_I(sid, "H5Screate_simple");
did = H5Dcreate2(fid, REOPEN_DSET, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
CHECK_I(did, "H5Dcreate2");
@@ -1401,7 +1401,7 @@ test_get_file_id(void)
{
fid2 = H5Iget_file_id(plist);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(fid2, FAIL, "H5Iget_file_id");
/* Close objects */
@@ -1607,7 +1607,7 @@ test_file_perm(void)
{
dset = H5Dcreate2(filero, F2_DSET, H5T_NATIVE_INT, dspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(dset, FAIL, "H5Dcreate2");
if (dset != FAIL) {
ret = H5Dclose(dset);
@@ -1666,7 +1666,7 @@ test_file_perm2(void)
{
group = H5Gcreate2(filero, "MY_GROUP", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(group, FAIL, "H5Gcreate2");
/* Create a dataset with the read-only file handle (should fail) */
@@ -1674,7 +1674,7 @@ test_file_perm2(void)
{
dset = H5Dcreate2(filero, F2_DSET, H5T_NATIVE_INT, dspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(dset, FAIL, "H5Dcreate2");
/* Create an attribute with the read-only file handle (should fail) */
@@ -1682,7 +1682,7 @@ test_file_perm2(void)
{
attr = H5Acreate2(filero, "MY_ATTR", H5T_NATIVE_INT, dspace, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(attr, FAIL, "H5Acreate2");
type = H5Tcopy(H5T_NATIVE_SHORT);
@@ -1693,7 +1693,7 @@ test_file_perm2(void)
{
ret = H5Tcommit2(filero, "MY_DTYPE", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Tcommit2");
ret = H5Tclose(type);
@@ -2045,7 +2045,7 @@ test_file_delete(hid_t fapl_id)
{
is_hdf5 = H5Fis_accessible(filename, fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(is_hdf5, FAIL, "H5Fis_accessible");
/* Just in case deletion fails - silent on errors */
@@ -2076,7 +2076,7 @@ test_file_delete(hid_t fapl_id)
{
is_hdf5 = H5Fis_accessible(filename, fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
CHECK(is_hdf5, TRUE, "H5Fis_accessible");
/* Try to delete it (should fail) */
@@ -2084,7 +2084,7 @@ test_file_delete(hid_t fapl_id)
{
ret = H5Fdelete(filename, fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Fdelete");
/* Delete the file */
@@ -2130,7 +2130,7 @@ test_file_open_dot(void)
{
did = H5Dcreate2(fid, ".", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(did, FAIL, "H5Dcreate2");
/* Create a dataset with no name using the group ID */
@@ -2138,7 +2138,7 @@ test_file_open_dot(void)
{
did = H5Dcreate2(gid, ".", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(did, FAIL, "H5Dcreate2");
/* Open a dataset with no name using the file ID */
@@ -2146,7 +2146,7 @@ test_file_open_dot(void)
{
did = H5Dopen2(fid, ".", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(did, FAIL, "H5Dopen2");
/* Open a dataset with no name using the group ID */
@@ -2154,7 +2154,7 @@ test_file_open_dot(void)
{
did = H5Dopen2(gid, ".", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(did, FAIL, "H5Dopen2");
/* Make a copy of a datatype to use for creating a named datatype */
@@ -2166,7 +2166,7 @@ test_file_open_dot(void)
{
ret = H5Tcommit2(fid, ".", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Tcommit2");
/* Create a named datatype with no name using the group ID */
@@ -2174,7 +2174,7 @@ test_file_open_dot(void)
{
ret = H5Tcommit2(gid, ".", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Tcommit2");
/* Open a named datatype with no name using the file ID */
@@ -2182,7 +2182,7 @@ test_file_open_dot(void)
{
tid2 = H5Topen2(fid, ".", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tid2, FAIL, "H5Topen2");
/* Open a named datatype with no name using the group ID */
@@ -2190,7 +2190,7 @@ test_file_open_dot(void)
{
tid2 = H5Topen2(gid, ".", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tid2, FAIL, "H5Topen2");
/* Create a group with no name using the file ID */
@@ -2198,7 +2198,7 @@ test_file_open_dot(void)
{
gid2 = H5Gcreate2(fid, ".", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(gid2, FAIL, "H5Gcreate2");
/* Create a group with no name using the group ID */
@@ -2206,7 +2206,7 @@ test_file_open_dot(void)
{
gid2 = H5Gcreate2(gid, ".", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(gid2, FAIL, "H5Gcreate2");
/* Open a group with no name using the file ID (should open the root group) */
@@ -2389,7 +2389,7 @@ test_file_getname(void)
{
name_len = H5Fget_name(space_id, name, (size_t)TESTA_NAME_BUF_SIZE);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(name_len, FAIL, "H5Fget_name");
/* Create a new dataset */
@@ -3522,7 +3522,7 @@ test_userblock_alignment(const char *env_h5_drvr)
{
fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(fid, FAIL, "H5Fcreate");
/* Release property lists */
@@ -3555,7 +3555,7 @@ test_userblock_alignment(const char *env_h5_drvr)
{
fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(fid, FAIL, "H5Fcreate");
/* Release property lists */
@@ -3735,7 +3735,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr)
{
fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(fid, FAIL, "H5Fcreate");
/* Release property lists */
@@ -3813,7 +3813,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr)
{
fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(fid, FAIL, "H5Fcreate");
/* Release property lists */
@@ -3853,7 +3853,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr)
{
fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(fid, FAIL, "H5Fcreate");
/* Release property lists */
@@ -3931,7 +3931,7 @@ test_userblock_alignment_paged(const char *env_h5_drvr)
{
fid = H5Fcreate(FILE1, H5F_ACC_TRUNC, fcpl, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(fid, FAIL, "H5Fcreate");
/* Release property lists */
@@ -4124,7 +4124,7 @@ test_filespace_info(const char *env_h5_drvr)
{
ret = H5Pset_file_space_page_size(fcpl, 0);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Pset_file_space_page_size");
/* Setting to 511: should fail */
@@ -4132,7 +4132,7 @@ test_filespace_info(const char *env_h5_drvr)
{
ret = H5Pset_file_space_page_size(fcpl, 511);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Pset_file_space_page_size");
/* Setting to 1GB+1: should fail */
@@ -4140,7 +4140,7 @@ test_filespace_info(const char *env_h5_drvr)
{
ret = H5Pset_file_space_page_size(fcpl, FSP_SIZE1G + 1);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Pset_file_space_page_size");
/* Setting to 512: should succeed */
@@ -5543,7 +5543,7 @@ test_libver_bounds_open(void)
{
file = H5Fopen(VERBFNAME, H5F_ACC_RDONLY, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(file, FAIL, "Attempted to open latest file with earliest version");
/* Attempt to open latest file with (v18, v18), should fail */
@@ -5552,7 +5552,7 @@ test_libver_bounds_open(void)
{
file = H5Fopen(VERBFNAME, H5F_ACC_RDONLY, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(file, FAIL, "Attempted to open latest file with v18 bounds");
/* Opening VERBFNAME in these combination should succeed.
@@ -5744,7 +5744,7 @@ test_libver_bounds_low_high(const char *env_h5_drvr)
/* Set the low/high version bounds */
ret = H5Pset_libver_bounds(fapl, low, high);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Should fail: invalid combinations */
if (high == H5F_LIBVER_EARLIEST) {
@@ -5959,7 +5959,7 @@ test_libver_bounds_super_create(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t n
{
fid = H5Fcreate(FILE8, H5F_ACC_TRUNC | (is_swmr ? H5F_ACC_SWMR_WRITE : 0), fcpl, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Get the internal file pointer if the create succeeds */
if (fid >= 0) {
@@ -6127,7 +6127,7 @@ test_libver_bounds_super_open(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t non
{
fid = H5Fcreate(FILE8, H5F_ACC_TRUNC, fcpl, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Retrieve the low/high bounds */
ret = H5Pget_libver_bounds(fapl, &low, &high);
@@ -6161,7 +6161,7 @@ test_libver_bounds_super_open(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t non
{
ret = H5Pset_libver_bounds(new_fapl, low, high);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Invalid combinations */
if (ret < 0)
@@ -6172,7 +6172,7 @@ test_libver_bounds_super_open(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t non
{
fid = H5Fopen(FILE8, H5F_ACC_RDWR | (is_swmr ? H5F_ACC_SWMR_WRITE : 0), new_fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (non_def_fsm && high < H5F_LIBVER_V110) {
VERIFY(fid, H5I_INVALID_HID, "H5Fopen");
@@ -6344,7 +6344,7 @@ test_libver_bounds_obj(hid_t fapl)
{
ret = H5Pset_libver_bounds(new_fapl, low, high);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret < 0) /* Invalid combinations */
continue;
@@ -6354,7 +6354,7 @@ test_libver_bounds_obj(hid_t fapl)
{
fid = H5Fopen(FILE8, H5F_ACC_RDWR, new_fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fid >= 0) { /* The file open succeeds */
@@ -6510,7 +6510,7 @@ test_libver_bounds_dataset(hid_t fapl)
{
did = H5Dcreate2(fid, DSETB, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (did >= 0) {
@@ -6562,7 +6562,7 @@ test_libver_bounds_dataset(hid_t fapl)
{
ret = H5Pset_libver_bounds(new_fapl, low, high);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret < 0) /* Invalid low/high combinations */
continue;
@@ -6572,7 +6572,7 @@ test_libver_bounds_dataset(hid_t fapl)
{
fid = H5Fopen(FILE8, H5F_ACC_RDWR, new_fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fid >= 0) { /* The file open succeeds */
@@ -6791,7 +6791,7 @@ test_libver_bounds_dataspace(hid_t fapl)
{
ret = H5Pset_libver_bounds(new_fapl, low, high);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret < 0) /* Invalid low/high combinations */
continue;
@@ -6801,7 +6801,7 @@ test_libver_bounds_dataspace(hid_t fapl)
{
fid = H5Fopen(FILE8, H5F_ACC_RDWR, new_fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fid >= 0) { /* The file open succeeds */
@@ -7127,7 +7127,7 @@ test_libver_bounds_datatype_check(hid_t fapl, hid_t tid)
{
ret = H5Pset_libver_bounds(new_fapl, low, high);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret < 0) /* Invalid low/high combinations */
continue;
@@ -7137,7 +7137,7 @@ test_libver_bounds_datatype_check(hid_t fapl, hid_t tid)
{
fid = H5Fopen(FILE8, H5F_ACC_RDWR, new_fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fid >= 0) { /* The file open succeeds */
@@ -7455,7 +7455,7 @@ test_libver_bounds_attributes(hid_t fapl)
{
ret = H5Pset_libver_bounds(new_fapl, low, high);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret < 0) /* Invalid low/high combinations */
continue;
@@ -7465,7 +7465,7 @@ test_libver_bounds_attributes(hid_t fapl)
{
fid = H5Fopen(FILE8, H5F_ACC_RDWR, new_fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fid >= 0) { /* The file open succeeds */
@@ -7622,7 +7622,7 @@ test_libver_macros2(void)
{
grp = H5Gopen(file, "Group");
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(grp, FAIL, "H5Gopen");
#endif
@@ -7861,7 +7861,7 @@ test_min_dset_ohdr(void)
{
ret = H5Fset_dset_no_attrs_hint(-1, TRUE);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Fset_dset_no_attrs_hint");
/* trying to get with invalid file ID */
@@ -7869,7 +7869,7 @@ test_min_dset_ohdr(void)
{
ret = H5Fget_dset_no_attrs_hint(-1, &minimize);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Fget_dset_no_attrs_hint");
/* trying to get with invalid pointer */
@@ -7877,7 +7877,7 @@ test_min_dset_ohdr(void)
{
ret = H5Fget_dset_no_attrs_hint(file_id, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Fget_dset_no_attrs_hint");
/************/
@@ -8243,5 +8243,5 @@ cleanup_file(void)
H5Fdelete(FILE7, H5P_DEFAULT);
H5Fdelete(DST_FILE, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
diff --git a/test/th5_system.c b/test/th5_system.c
index 4c652c1..0e22b8a 100644
--- a/test/th5_system.c
+++ b/test/th5_system.c
@@ -44,7 +44,7 @@ test_h5_dirname(void)
{
ret = H5_dirname(NULL, &dirname);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5_dirname with NULL path");
H5Eclear2(H5E_DEFAULT);
@@ -55,7 +55,7 @@ test_h5_dirname(void)
{
ret = H5_dirname(path, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5_dirname with NULL dirname pointer");
H5Eclear2(H5E_DEFAULT);
@@ -248,7 +248,7 @@ test_h5_basename(void)
{
ret = H5_basename(NULL, &basename);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5_basename with NULL path");
H5Eclear2(H5E_DEFAULT);
@@ -259,7 +259,7 @@ test_h5_basename(void)
{
ret = H5_basename(path, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5_basename with NULL basename pointer");
H5Eclear2(H5E_DEFAULT);
@@ -513,7 +513,7 @@ test_h5_strndup(void)
{
str = H5_strndup(NULL, 20);
}
- H5E_END_TRY;
+ H5E_END_TRY
CHECK_PTR_NULL(str, "H5_strndup with NULL string pointer");
H5Eclear2(H5E_DEFAULT);
diff --git a/test/th5o.c b/test/th5o.c
index 027445e..4468bab 100644
--- a/test/th5o.c
+++ b/test/th5o.c
@@ -989,7 +989,7 @@ test_h5o_link(void)
{
ret = H5Pset_libver_bounds(fapl_id, low, high);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret < 0) /* Invalid low/high combinations */
continue;
@@ -1180,7 +1180,7 @@ test_h5o_comment(void)
{
ret = H5Oset_comment(dspace, "dataspace comment");
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Oset_comment");
/* Close the file */
@@ -1355,7 +1355,7 @@ test_h5o_comment_by_name(void)
{
ret = H5Oset_comment_by_name(dspace, ".", "dataspace comment", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Oset_comment");
/* Close the file */
@@ -1872,5 +1872,5 @@ cleanup_h5o(void)
h5_fixname(TEST_FILENAME, H5P_DEFAULT, filename, sizeof filename);
H5Fdelete(filename, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
diff --git a/test/th5s.c b/test/th5s.c
index 40d8b06..31944e6 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -184,7 +184,7 @@ test_h5s_basic(void)
{
sid1 = H5Screate_simple(H5S_MAX_RANK + 1, dims3, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(sid1, FAIL, "H5Screate_simple");
/*
@@ -400,7 +400,7 @@ test_h5s_null(void)
ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, start, NULL, count, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Sselect_hyperslab");
/* Check to be sure we can't set a point selection on a null dataspace */
@@ -411,7 +411,7 @@ test_h5s_null(void)
coord[0][0] = 0;
ret = H5Sselect_elements(sid, H5S_SELECT_SET, (size_t)1, (const hsize_t *)coord);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Sselect_elements");
/* Create first dataset */
@@ -745,7 +745,7 @@ test_h5s_zero_dim(void)
{
ret = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, sid1, H5P_DEFAULT, wdata);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Dwrite");
/* Change to "none" selection */
@@ -764,7 +764,7 @@ test_h5s_zero_dim(void)
{
ret = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, sid1, H5P_DEFAULT, &val);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Dwrite");
/* Restore the selection to all */
@@ -864,7 +864,7 @@ test_h5s_zero_dim(void)
{
ret = H5Dset_extent(dset1, extend_dims);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Dset_extent");
ret = H5Pclose(plist_id);
@@ -1265,7 +1265,7 @@ test_h5s_encode(H5F_libver_t low, H5F_libver_t high)
{
ret_id = H5Sdecode(sbuf);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret_id, FAIL, "H5Sdecode");
/* Encode the simple dataspace in a buffer with the fapl setting */
@@ -1457,7 +1457,7 @@ test_h5s_encode1(void)
{
ret_id = H5Sdecode(sbuf);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret_id, FAIL, "H5Sdecode");
/* Encode the simple dataspace in a buffer */
diff --git a/test/titerate.c b/test/titerate.c
index 82d8e9f..674405c 100644
--- a/test/titerate.c
+++ b/test/titerate.c
@@ -233,7 +233,7 @@ test_iter_group(hid_t fapl, hbool_t new_format)
(herr_t)H5Lget_name_by_idx(root_group, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)(NDATASETS + 3),
dataset_name, (size_t)NAMELEN, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Lget_name_by_idx");
ret = H5Gclose(root_group);
@@ -264,7 +264,7 @@ test_iter_group(hid_t fapl, hbool_t new_format)
ret = (herr_t)H5Lget_name_by_idx(file, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)(NDATASETS + 3),
dataset_name, (size_t)NAMELEN, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Lget_name_by_idx");
/* Test invalid indices for starting iteration */
@@ -274,7 +274,7 @@ test_iter_group(hid_t fapl, hbool_t new_format)
{
ret = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Literate2");
/* Test skipping exactly as many entries as in the group */
@@ -283,7 +283,7 @@ test_iter_group(hid_t fapl, hbool_t new_format)
{
ret = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Literate2");
/* Test skipping more entries than are in the group */
@@ -292,7 +292,7 @@ test_iter_group(hid_t fapl, hbool_t new_format)
{
ret = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Literate2");
/* Test all objects in group, when callback always returns 0 */
@@ -473,7 +473,7 @@ test_iter_attr(hid_t fapl, hbool_t new_format)
{
ret = H5Aiterate2(dataset, H5_INDEX_NAME, H5_ITER_INC, &idx, aiter_cb, &info);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Aiterate2");
/* Test skipping more attributes than there are */
@@ -482,7 +482,7 @@ test_iter_attr(hid_t fapl, hbool_t new_format)
{
ret = H5Aiterate2(dataset, H5_INDEX_NAME, H5_ITER_INC, &idx, aiter_cb, &info);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Aiterate2");
/* Test all attributes on dataset, when callback always returns 0 */
@@ -857,7 +857,7 @@ test_grp_memb_funcs(hid_t fapl)
(herr_t)H5Lget_name_by_idx(root_group, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)(NDATASETS + 3),
dataset_name, (size_t)NAMELEN, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Lget_name_by_idx");
/* Sort the dataset names */
diff --git a/test/tmisc.c b/test/tmisc.c
index 4638d74..76aed7b 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -1924,7 +1924,7 @@ test_misc11(void)
{
ret = H5Pset_sym_k(fcpl, 32770, 0);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Pset_sym_k");
ret = H5Pset_sym_k(fcpl, MISC11_SYM_IK, MISC11_SYM_LK);
@@ -1935,7 +1935,7 @@ test_misc11(void)
{
ret = H5Pset_istore_k(fcpl, 32770);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Pset_istore_k");
ret = H5Pset_istore_k(fcpl, MISC11_ISTORE_IK);
@@ -3203,7 +3203,7 @@ test_misc19(void)
{
ret = H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Fclose");
/* Check H5I operations on property lists */
@@ -3237,7 +3237,7 @@ test_misc19(void)
{
ret = H5Pclose(plid);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Pclose");
/* Check H5I operations on property classes */
@@ -3271,7 +3271,7 @@ test_misc19(void)
{
ret = H5Pclose_class(pcid);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Pclose_class");
/* Check H5I operations on datatypes */
@@ -3305,7 +3305,7 @@ test_misc19(void)
{
ret = H5Tclose(tid);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Tclose");
/* Check H5I operations on dataspaces */
@@ -3339,7 +3339,7 @@ test_misc19(void)
{
ret = H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Sclose");
/* Check H5I operations on datasets */
@@ -3381,7 +3381,7 @@ test_misc19(void)
{
ret = H5Dclose(did);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Dclose");
/* Close the dataspace */
@@ -3435,7 +3435,7 @@ test_misc19(void)
{
ret = H5Aclose(aid);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Aclose");
/* Close the root group */
@@ -3485,7 +3485,7 @@ test_misc19(void)
{
ret = H5Gclose(gid);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Gclose");
/* Close the file */
@@ -3523,7 +3523,7 @@ test_misc19(void)
{
ret = H5Eunregister_class(ecid);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Eunregister_class");
/* Check H5I operations on error messages */
@@ -3561,7 +3561,7 @@ test_misc19(void)
{
ret = H5Eclose_msg(emid);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Eclose_msg");
/* Close the error class */
@@ -3599,7 +3599,7 @@ test_misc19(void)
{
ret = H5Eclose_stack(esid);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Eclose_stack");
/* Check H5I operations on virtual file drivers */
@@ -3637,7 +3637,7 @@ test_misc19(void)
{
ret = H5FDunregister(vfdid);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5FDunregister");
HDfree(vfd_cls);
@@ -3677,7 +3677,7 @@ test_misc19(void)
{
ret = H5VLunregister_connector(volid);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5VLunregister_connector");
HDfree(vol_cls);
@@ -4127,7 +4127,7 @@ test_misc23(void)
{
tmp_id = H5Gcreate1(file_id, "/A/B00a/grp", (size_t)0);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Gcreate1");
/* Make sure that size_hint values that can't fit into a 32-bit
@@ -4139,7 +4139,7 @@ test_misc23(void)
{
tmp_id = H5Gcreate1(file_id, "/size_hint_too_large", SIZE_MAX);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Gcreate1");
}
@@ -4148,7 +4148,7 @@ test_misc23(void)
{
tmp_id = H5Gcreate1(file_id, "/largest_size_hint", UINT32_MAX);
}
- H5E_END_TRY;
+ H5E_END_TRY
CHECK(tmp_id, FAIL, "H5Gcreate1");
status = H5Gclose(tmp_id);
CHECK(status, FAIL, "H5Gclose");
@@ -4162,7 +4162,7 @@ test_misc23(void)
{
tmp_id = H5Dcreate1(file_id, "/A/B00c/dset", type_id, space_id, create_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Dcreate1");
tmp_id = H5Dcreate1(file_id, "/A/dset", type_id, space_id, create_id);
@@ -4497,84 +4497,84 @@ test_misc24(void)
{
tmp_id = H5Dopen2(file_id, MISC24_GROUP_NAME, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Dopen2");
H5E_BEGIN_TRY
{
tmp_id = H5Dopen2(file_id, MISC24_GROUP_LINK, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Dopen2");
H5E_BEGIN_TRY
{
tmp_id = H5Topen2(file_id, MISC24_GROUP_NAME, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Topen2");
H5E_BEGIN_TRY
{
tmp_id = H5Topen2(file_id, MISC24_GROUP_LINK, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Topen2");
H5E_BEGIN_TRY
{
tmp_id = H5Gopen2(file_id, MISC24_DATASET_NAME, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Gopen2");
H5E_BEGIN_TRY
{
tmp_id = H5Gopen2(file_id, MISC24_DATASET_LINK, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Gopen2");
H5E_BEGIN_TRY
{
tmp_id = H5Topen2(file_id, MISC24_DATASET_NAME, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Topen2");
H5E_BEGIN_TRY
{
tmp_id = H5Topen2(file_id, MISC24_DATASET_LINK, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Topen2");
H5E_BEGIN_TRY
{
tmp_id = H5Gopen2(file_id, MISC24_DATATYPE_NAME, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Gopen2");
H5E_BEGIN_TRY
{
tmp_id = H5Gopen2(file_id, MISC24_DATATYPE_LINK, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Gopen2");
H5E_BEGIN_TRY
{
tmp_id = H5Dopen2(file_id, MISC24_DATATYPE_NAME, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Dopen2");
H5E_BEGIN_TRY
{
tmp_id = H5Dopen2(file_id, MISC24_DATATYPE_LINK, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Dopen2");
/* Try again, with the object already open through valid call */
@@ -4586,28 +4586,28 @@ test_misc24(void)
{
tmp_id = H5Dopen2(file_id, MISC24_GROUP_NAME, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Dopen2");
H5E_BEGIN_TRY
{
tmp_id = H5Dopen2(file_id, MISC24_GROUP_LINK, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Dopen2");
H5E_BEGIN_TRY
{
tmp_id = H5Topen2(file_id, MISC24_GROUP_NAME, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Topen2");
H5E_BEGIN_TRY
{
tmp_id = H5Topen2(file_id, MISC24_GROUP_LINK, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Topen2");
ret = H5Gclose(group_id);
@@ -4621,28 +4621,28 @@ test_misc24(void)
{
tmp_id = H5Gopen2(file_id, MISC24_DATASET_NAME, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Gopen2");
H5E_BEGIN_TRY
{
tmp_id = H5Gopen2(file_id, MISC24_DATASET_LINK, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Gopen2");
H5E_BEGIN_TRY
{
tmp_id = H5Topen2(file_id, MISC24_DATASET_NAME, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Topen2");
H5E_BEGIN_TRY
{
tmp_id = H5Topen2(file_id, MISC24_DATASET_LINK, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Topen2");
ret = H5Dclose(dset_id);
@@ -4656,28 +4656,28 @@ test_misc24(void)
{
tmp_id = H5Gopen2(file_id, MISC24_DATATYPE_NAME, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Gopen2");
H5E_BEGIN_TRY
{
tmp_id = H5Gopen2(file_id, MISC24_DATATYPE_LINK, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Gopen2");
H5E_BEGIN_TRY
{
tmp_id = H5Dopen2(file_id, MISC24_DATATYPE_NAME, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Dopen2");
H5E_BEGIN_TRY
{
tmp_id = H5Dopen2(file_id, MISC24_DATATYPE_LINK, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(tmp_id, FAIL, "H5Dopen2");
ret = H5Tclose(type_id);
@@ -5284,7 +5284,7 @@ test_misc27(void)
{
gid = H5Gopen2(fid, MISC27_GROUP, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(gid, FAIL, "H5Gopen2");
#else /* H5_STRICT_FORMAT_CHECKS */
/* Open group with incorrect # of object header messages */
@@ -5798,7 +5798,7 @@ test_misc33(void)
{
ret = H5Oget_info_by_name3(fid, "/soft_two", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Oget_info_by_name3");
/* Case (2) */
@@ -5806,7 +5806,7 @@ test_misc33(void)
{
ret = H5Oget_info_by_name3(fid, "/dsetA", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Oget_info_by_name3");
/* Case (3) */
@@ -5814,7 +5814,7 @@ test_misc33(void)
{
ret = H5Oget_info_by_name3(fid, "/soft_one", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Oget_info_by_name3");
/* Close the file */
diff --git a/test/trefer.c b/test/trefer.c
index 2c62234..e1cee21 100644
--- a/test/trefer.c
+++ b/test/trefer.c
@@ -1302,7 +1302,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high)
{
dset1 = H5Dcreate2(fid1, "Dataset1", H5T_STD_REF, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (dset1 < 0) {
VERIFY(libver_high <= H5F_LIBVER_V110, TRUE, "H5Dcreate2");
@@ -1465,7 +1465,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high)
{
dset2 = H5Ropen_object(&rdata_NA[0], H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(dset2, H5I_INVALID_HID, "H5Ropen_object");
/* Close and release resources. */
@@ -1478,7 +1478,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high)
{
ret = H5Dclose(dset2);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Dclose");
/*
@@ -1633,7 +1633,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high)
{
ret = H5Rget_obj_type3(&nvrbuf[j], H5P_DEFAULT, &obj_type);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Rget_obj_type3");
} /* end for */
@@ -1758,7 +1758,7 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high)
{
dset1 = H5Dcreate2(fid1, "Dataset1", H5T_STD_REF, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (dset1 < 0) {
diff --git a/test/trefer_deprec.c b/test/trefer_deprec.c
index 8d75fed..0128874 100644
--- a/test/trefer_deprec.c
+++ b/test/trefer_deprec.c
@@ -465,7 +465,7 @@ test_reference_obj(void)
{
ret = H5Rget_obj_type2(dataset, H5R_OBJECT, &nvrbuf[j], &obj_type);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Rget_obj_type2");
} /* end for */
@@ -665,7 +665,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high)
{
ret = H5Rcreate(&wbuf[2], fid1, "/Dataset2", H5R_DATASET_REGION, sid2);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (libver_high < H5F_LIBVER_V110)
VERIFY(ret, FAIL, "H5Rcreate");
@@ -743,7 +743,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high)
{
dset2 = H5Rdereference2(dset_NA, H5P_DEFAULT, H5R_DATASET_REGION, &rdata_NA[0]);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(dset2, FAIL, "H5Rdereference2");
/* Close and release resources. */
@@ -756,7 +756,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high)
{
ret = H5Dclose(dset2);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Dclose");
/*
@@ -913,7 +913,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high)
{
ret = H5Rget_obj_type2(dset1, H5R_DATASET_REGION, &nvrbuf[j], &obj_type);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Rget_obj_type2");
} /* end for */
diff --git a/test/tselect.c b/test/tselect.c
index d67e5bd..97061fe 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -290,7 +290,7 @@ test_select_hyper(hid_t xfer_plist)
{
ret = H5Sselect_hyperslab(sid1, H5S_SELECT_SET, start, stride, count, block);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Sselect_hyperslab");
/* Test selecting stride<block to verify failure */
@@ -310,7 +310,7 @@ test_select_hyper(hid_t xfer_plist)
{
ret = H5Sselect_hyperslab(sid1, H5S_SELECT_SET, start, stride, count, block);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Sselect_hyperslab");
/* Select 2x15x13 hyperslab for disk dataset */
@@ -353,13 +353,13 @@ test_select_hyper(hid_t xfer_plist)
{
ret = H5Dwrite(dataset, H5T_NATIVE_UCHAR, sid2, sid1, xfer_plist, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Dwrite");
H5E_BEGIN_TRY
{
ret = H5Dwrite(dataset, H5T_NATIVE_UCHAR, H5S_ALL, H5S_ALL, xfer_plist, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Dwrite");
/* Close memory dataspace */
@@ -403,13 +403,13 @@ test_select_hyper(hid_t xfer_plist)
{
ret = H5Dread(dataset, H5T_NATIVE_UCHAR, sid2, sid1, xfer_plist, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Dread");
H5E_BEGIN_TRY
{
ret = H5Dread(dataset, H5T_NATIVE_UCHAR, H5S_ALL, H5S_ALL, xfer_plist, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Dread");
/* Check that the values match with a dataset iterator */
@@ -8235,7 +8235,7 @@ test_scalar_select2(void)
{
ret = H5Sselect_elements(sid, H5S_SELECT_SET, (size_t)1, (const hsize_t *)&coord1);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Sselect_elements");
/* Select one element in memory with a hyperslab selection */
@@ -8245,7 +8245,7 @@ test_scalar_select2(void)
{
ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, start, NULL, count, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Sselect_hyperslab");
/* Select no elements in memory & file with "none" selection */
@@ -13914,7 +13914,7 @@ test_select_bounds(void)
{
ret = H5Sget_select_bounds(sid, low_bounds, high_bounds);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Sget_select_bounds");
/* Set point selection */
@@ -13948,7 +13948,7 @@ test_select_bounds(void)
{
ret = H5Sget_select_bounds(sid, low_bounds, high_bounds);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Sget_select_bounds");
/* Set valid offset for selection */
@@ -14002,7 +14002,7 @@ test_select_bounds(void)
{
ret = H5Sget_select_bounds(sid, low_bounds, high_bounds);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Sget_select_bounds");
/* Set valid offset for selection */
@@ -14056,7 +14056,7 @@ test_select_bounds(void)
{
ret = H5Sget_select_bounds(sid, low_bounds, high_bounds);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Sget_select_bounds");
/* Set valid offset for selection */
@@ -14121,7 +14121,7 @@ test_hyper_regular(void)
{
is_regular = H5Sis_regular_hyperslab(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(is_regular, FAIL, "H5Sis_regular_hyperslab");
/* Query regular hyperslab selection info (should fail) */
@@ -14129,7 +14129,7 @@ test_hyper_regular(void)
{
ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Sget_regular_hyperslab");
/* Set 'none' selection */
@@ -14141,7 +14141,7 @@ test_hyper_regular(void)
{
is_regular = H5Sis_regular_hyperslab(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(is_regular, FAIL, "H5Sis_regular_hyperslab");
/* Query regular hyperslab selection info (should fail) */
@@ -14149,7 +14149,7 @@ test_hyper_regular(void)
{
ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Sget_regular_hyperslab");
/* Set point selection */
@@ -14173,7 +14173,7 @@ test_hyper_regular(void)
{
is_regular = H5Sis_regular_hyperslab(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(is_regular, FAIL, "H5Sis_regular_hyperslab");
/* Query regular hyperslab selection info (should fail) */
@@ -14181,7 +14181,7 @@ test_hyper_regular(void)
{
ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Sget_regular_hyperslab");
/* Set "regular" hyperslab selection */
@@ -14239,7 +14239,7 @@ test_hyper_regular(void)
{
ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Sget_regular_hyperslab");
/* 'XOR' in the point again, to remove it, which should make it regular again */
@@ -15162,19 +15162,19 @@ test_sel_iter(void)
{ /* Bad dataspace ID */
iter_id = H5Ssel_iter_create(H5I_INVALID_HID, (size_t)1, (unsigned)0);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(iter_id, FAIL, "H5Ssel_iter_create");
H5E_BEGIN_TRY
{ /* Bad element size */
iter_id = H5Ssel_iter_create(sid, (size_t)0, (unsigned)0);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(iter_id, FAIL, "H5Ssel_iter_create");
H5E_BEGIN_TRY
{ /* Bad flag(s) */
iter_id = H5Ssel_iter_create(sid, (size_t)1, (unsigned)0xffff);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(iter_id, FAIL, "H5Ssel_iter_create");
/* Try closing selection iterator, with bad parameters */
@@ -15182,13 +15182,13 @@ test_sel_iter(void)
{ /* Invalid ID */
ret = H5Ssel_iter_close(H5I_INVALID_HID);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Ssel_iter_close");
H5E_BEGIN_TRY
{ /* Not a selection iterator ID */
ret = H5Ssel_iter_close(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Ssel_iter_close");
/* Try with no selection sharing, and with sharing */
@@ -15212,7 +15212,7 @@ test_sel_iter(void)
{ /* Invalid ID */
ret = H5Ssel_iter_close(iter_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Ssel_iter_close");
/* Create selection iterator object */
@@ -15224,13 +15224,13 @@ test_sel_iter(void)
{
ret = H5Ssel_iter_reset(H5I_INVALID_HID, sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Ssel_iter_reset");
H5E_BEGIN_TRY
{
ret = H5Ssel_iter_reset(iter_id, H5I_INVALID_HID);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Ssel_iter_reset");
/* Try retrieving sequences, with bad parameters */
@@ -15238,31 +15238,31 @@ test_sel_iter(void)
{ /* Invalid ID */
ret = H5Ssel_iter_get_seq_list(H5I_INVALID_HID, (size_t)1, (size_t)1, &nseq, &nbytes, off, len);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Ssel_iter_get_seq_list");
H5E_BEGIN_TRY
{ /* Invalid nseq pointer */
ret = H5Ssel_iter_get_seq_list(iter_id, (size_t)1, (size_t)1, NULL, &nbytes, off, len);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Ssel_iter_get_seq_list");
H5E_BEGIN_TRY
{ /* Invalid nbytes pointer */
ret = H5Ssel_iter_get_seq_list(iter_id, (size_t)1, (size_t)1, &nseq, NULL, off, len);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Ssel_iter_get_seq_list");
H5E_BEGIN_TRY
{ /* Invalid offset array */
ret = H5Ssel_iter_get_seq_list(iter_id, (size_t)1, (size_t)1, &nseq, &nbytes, NULL, len);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Ssel_iter_get_seq_list");
H5E_BEGIN_TRY
{ /* Invalid length array */
ret = H5Ssel_iter_get_seq_list(iter_id, (size_t)1, (size_t)1, &nseq, &nbytes, off, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(ret, FAIL, "H5Ssel_iter_get_seq_list");
/* Close selection iterator */
@@ -15686,31 +15686,31 @@ test_select_intersect_block(void)
{ /* Bad dataspace ID */
status = H5Sselect_intersect_block(H5I_INVALID_HID, block_start, block_end);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(status, FAIL, "H5Sselect_intersect_block");
H5E_BEGIN_TRY
{ /* Bad start pointer */
status = H5Sselect_intersect_block(sid, NULL, block_end);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(status, FAIL, "H5Sselect_intersect_block");
H5E_BEGIN_TRY
{ /* Bad end pointer */
status = H5Sselect_intersect_block(sid, block_start, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(status, FAIL, "H5Sselect_intersect_block");
H5E_BEGIN_TRY
{ /* Invalid block */
status = H5Sselect_intersect_block(sid, block_start, block_end2);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(status, FAIL, "H5Sselect_intersect_block");
H5E_BEGIN_TRY
{ /* Another invalid block */
status = H5Sselect_intersect_block(sid, block_start, block_end3);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(status, FAIL, "H5Sselect_intersect_block");
/* Set selection to 'none' */
diff --git a/test/tsohm.c b/test/tsohm.c
index 7d9964f..9f2dd50 100644
--- a/test/tsohm.c
+++ b/test/tsohm.c
@@ -1344,7 +1344,7 @@ test_sohm_attrs(void)
ret = H5Pclose(fcpl_id);
CHECK_I(ret, "H5Pclose");
}
- H5E_END_TRY;
+ H5E_END_TRY
/* three shared message indices
*/
@@ -2157,9 +2157,9 @@ test_sohm_size2(int close_reopen)
herr_t ret;
if (close_reopen == 0)
- MESSAGE(5, ("Testing that shared object header messages save space\n"))
+ MESSAGE(5, ("Testing that shared object header messages save space\n"));
else
- MESSAGE(5, ("Testing that shared messages save space when file is closed and reopened\n"))
+ MESSAGE(5, ("Testing that shared messages save space when file is closed and reopened\n"));
/* Create an fcpl with SOHMs disabled */
fcpl_id = H5Pcreate(H5P_FILE_CREATE);
diff --git a/test/tvltypes.c b/test/tvltypes.c
index 1e0de1c..f8b8056 100644
--- a/test/tvltypes.c
+++ b/test/tvltypes.c
@@ -139,7 +139,7 @@ test_vltypes_dataset_create(void)
{
dataset = H5Dcreate2(fid1, "Dataset1", tid1, sid1, H5P_DEFAULT, dcpl, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(dataset, FAIL, "H5Dcreate2");
/* Close datatype */
@@ -208,14 +208,14 @@ test_vltypes_funcs(void)
{
cset = H5Tget_cset(type);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(cset, FAIL, "H5Tget_cset");
H5E_BEGIN_TRY
{
strpad = H5Tget_strpad(type);
}
- H5E_END_TRY;
+ H5E_END_TRY
VERIFY(strpad, FAIL, "H5Tget_strpad");
/* Close datatype */
diff --git a/test/unlink.c b/test/unlink.c
index e18ae73..50781d9 100644
--- a/test/unlink.c
+++ b/test/unlink.c
@@ -118,7 +118,7 @@ test_one(hid_t file)
{
status = H5Ldelete(grp, ".", H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
FAIL_PUTS_ERROR(" Unlinking object w/o a name should have failed.");
if (H5Gclose(grp) < 0)
@@ -137,7 +137,7 @@ error:
H5Gclose(work);
H5Gclose(grp);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_one() */
@@ -244,7 +244,7 @@ error:
H5Gclose(work);
H5Gclose(grp);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -289,7 +289,7 @@ error:
{
H5Gclose(work);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_symlink() */
@@ -353,7 +353,7 @@ error:
H5Gclose(foo);
H5Gclose(inner);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_rename() */
@@ -410,7 +410,7 @@ test_new_move(hid_t fapl)
FAIL)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Move a group across files. Should fail. */
H5E_BEGIN_TRY
@@ -418,7 +418,7 @@ test_new_move(hid_t fapl)
if (H5Lmove(grp_1, "group_move", file_b, "group_new_name", H5P_DEFAULT, H5P_DEFAULT) != FAIL)
TEST_ERROR;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Move a group across groups in the same file. */
if (H5Lmove(grp_1, "group_move", grp_2, "group_new_name", H5P_DEFAULT, H5P_DEFAULT) < 0)
@@ -454,7 +454,7 @@ error:
H5Fclose(file_a);
H5Fclose(file_b);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -1243,7 +1243,7 @@ test_filespace(hid_t fapl)
{
dataset = H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (dataset >= 0) {
H5Dclose(dataset);
TEST_ERROR;
@@ -1285,7 +1285,7 @@ test_filespace(hid_t fapl)
{
group = H5Gcreate2(file, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (group >= 0) {
H5Gclose(group);
TEST_ERROR;
@@ -1335,7 +1335,7 @@ test_filespace(hid_t fapl)
{
status = H5Tcommit2(file, TYPENAME, type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (status >= 0)
TEST_ERROR;
if (H5Tclose(type) < 0)
@@ -1390,7 +1390,7 @@ test_filespace(hid_t fapl)
{
attr = H5Acreate2(dataset, ATTRNAME, H5T_NATIVE_INT, attr_space, H5P_DEFAULT, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (attr >= 0) {
H5Aclose(attr);
TEST_ERROR;
@@ -1784,7 +1784,7 @@ error:
{
H5Gclose(gids[n]);
}
- H5E_END_TRY;
+ H5E_END_TRY
} /* end if */
HDfree(gids);
} /* end if */
@@ -1792,7 +1792,7 @@ error:
{
H5Gclose(rootid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_unlink_rightleaf() */
@@ -1874,7 +1874,7 @@ error:
{
H5Gclose(gids[n]);
}
- H5E_END_TRY;
+ H5E_END_TRY
} /* end if */
HDfree(gids);
} /* end if */
@@ -1882,7 +1882,7 @@ error:
{
H5Gclose(rootid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_unlink_rightnode() */
@@ -2250,7 +2250,7 @@ error:
{
H5Gclose(gids[n]);
}
- H5E_END_TRY;
+ H5E_END_TRY
} /* end if */
HDfree(gids);
} /* end if */
@@ -2258,7 +2258,7 @@ error:
{
H5Gclose(rootid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_unlink_middlenode() */
@@ -2342,7 +2342,7 @@ error:
H5Dclose(d);
H5Fclose(f);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_resurrect_dataset() */
@@ -2422,7 +2422,7 @@ error:
H5Tclose(type);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_resurrect_datatype() */
@@ -2500,7 +2500,7 @@ error:
H5Gclose(group);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_resurrect_group() */
@@ -2598,7 +2598,7 @@ error:
H5Dclose(dset_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_unlink_chunked_dataset() */
@@ -2759,7 +2759,7 @@ error:
H5Gclose(gid);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_full_group_compact() */
@@ -2937,7 +2937,7 @@ error:
H5Pclose(gcpl);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_full_group_dense() */
diff --git a/test/unregister.c b/test/unregister.c
index 104e638..db6cfd1 100644
--- a/test/unregister.c
+++ b/test/unregister.c
@@ -152,7 +152,7 @@ test_unregister_filters(hid_t fapl_id)
{
ret = H5Zunregister(H5Z_FILTER_DUMMY);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0) {
H5_FAILED();
HDprintf(" Line %d: Should not be able to unregister filter\n", __LINE__);
@@ -203,7 +203,7 @@ test_unregister_filters(hid_t fapl_id)
{
ret = H5Zunregister(H5Z_FILTER_DUMMY);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret >= 0) {
H5_FAILED();
HDprintf(" Line %d: Should not be able to unregister filter\n", __LINE__);
@@ -258,7 +258,7 @@ error:
H5Dclose(did);
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(buf);
HDfree(buf_data);
diff --git a/test/vds.c b/test/vds.c
index 987771a..9f2ea97 100644
--- a/test/vds.c
+++ b/test/vds.c
@@ -511,7 +511,7 @@ error:
H5Fclose(file);
H5Dclose(dset);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (plist_buf)
HDfree(plist_buf);
@@ -1165,7 +1165,7 @@ error:
H5Pclose(dcpl);
H5Pclose(ex_dcpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_api() */
@@ -1435,7 +1435,7 @@ error:
H5Pclose(dapl);
H5Pclose(dcpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (HDsetenv("HDF5_VDS_PREFIX", "", 1) < 0)
TEST_ERROR_SUPPRESSED;
@@ -4368,7 +4368,7 @@ error:
H5Sclose(memspace);
H5Pclose(dcpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(srcfilename);
HDfree(srcfilename_map);
@@ -7382,7 +7382,7 @@ error:
H5Pclose(srcdcpl);
H5Pclose(dapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_unlim() */
@@ -11088,7 +11088,7 @@ error:
H5Pclose(dcpl);
H5Pclose(dapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(srcfilename);
HDfree(srcfilename_map);
@@ -12125,7 +12125,7 @@ error:
H5Pclose(dcpl);
H5Pclose(srcdcpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_all() */
@@ -12277,7 +12277,7 @@ error:
H5Sclose(src_sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_dapl_values() */
diff --git a/test/vds_env.c b/test/vds_env.c
index 74b3caa..2f362d9 100644
--- a/test/vds_env.c
+++ b/test/vds_env.c
@@ -307,7 +307,7 @@ error:
H5Pclose(dapl);
H5Pclose(dcpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* end test_vds_prefix2 */
diff --git a/test/vfd.c b/test/vfd.c
index cd4c793..d8fb5d0 100644
--- a/test/vfd.c
+++ b/test/vfd.c
@@ -78,12 +78,14 @@ const char *FILENAME[] = {"sec2_file", /*0*/
*/
static int __k;
#define HEXPRINT(size, buf) \
- for (__k = 0; __k < (size); __k++) { \
- if (__k % 16 == 0) { \
- HDprintf("\n%04x", __k); \
+ do { \
+ for (__k = 0; __k < (size); __k++) { \
+ if (__k % 16 == 0) { \
+ HDprintf("\n%04x", __k); \
+ } \
+ HDprintf((__k % 4 == 0) ? " %02X" : " %02X", (unsigned char)(buf)[__k]); \
} \
- HDprintf((__k % 4 == 0) ? " %02X" : " %02X", (unsigned char)(buf)[__k]); \
- } /* end #define HEXPRINT() */
+ } while (0) /* end #define HEXPRINT() */
/* Macro SET_SIZE()
*
@@ -290,7 +292,7 @@ error:
H5Pclose(fapl_id_out);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_sec2() */
@@ -676,7 +678,7 @@ error:
H5Pclose(fapl_id);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (data_w)
HDfree(data_w);
@@ -747,7 +749,7 @@ test_direct(void)
{
file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (file < 0) {
H5Pclose(fapl);
SKIPPED();
@@ -903,7 +905,7 @@ error:
H5Dclose(dset2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (proto_points)
HDfree(proto_points);
@@ -950,7 +952,7 @@ test_family_opens(char *fname, hid_t fa_pl)
{
file = H5Fopen(first_name, H5F_ACC_RDWR, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (file >= 0)
TEST_ERROR;
@@ -959,7 +961,7 @@ test_family_opens(char *fname, hid_t fa_pl)
{
file = H5Fopen(fname, H5F_ACC_RDWR, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (file >= 0)
TEST_ERROR;
@@ -971,7 +973,7 @@ test_family_opens(char *fname, hid_t fa_pl)
{
file = H5Fopen(fname, H5F_ACC_RDWR, fa_pl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (file >= 0)
TEST_ERROR;
@@ -990,7 +992,7 @@ test_family_opens(char *fname, hid_t fa_pl)
{
file = H5Fopen(wrong_name, H5F_ACC_RDWR, fa_pl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (file >= 0)
TEST_ERROR;
@@ -1193,7 +1195,7 @@ error:
H5Pclose(fapl2);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(buf);
HDfree(buf_data);
@@ -1307,7 +1309,7 @@ error:
H5Fclose(file);
H5Pclose(fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_family_compat() */
@@ -1424,7 +1426,7 @@ error:
H5Pclose(fapl_id);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(buf);
HDfree(buf_data);
@@ -1467,7 +1469,7 @@ test_multi_opens(char *fname)
{
fid = H5Fopen(sf_name, H5F_ACC_RDWR, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (fid >= 0 ? FAIL : SUCCEED);
} /* end test_multi_opens() */
@@ -1716,7 +1718,7 @@ error:
H5Fclose(file);
H5Aclose(attr);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(buf);
HDfree(buf_data);
@@ -1908,7 +1910,7 @@ error:
H5Pclose(fapl);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(buf);
HDfree(buf_data);
@@ -1954,7 +1956,7 @@ test_log(void)
{
ret = H5Pset_fapl_log(H5I_INVALID_HID, LOG_FILENAME, 0, 0);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (SUCCEED == ret)
TEST_ERROR;
@@ -2038,7 +2040,7 @@ error:
H5Pclose(fapl);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -2145,7 +2147,7 @@ error:
H5Pclose(fapl);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -2268,7 +2270,7 @@ error:
H5Pclose(fapl);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
#endif /* H5_HAVE_WINDOWS */
@@ -2366,7 +2368,7 @@ error:
H5Pclose(fapl_id_out);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
#endif /* H5_HAVE_ROS3_VFD */
} /* end test_ros3() */
@@ -2381,7 +2383,7 @@ error:
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
*/
#define SPLITTER_TEST_FAULT(mesg) \
- { \
+ do { \
H5_FAILED(); \
AT(); \
HDfprintf(stderr, mesg); \
@@ -2389,7 +2391,7 @@ error:
HDfflush(stderr); \
ret_value = -1; \
goto done; \
- }
+ } while (0)
/*-------------------------------------------------------------------------
* Function: compare_splitter_config_info
@@ -2615,7 +2617,7 @@ done:
H5Pclose(fapl_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
if (logfile != NULL)
@@ -2669,7 +2671,7 @@ driver_is_splitter_compatible(hid_t fapl_id)
{
ret = H5Pset_fapl_splitter(split_fapl_id, vfd_config);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (SUCCEED == ret) {
ret_value = -1;
}
@@ -2688,7 +2690,7 @@ error:
{
H5Pclose(split_fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(vfd_config);
@@ -2752,7 +2754,7 @@ splitter_RO_test(const struct splitter_dataset_def *data, hid_t child_fapl_id)
{
file_id = H5Fopen(filename_rw, H5F_ACC_RDONLY, fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (file_id >= 0) {
SPLITTER_TEST_FAULT("R/O open on nonexistent files unexpectedly successful\n");
}
@@ -2768,7 +2770,7 @@ splitter_RO_test(const struct splitter_dataset_def *data, hid_t child_fapl_id)
{
file_id = H5Fopen(filename_rw, H5F_ACC_RDONLY, fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (file_id >= 0) {
SPLITTER_TEST_FAULT("R/O open with extant W/O file unexpectedly successful\n");
}
@@ -2785,7 +2787,7 @@ splitter_RO_test(const struct splitter_dataset_def *data, hid_t child_fapl_id)
{
file_id = H5Fopen(filename_rw, H5F_ACC_RDONLY, fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (file_id >= 0) {
SPLITTER_TEST_FAULT("R/O open with extant R/W file unexpectedly successful\n");
}
@@ -2823,7 +2825,7 @@ done:
H5Pclose(fapl_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
HDfree(vfd_config);
@@ -2962,7 +2964,7 @@ done:
H5Sclose(space_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
} /* end if error */
return ret_value;
} /* end splitter_create_single_file_at() */
@@ -3023,7 +3025,7 @@ done:
{
H5Dclose(dset_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
return ret_value;
} /* end splitter_compare_expected_data() */
@@ -3124,7 +3126,7 @@ splitter_tentative_open_test(hid_t child_fapl_id)
{
file_id = H5Fopen(filename_rw, H5F_ACC_RDWR, fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (file_id != H5I_INVALID_HID) {
SPLITTER_TEST_FAULT("open with both nonexistent files unexpectedly succeeded\n");
}
@@ -3148,7 +3150,7 @@ splitter_tentative_open_test(hid_t child_fapl_id)
{
file_id = H5Fopen(filename_rw, H5F_ACC_RDWR, fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (file_id != H5I_INVALID_HID) {
SPLITTER_TEST_FAULT("open with nonexistent R/W file unexpectedly succeeded\n");
}
@@ -3176,7 +3178,7 @@ splitter_tentative_open_test(hid_t child_fapl_id)
{
file_id = H5Fopen(filename_rw, H5F_ACC_RDWR, fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (file_id != H5I_INVALID_HID) {
SPLITTER_TEST_FAULT("open with nonexistent W/O unexpectedly succeeded\n");
}
@@ -3314,7 +3316,7 @@ done:
H5Pclose(fapl_id);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
HDfree(vfd_config);
@@ -3345,7 +3347,7 @@ file_exists(const char *filename, hid_t fapl_id)
{
file_id = H5Fopen(filename, H5F_ACC_RDONLY, fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (file_id != H5I_INVALID_HID) {
ret_value = 1;
if (H5Fclose(file_id) < 0) {
@@ -3360,7 +3362,7 @@ error:
{
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return ret_value;
} /* end file_exists() */
@@ -3695,7 +3697,7 @@ run_ctl_test(uint64_t op_code, uint64_t flags, ctl_test_opc_type opc_type, hid_t
{
ctl_result = H5FDctl(file_drv_ptr, op_code, flags, NULL, NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
else
ctl_result = H5FDctl(file_drv_ptr, op_code, flags, NULL, NULL);
@@ -3722,7 +3724,7 @@ error:
{
H5FDclose(file_drv_ptr);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -4021,7 +4023,7 @@ error:
H5Pclose(sub_fapl_id);
H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -4945,7 +4947,7 @@ error:
H5Pclose(fapl_id);
H5FDclose(lf);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_vector_io() */
@@ -5926,7 +5928,7 @@ error:
H5Sclose(file_spaces[i]);
}
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end test_selection_io() */
diff --git a/test/vfd_plugin.c b/test/vfd_plugin.c
index 182c048..e722405 100644
--- a/test/vfd_plugin.c
+++ b/test/vfd_plugin.c
@@ -82,7 +82,7 @@ error:
{
H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
}
@@ -149,7 +149,7 @@ error:
{
H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
}
@@ -261,7 +261,7 @@ error:
{
H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
}
@@ -322,7 +322,7 @@ error:
{
H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
}
diff --git a/test/vol.c b/test/vol.c
index 1c4f9ca..a7c669c 100644
--- a/test/vol.c
+++ b/test/vol.c
@@ -708,7 +708,7 @@ test_vol_registration(void)
{
vol_id = H5VLregister_connector(&fake_vol_g, lapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (H5I_INVALID_HID != vol_id)
FAIL_PUTS_ERROR("should not be able to register a connector with an incorrect property list");
if (H5Pclose(lapl_id) < 0)
@@ -723,7 +723,7 @@ test_vol_registration(void)
{
vol_id = H5VLregister_connector(bad_fake_vol_class, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (H5I_INVALID_HID != vol_id)
FAIL_PUTS_ERROR("should not be able to register a connector with an incompatible version #");
HDfree(bad_fake_vol_class);
@@ -790,7 +790,7 @@ test_vol_registration(void)
{
ret = H5VLunregister_connector(native_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (FAIL != ret)
FAIL_PUTS_ERROR("should not be able to unregister the native VOL connector");
@@ -804,7 +804,7 @@ error:
H5Pclose(lapl_id);
H5Pclose(vipl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (bad_fake_vol_class)
HDfree(bad_fake_vol_class);
@@ -1030,7 +1030,7 @@ error:
H5Pclose(fapl_id2);
H5Pclose(fcpl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
@@ -1137,7 +1137,7 @@ error:
H5Pclose(fapl_id);
H5Pclose(gcpl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
@@ -1325,7 +1325,7 @@ error:
H5Pclose(dapl_id);
H5Pclose(dcpl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
@@ -1438,7 +1438,7 @@ error:
H5Aclose(aid);
H5Aclose(aid_name);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
@@ -1518,7 +1518,7 @@ error:
H5Pclose(fapl_id);
H5Gclose(gid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
@@ -1597,7 +1597,7 @@ error:
H5Fclose(gid);
H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
@@ -1694,7 +1694,7 @@ error:
H5Tclose(tid);
H5Tclose(tid_anon);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
@@ -1797,7 +1797,7 @@ exercise_reg_opt_oper(hid_t fake_vol_id, hid_t reg_opt_vol_id, H5VL_subclass_t s
ret = (*reg_opt_op.obj_op)(__FILE__, __func__, __LINE__, obj_id, &vol_cb_args, H5P_DEFAULT,
H5ES_NONE);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (FAIL != ret)
FAIL_PUTS_ERROR("should not be able to perform an optional operation with a NULL callback");
if ((-1) != fake_obj)
@@ -1956,7 +1956,7 @@ test_register_opt_operation(void)
{
ret = H5VLregister_opt_operation(H5VL_SUBCLS_NONE, "fail", &op_val);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (FAIL != ret)
FAIL_PUTS_ERROR("should not be able to register an optional operation for the 'NONE' VOL subclass");
if ((-1) != op_val)
@@ -1965,7 +1965,7 @@ test_register_opt_operation(void)
{
ret = H5VLregister_opt_operation(H5VL_SUBCLS_INFO, "fail2", &op_val);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (FAIL != ret)
FAIL_PUTS_ERROR("should not be able to register an optional operation for the 'INFO' VOL subclass");
if ((-1) != op_val)
@@ -1974,7 +1974,7 @@ test_register_opt_operation(void)
{
ret = H5VLregister_opt_operation(H5VL_SUBCLS_WRAP, "fail3", &op_val);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (FAIL != ret)
FAIL_PUTS_ERROR("should not be able to register an optional operation for the 'WRAP' VOL subclass");
if ((-1) != op_val)
@@ -1983,7 +1983,7 @@ test_register_opt_operation(void)
{
ret = H5VLregister_opt_operation(H5VL_SUBCLS_BLOB, "fail4", &op_val);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (FAIL != ret)
FAIL_PUTS_ERROR("should not be able to register an optional operation for the 'BLOB' VOL subclass");
if ((-1) != op_val)
@@ -1992,7 +1992,7 @@ test_register_opt_operation(void)
{
ret = H5VLregister_opt_operation(H5VL_SUBCLS_TOKEN, "fail5", &op_val);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (FAIL != ret)
FAIL_PUTS_ERROR("should not be able to register an optional operation for the 'TOKEN' VOL subclass");
if ((-1) != op_val)
@@ -2003,7 +2003,7 @@ test_register_opt_operation(void)
{
ret = H5VLregister_opt_operation(H5VL_SUBCLS_FILE, "fail6", NULL);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (FAIL != ret)
FAIL_PUTS_ERROR("should not be able to register an optional operation with a NULL 'op_val'");
@@ -2012,7 +2012,7 @@ test_register_opt_operation(void)
{
ret = H5VLfind_opt_operation(H5VL_SUBCLS_DATASET, "fail", &op_val);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (FAIL != ret)
FAIL_PUTS_ERROR("should not be able to find a non-existent optional operation");
@@ -2021,7 +2021,7 @@ test_register_opt_operation(void)
{
ret = H5VLunregister_opt_operation(H5VL_SUBCLS_DATASET, "fail");
}
- H5E_END_TRY;
+ H5E_END_TRY
if (FAIL != ret)
FAIL_PUTS_ERROR("should not be able to unregister a non-existent optional operation");
@@ -2054,7 +2054,7 @@ error:
H5VLunregister_connector(fake_vol_id);
H5VLunregister_connector(reg_opt_vol_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_register_opt_operation() */
@@ -2208,7 +2208,7 @@ error:
H5Pclose(fapl_id);
H5VLunregister_connector(vol_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(conn_env_str);
return FAIL;
@@ -2313,7 +2313,7 @@ error:
H5VLunregister_connector(vol_id);
H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_vol_cap_flags() */
@@ -2383,7 +2383,7 @@ error:
H5Fclose(file_id);
H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_get_vol_name() */
diff --git a/test/vol_plugin.c b/test/vol_plugin.c
index c7baf5a..4b8d263 100644
--- a/test/vol_plugin.c
+++ b/test/vol_plugin.c
@@ -75,7 +75,7 @@ error:
{
H5VLunregister_connector(vol_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_registration_by_value() */
@@ -132,7 +132,7 @@ error:
{
H5VLunregister_connector(vol_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_registration_by_name() */
@@ -237,7 +237,7 @@ error:
for (i = 0; i < N_REGISTRATIONS; i++)
H5VLunregister_connector(vol_ids[i]);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_multiple_registration() */
@@ -313,7 +313,7 @@ error:
H5VLclose(vol_id_out);
H5VLunregister_connector(vol_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end test_getters() */
diff --git a/testpar/t_file.c b/testpar/t_file.c
index 716379b..9c98e5b 100644
--- a/testpar/t_file.c
+++ b/testpar/t_file.c
@@ -156,7 +156,7 @@ test_page_buffer_access(void)
{
file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
VRFY((file_id < 0), "H5Fcreate failed");
/* disable collective metadata writes for page buffering to work */
@@ -992,7 +992,7 @@ test_delete(void)
{
is_hdf5 = H5Fis_accessible(filename, fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
VRFY((is_hdf5 != SUCCEED), "H5Fis_accessible");
/* Release file-access plist */
diff --git a/testpar/t_filters_parallel.c b/testpar/t_filters_parallel.c
index b4a4edb..f6c300a 100644
--- a/testpar/t_filters_parallel.c
+++ b/testpar/t_filters_parallel.c
@@ -3450,7 +3450,7 @@ test_write_cmpd_filtered_dataset_type_conversion_unshared(const char *parent_gro
{
VRFY((H5Dwrite(dset_id, memtype, memspace, filespace, dxpl_id, data) < 0), "Dataset write succeeded");
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Verify space allocation status */
verify_space_alloc_status(dset_id, plist_id, NO_CHUNKS_WRITTEN);
@@ -3649,7 +3649,7 @@ test_write_cmpd_filtered_dataset_type_conversion_shared(const char *parent_group
{
VRFY((H5Dwrite(dset_id, memtype, memspace, filespace, dxpl_id, data) < 0), "Dataset write succeeded");
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Verify space allocation status */
verify_space_alloc_status(dset_id, plist_id, NO_CHUNKS_WRITTEN);
@@ -8281,7 +8281,7 @@ test_fill_value_undefined(const char *parent_group, H5Z_filter_t filter_id, hid_
VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_ALL, H5S_ALL, dxpl_id, read_buf) < 0),
"Dataset read succeeded");
}
- H5E_END_TRY;
+ H5E_END_TRY
}
/*
diff --git a/testpar/t_pflush2.c b/testpar/t_pflush2.c
index 3e42351..0250463 100644
--- a/testpar/t_pflush2.c
+++ b/testpar/t_pflush2.c
@@ -119,7 +119,7 @@ error:
H5Sclose(sid);
H5Gclose(gid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end check_test_file() */
diff --git a/testpar/t_subfiling_vfd.c b/testpar/t_subfiling_vfd.c
index 0841923..1e094fd 100644
--- a/testpar/t_subfiling_vfd.c
+++ b/testpar/t_subfiling_vfd.c
@@ -210,7 +210,7 @@ test_create_and_close(void)
{
H5Fdelete(SUBF_FILENAME, fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
VRFY((H5Pclose(fapl_id) >= 0), "FAPL close succeeded");
@@ -390,7 +390,7 @@ test_config_file(void)
{
H5Fdelete(SUBF_FILENAME, fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
VRFY((H5Pclose(fapl_id) >= 0), "FAPL close succeeded");
@@ -603,7 +603,7 @@ test_stripe_sizes(void)
{
H5Fdelete(SUBF_FILENAME, fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
VRFY((H5Pclose(fapl_id) >= 0), "FAPL close succeeded");
}
@@ -781,7 +781,7 @@ test_stripe_sizes(void)
{
H5Fdelete(SUBF_FILENAME, fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(write_buf);
@@ -1193,7 +1193,7 @@ test_read_different_stripe_size(void)
{
H5Fdelete(SUBF_FILENAME, fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
VRFY((H5Pclose(dxpl_id) >= 0), "DXPL close succeeded");
VRFY((H5Pclose(fapl_id) >= 0), "FAPL close succeeded");
@@ -1395,7 +1395,7 @@ test_subfiling_precreate_rank_0(void)
{
H5Fdelete(SUBF_FILENAME, fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
VRFY((H5Pclose(fapl_id) >= 0), "FAPL close succeeded");
VRFY((H5Pclose(dxpl_id) >= 0), "DXPL close succeeded");
@@ -1533,7 +1533,7 @@ test_subfiling_write_many_read_one(void)
{
H5Fdelete(SUBF_FILENAME, fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
VRFY((H5Pclose(fapl_id) >= 0), "FAPL close succeeded");
}
@@ -1719,7 +1719,7 @@ test_subfiling_write_many_read_few(void)
{
H5Fdelete(SUBF_FILENAME, fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
VRFY((H5Pclose(fapl_id) >= 0), "FAPL close succeeded");
}
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index ea268f3..c617ec3 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -1088,7 +1088,7 @@ done:
if (fapl2_id != H5P_DEFAULT)
H5Pclose(fapl2_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5TOOLS_ENDDEBUG(" - errstat:%d", opts->err_stat);
@@ -1929,7 +1929,7 @@ done:
H5Gclose(grp2_id);
/* enable error reporting */
}
- H5E_END_TRY;
+ H5E_END_TRY
H5TOOLS_ENDDEBUG(": %d - errstat:%d", nfound, opts->err_stat);
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index 3f504eb..825ca06 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -96,7 +96,7 @@ static hbool_t not_comparable;
}
#define PER_UNSIGN(TYPE, A, B) \
- { \
+ do { \
per = -1; \
not_comparable = FALSE; \
both_zero = FALSE; \
@@ -106,7 +106,7 @@ static hbool_t not_comparable;
per = ABS((double)((TYPE)((B) - (A))) / (double)(A)); \
else \
not_comparable = TRUE; \
- }
+ } while (0)
#define PDIFF(a, b) (((b) > (a)) ? ((b) - (a)) : ((a) - (b)))
@@ -684,7 +684,7 @@ diff_datum(void *_mem1, void *_mem2, hsize_t elemtno, diff_opt_t *opts, hid_t co
}
/* enable error reporting */
}
- H5E_END_TRY;
+ H5E_END_TRY
}
break;
@@ -1371,7 +1371,7 @@ diff_region(hid_t obj1_id, hid_t obj2_id, hid_t region1_id, hid_t region2_id, di
npoints1 = H5Sget_select_elem_npoints(region1_id);
npoints2 = H5Sget_select_elem_npoints(region2_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5TOOLS_DEBUG("blocks: 1=%" PRIdHSIZE "-2=%" PRIdHSIZE, nblocks1, nblocks2);
H5TOOLS_DEBUG("points: 1=%" PRIdHSIZE "-2=%" PRIdHSIZE, npoints1, npoints2);
@@ -3117,7 +3117,7 @@ done:
{
H5Pclose(dxpl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (buf)
HDfree(buf);
diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c
index aa64fa5..5019a14 100644
--- a/tools/lib/h5diff_attr.c
+++ b/tools/lib/h5diff_attr.c
@@ -304,7 +304,7 @@ done:
H5Aclose(attr1_id);
H5Aclose(attr2_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5TOOLS_ENDDEBUG(" - errstat:%d", opts->err_stat);
@@ -585,7 +585,7 @@ done:
H5Sclose(space1_id);
H5Sclose(space2_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5TOOLS_ENDDEBUG(" - errstat:%d", opts->err_stat);
@@ -678,7 +678,7 @@ done:
H5Aclose(attr1_id);
H5Aclose(attr2_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
H5TOOLS_ENDDEBUG(" - errstat:%d", opts->err_stat);
return nfound_total;
diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c
index b5c3290..61f4044 100644
--- a/tools/lib/h5diff_dset.c
+++ b/tools/lib/h5diff_dset.c
@@ -95,7 +95,7 @@ done:
H5Dclose(did2);
/* enable error reporting */
}
- H5E_END_TRY;
+ H5E_END_TRY
H5TOOLS_ENDDEBUG(":%d - errstat:%d", nfound, opts->err_stat);
return nfound;
@@ -931,7 +931,7 @@ done:
H5Tclose(m_tid2);
/* enable error reporting */
}
- H5E_END_TRY;
+ H5E_END_TRY
H5TOOLS_ENDDEBUG(": %d with nfound:%d", ret_value, nfound);
return nfound;
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 189aafd..396de54 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -975,7 +975,7 @@ h5tools_fopen(const char *fname, unsigned flags, hid_t fapl_id, hbool_t use_spec
{
fid = H5Fopen(fname, flags, fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
/* If we succeeded in opening the file, we're done. */
@@ -1036,7 +1036,7 @@ h5tools_fopen(const char *fname, unsigned flags, hid_t fapl_id, hbool_t use_spec
{
fid = h5tools_fopen(fname, flags, tmp_fapl_id, TRUE, drivername, drivername_size);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fid >= 0) {
used_fapl_id = tmp_fapl_id;
diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c
index 57a1712..d444c8c 100644
--- a/tools/lib/h5tools_dump.c
+++ b/tools/lib/h5tools_dump.c
@@ -3493,8 +3493,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
(hsize_t)0, (hsize_t)0);
break;
case H5Z_FILTER_SZIP:
- szip_options_mask = cd_values[0];
- ;
+ szip_options_mask = cd_values[0];
szip_pixels_per_block = cd_values[1];
h5tools_str_append(&buffer, "%s %s", SZIP, BEGIN);
@@ -3947,7 +3946,7 @@ h5tools_print_packed_bits(h5tools_str_t *buffer, hid_t type)
error_msg("Packed Bit offset+length value(%u) too large. Max is %d\n",
packed_data_offset + packed_data_length, packed_bits_size);
packed_data_mask = 0;
- };
+ }
h5tools_str_append(buffer, "%s %s=%u %s=%u", PACKED_BITS, PACKED_OFFSET, packed_data_offset,
PACKED_LENGTH, packed_data_length);
}
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index 223eb61..dff9aa0 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -459,7 +459,7 @@ h5tools_str_dump_space_blocks(h5tools_str_t *str, hid_t rspace, const h5tool_for
{
snblocks = H5Sget_select_hyper_nblocks(rspace);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Print block information */
if (snblocks > 0) {
@@ -520,7 +520,7 @@ h5tools_str_dump_space_points(h5tools_str_t *str, hid_t rspace, const h5tool_for
{
snpoints = H5Sget_select_elem_npoints(rspace);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* Print point information */
if (snpoints > 0) {
diff --git a/tools/lib/h5trav.c b/tools/lib/h5trav.c
index 564dcba..b55d1f5 100644
--- a/tools/lib/h5trav.c
+++ b/tools/lib/h5trav.c
@@ -119,7 +119,6 @@ trav_token_add(trav_addr_t *visited, H5O_token_t *token, const char *path)
/* Allocate space if necessary */
if (visited->nused == visited->nalloc) {
visited->nalloc = MAX(1, visited->nalloc * 2);
- ;
visited->objs =
(trav_addr_path_t *)HDrealloc(visited->objs, visited->nalloc * sizeof(trav_addr_path_t));
} /* end if */
@@ -322,8 +321,7 @@ trav_info_add(trav_info_t *info, const char *path, h5trav_type_t obj_type)
/* Allocate space if necessary */
if (info->nused == info->nalloc) {
info->nalloc = MAX(1, info->nalloc * 2);
- ;
- info->paths = (trav_path_t *)HDrealloc(info->paths, info->nalloc * sizeof(trav_path_t));
+ info->paths = (trav_path_t *)HDrealloc(info->paths, info->nalloc * sizeof(trav_path_t));
} /* end if */
/* Append it */
diff --git a/tools/src/h5copy/h5copy.c b/tools/src/h5copy/h5copy.c
index 9756d11..72cd88e 100644
--- a/tools/src/h5copy/h5copy.c
+++ b/tools/src/h5copy/h5copy.c
@@ -488,7 +488,7 @@ done:
H5Fclose(fid_src);
H5Fclose(fid_dst);
}
- H5E_END_TRY;
+ H5E_END_TRY
leave(ret_value);
}
diff --git a/tools/src/h5diff/ph5diff_main.c b/tools/src/h5diff/ph5diff_main.c
index 64b1f28..f65d2b0 100644
--- a/tools/src/h5diff/ph5diff_main.c
+++ b/tools/src/h5diff/ph5diff_main.c
@@ -150,7 +150,7 @@ ph5diff_worker(int nID)
}
/* enable error reporting */
}
- H5E_END_TRY;
+ H5E_END_TRY
}
/* Check for work */
else if (Status.MPI_TAG == MPI_TAG_ARGS) {
diff --git a/tools/src/h5dump/h5dump_ddl.c b/tools/src/h5dump/h5dump_ddl.c
index 3eaa2f9..9d59c95 100644
--- a/tools/src/h5dump/h5dump_ddl.c
+++ b/tools/src/h5dump/h5dump_ddl.c
@@ -1649,7 +1649,7 @@ error:
H5Oclose(oid);
H5Aclose(attr_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
dump_indent -= COL;
}
diff --git a/tools/src/h5dump/h5dump_xml.c b/tools/src/h5dump/h5dump_xml.c
index d0bc7e4..80f9142 100644
--- a/tools/src/h5dump/h5dump_xml.c
+++ b/tools/src/h5dump/h5dump_xml.c
@@ -3079,7 +3079,7 @@ error:
H5Tclose(type);
H5Sclose(space);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
}
@@ -3249,7 +3249,7 @@ error:
H5Tclose(type);
H5Sclose(space);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
}
diff --git a/tools/src/h5format_convert/h5format_convert.c b/tools/src/h5format_convert/h5format_convert.c
index 200f735..82f91e7 100644
--- a/tools/src/h5format_convert/h5format_convert.c
+++ b/tools/src/h5format_convert/h5format_convert.c
@@ -162,7 +162,6 @@ parse_command_line(int argc, const char *const *argv)
error:
return -1;
- ;
} /* parse_command_line() */
/*-------------------------------------------------------------------------
@@ -334,7 +333,7 @@ error:
H5Pclose(dcpl);
H5Dclose(did);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* convert() */
diff --git a/tools/src/h5import/h5import.c b/tools/src/h5import/h5import.c
index 5a2fae3..428d32f 100644
--- a/tools/src/h5import/h5import.c
+++ b/tools/src/h5import/h5import.c
@@ -1021,7 +1021,7 @@ processStrData(FILE *strm, struct Input *in, hid_t file_id)
/*enable error reporting */
}
- H5E_END_TRY;
+ H5E_END_TRY
if ((space_id = H5Screate_simple(1, dims, NULL)) < 0)
goto out;
@@ -1147,7 +1147,7 @@ processStrHDFData(FILE *strm, struct Input *in, hid_t file_id)
/*enable error reporting */
}
- H5E_END_TRY;
+ H5E_END_TRY
#ifdef H5DEBUGIMPORT
HDprintf("processStrHDFData DATATYPE STRING groups created\n");
#endif
@@ -1249,7 +1249,7 @@ out:
H5Sclose(mspace_id);
H5Tclose(type_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return (-1);
}
@@ -4629,7 +4629,7 @@ process(struct Options *opt)
}
}
}
- H5E_END_TRY;
+ H5E_END_TRY
for (k = 0; k < opt->fcount; k++) {
in = &(opt->infiles[k].in);
@@ -4677,7 +4677,7 @@ process(struct Options *opt)
/*enable error reporting */
}
- H5E_END_TRY;
+ H5E_END_TRY
/*create data type */
intype = createInputDataType(in);
@@ -4733,7 +4733,7 @@ process(struct Options *opt)
/*enable error reporting */
}
- H5E_END_TRY;
+ H5E_END_TRY
/* write dataset */
if (H5Dwrite(dataset, intype, H5S_ALL, H5S_ALL, H5P_DEFAULT, (VOIDP)in->data) < 0) {
diff --git a/tools/src/h5jam/h5unjam.c b/tools/src/h5jam/h5unjam.c
index d130b38..1c8c24a 100644
--- a/tools/src/h5jam/h5unjam.c
+++ b/tools/src/h5jam/h5unjam.c
@@ -109,7 +109,6 @@ parse_command_line(int argc, const char *const *argv)
if (input_file)
h5tools_set_input_file(input_file, 1);
break;
- ;
case 'u':
ub_file = HDstrdup(H5_optarg);
diff --git a/tools/src/h5repack/h5repack.c b/tools/src/h5repack/h5repack.c
index c58943b..0bb0082 100644
--- a/tools/src/h5repack/h5repack.c
+++ b/tools/src/h5repack/h5repack.c
@@ -575,7 +575,7 @@ done:
H5Tclose(ftype_id);
H5Aclose(attr_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return ret_value;
} /* end copy_attr() */
@@ -884,7 +884,7 @@ done:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (travt)
trav_table_free(travt);
return ret_value;
diff --git a/tools/src/h5repack/h5repack_copy.c b/tools/src/h5repack/h5repack_copy.c
index 42c393b..5275481 100644
--- a/tools/src/h5repack/h5repack_copy.c
+++ b/tools/src/h5repack/h5repack_copy.c
@@ -390,7 +390,7 @@ done:
H5Fclose(fidout);
H5Fclose(fidin);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
if (travt)
trav_table_free(travt);
@@ -1455,7 +1455,7 @@ done:
{
named_datatype_free(&named_dt_head, 1);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
/* free link info path */
@@ -1480,7 +1480,7 @@ done:
H5Tclose(type_in);
H5Tclose(type_out);
}
- H5E_END_TRY;
+ H5E_END_TRY
/* free */
if (buf != NULL)
diff --git a/tools/src/h5repack/h5repack_parse.c b/tools/src/h5repack/h5repack_parse.c
index 9ffee0a..cee85ac 100644
--- a/tools/src/h5repack/h5repack_parse.c
+++ b/tools/src/h5repack/h5repack_parse.c
@@ -457,7 +457,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
break;
default:
break;
- };
+ }
return obj_list;
}
diff --git a/tools/src/h5repack/h5repack_refs.c b/tools/src/h5repack/h5repack_refs.c
index 3c0be30..6bc4a31 100644
--- a/tools/src/h5repack/h5repack_refs.c
+++ b/tools/src/h5repack/h5repack_refs.c
@@ -172,7 +172,7 @@ do_copy_refobjs(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
H5Rdereference2(dset_in, H5P_DEFAULT, H5R_OBJECT, &buf[u])) < 0)
continue;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* get the name. a valid name could only occur
* in the second traversal of the file
@@ -260,7 +260,7 @@ do_copy_refobjs(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
&buf[u])) < 0)
continue;
}
- H5E_END_TRY;
+ H5E_END_TRY
/* get the name. a valid name could only occur
* in the second traversal of the file
@@ -408,7 +408,7 @@ done:
H5Tclose(type_in);
named_datatype_free(&named_dt_head, 1);
}
- H5E_END_TRY;
+ H5E_END_TRY
return ret_value;
}
@@ -795,7 +795,7 @@ done:
H5Aclose(attr_id);
H5Aclose(attr_out);
}
- H5E_END_TRY;
+ H5E_END_TRY
return ret_value;
}
@@ -876,7 +876,7 @@ done:
H5Sclose(space_id);
H5Oclose(ref_obj_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return ret_value;
}
diff --git a/tools/src/h5repack/h5repack_verify.c b/tools/src/h5repack/h5repack_verify.c
index bccf034..572aa48 100644
--- a/tools/src/h5repack/h5repack_verify.c
+++ b/tools/src/h5repack/h5repack_verify.c
@@ -286,7 +286,7 @@ done:
if (travt)
trav_table_free(travt);
}
- H5E_END_TRY;
+ H5E_END_TRY
return ret_value;
} /* h5repack_verify() */
@@ -475,7 +475,7 @@ done:
if (trav)
trav_table_free(trav);
}
- H5E_END_TRY;
+ H5E_END_TRY
return ret_value;
}
diff --git a/tools/src/misc/h5delete.c b/tools/src/misc/h5delete.c
index ef5b25f..f83b379 100644
--- a/tools/src/misc/h5delete.c
+++ b/tools/src/misc/h5delete.c
@@ -57,7 +57,7 @@ main(int argc, char *argv[])
/* Only uses the environment variable at this time */
ret = (int)H5Fdelete(name, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (ret < 0 && !quiet)
HDfprintf(stderr, "Unable to delete storage at: %s\n", name);
diff --git a/tools/src/misc/h5repart.c b/tools/src/misc/h5repart.c
index c01ec0f..e0201f9 100644
--- a/tools/src/misc/h5repart.c
+++ b/tools/src/misc/h5repart.c
@@ -483,7 +483,7 @@ main(int argc, char *argv[])
{
file = H5Fopen(dst_gen_name, H5F_ACC_RDWR, fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (file >= 0) {
if (H5Fclose(file) < 0) {
diff --git a/tools/test/h5diff/h5diffgentest.c b/tools/test/h5diff/h5diffgentest.c
index c59d3b5..bd1a50f 100644
--- a/tools/test/h5diff/h5diffgentest.c
+++ b/tools/test/h5diff/h5diffgentest.c
@@ -542,7 +542,7 @@ error:
H5Sclose(space);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* test_onion_1d_dset */
@@ -976,7 +976,7 @@ error:
H5Pclose(fapl_id);
H5Pclose(onion_info.backing_fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* test_onion_dset_extension */
@@ -5688,7 +5688,7 @@ error:
H5Tclose(tid1);
H5Tclose(tid2);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
static hid_t
@@ -8681,7 +8681,7 @@ out:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -8735,7 +8735,7 @@ error:
H5Fclose(fid1);
H5Fclose(fid2);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
/*-------------------------------------------------------------------------
@@ -8819,7 +8819,7 @@ error:
H5Dclose(did);
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* end write_dset() */
diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index 1fd512c..ba4f0a4 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -2677,7 +2677,7 @@ error:
H5Sclose(space);
H5Dclose(dset);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
static void
@@ -5396,7 +5396,7 @@ out:
{
H5Dclose(dsid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -6567,7 +6567,7 @@ out:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
/*-------------------------------------------------------------------------
@@ -6752,7 +6752,7 @@ out:
H5Pclose(fcpl_id);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
/*-------------------------------------------------------------------------
@@ -7011,7 +7011,7 @@ out:
H5Pclose(tcpl_id);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
/*-------------------------------------------------------------------------
@@ -11349,7 +11349,7 @@ error:
H5Sclose(sid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
} /* gen_err_attr_dspace() */
/* Structure to collect the onion filepaths in one place. */
@@ -11575,7 +11575,7 @@ error:
H5Sclose(space);
H5Fclose(file_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* gent_onion_1d_dset */
@@ -12012,7 +12012,7 @@ error:
H5Pclose(fapl_id);
H5Pclose(onion_info.backing_fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* gent_onion_dset_extension */
diff --git a/tools/test/h5format_convert/h5fc_gentest.c b/tools/test/h5format_convert/h5fc_gentest.c
index 26ee4ca..e0402b5 100644
--- a/tools/test/h5format_convert/h5fc_gentest.c
+++ b/tools/test/h5format_convert/h5fc_gentest.c
@@ -293,7 +293,7 @@ error:
H5Fclose(fcpl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
} /* gen_non() */
@@ -373,7 +373,7 @@ error:
H5Fclose(fid);
H5Pclose(fapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
} /* gen_edge() */
@@ -518,7 +518,7 @@ error:
H5Pclose(fapl);
H5Pclose(fcpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
} /* gen_err_level() */
@@ -774,7 +774,7 @@ error:
H5Pclose(fapl);
H5Pclose(fcpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
} /* end gen_ext() */
diff --git a/tools/test/h5jam/h5jamgentest.c b/tools/test/h5jam/h5jamgentest.c
index bfeb92d..1376e78 100644
--- a/tools/test/h5jam/h5jamgentest.c
+++ b/tools/test/h5jam/h5jamgentest.c
@@ -353,7 +353,7 @@ error:
H5Sclose(space);
H5Pclose(create_plist);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
}
diff --git a/tools/test/h5repack/h5repacktst.c b/tools/test/h5repack/h5repacktst.c
index d8a4732..fc0fe54 100644
--- a/tools/test/h5repack/h5repacktst.c
+++ b/tools/test/h5repack/h5repacktst.c
@@ -2303,7 +2303,7 @@ out:
H5Tclose(tid);
H5Pclose(gcplid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -2373,7 +2373,7 @@ out:
H5Gclose(rid);
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -2441,7 +2441,7 @@ out:
H5Gclose(g2id);
H5Gclose(g3id);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -2515,7 +2515,7 @@ error:
H5Pclose(dcpl);
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(buf);
@@ -2600,7 +2600,7 @@ error:
H5Pclose(dcpl);
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(buf);
@@ -2670,7 +2670,7 @@ error:
H5Pclose(dcpl);
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(buf);
@@ -2743,7 +2743,7 @@ error:
H5Pclose(dcpl);
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(buf);
@@ -2851,7 +2851,7 @@ error:
H5Sclose(sid);
H5Dclose(dsid);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(buf);
@@ -2953,7 +2953,7 @@ error:
H5Pclose(dcpl);
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(buf);
@@ -3137,7 +3137,7 @@ error:
H5Pclose(dcpl);
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(buf);
@@ -3235,7 +3235,7 @@ out:
H5Dclose(did);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -3331,7 +3331,7 @@ error:
H5Pclose(dcpl);
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(buf);
@@ -3404,7 +3404,7 @@ error:
H5Sclose(s_sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(s_buf);
@@ -3547,7 +3547,7 @@ error:
H5Pclose(dcpl2);
H5Pclose(dcpl3);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(buf1);
HDfree(buf2);
@@ -3604,7 +3604,7 @@ out:
H5Sclose(sid);
H5Dclose(did);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -3686,7 +3686,7 @@ out:
H5Sclose(m_sid);
H5Dclose(did);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -3740,7 +3740,7 @@ out:
H5Sclose(sid);
H5Dclose(did);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -3800,7 +3800,7 @@ out:
H5Pclose(fcpl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fd >= 0)
HDclose(fd);
@@ -3870,7 +3870,7 @@ out:
H5Pclose(fcpl);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fd >= 0)
HDclose(fd);
@@ -4640,7 +4640,7 @@ out:
H5Dclose(did);
H5Tclose(tid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -4749,7 +4749,7 @@ out:
H5Dclose(did1);
H5Dclose(did2);
}
- H5E_END_TRY;
+ H5E_END_TRY
return retval;
}
@@ -5888,7 +5888,7 @@ out:
H5Sclose(sid);
H5Tclose(tid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -5941,7 +5941,7 @@ out:
{
H5Dclose(did);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -6003,7 +6003,7 @@ out:
H5Dclose(did);
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -6044,7 +6044,7 @@ out:
H5Aclose(aid);
H5Sclose(sid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
}
@@ -6170,7 +6170,7 @@ out:
H5Dclose(did);
H5Gclose(gid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return -1;
} /* end make_named_dtype() */
diff --git a/tools/test/h5stat/h5stat_gentest.c b/tools/test/h5stat/h5stat_gentest.c
index a8aefba..47c06ad 100644
--- a/tools/test/h5stat/h5stat_gentest.c
+++ b/tools/test/h5stat/h5stat_gentest.c
@@ -143,7 +143,7 @@ error:
H5Gclose(gid);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
} /* gen_newgrat_file() */
@@ -348,7 +348,7 @@ error:
H5Sclose(sid4);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
@@ -453,7 +453,7 @@ error:
H5Dclose(did2);
#endif
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
@@ -575,7 +575,7 @@ error:
H5Aclose(aid2);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
if (fd >= 0)
HDclose(fd);
diff --git a/tools/test/misc/h5clear_gentest.c b/tools/test/misc/h5clear_gentest.c
index 666a3f7..3ea6788 100644
--- a/tools/test/misc/h5clear_gentest.c
+++ b/tools/test/misc/h5clear_gentest.c
@@ -138,7 +138,7 @@ error:
H5Pclose(fapl);
H5Pclose(dcpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(buf);
@@ -313,7 +313,7 @@ error:
H5Fclose(fid);
H5Pclose(fcpl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
} /* gen_enhance_files() */
diff --git a/tools/test/misc/repart_test.c b/tools/test/misc/repart_test.c
index 5c3ebf2..ac05aab 100644
--- a/tools/test/misc/repart_test.c
+++ b/tools/test/misc/repart_test.c
@@ -77,7 +77,7 @@ error:
H5Pclose(fapl_id);
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
@@ -116,7 +116,7 @@ error:
{
H5Fclose(fid);
}
- H5E_END_TRY;
+ H5E_END_TRY
return FAIL;
diff --git a/tools/test/misc/talign.c b/tools/test/misc/talign.c
index 7764e34..4c145ba 100644
--- a/tools/test/misc/talign.c
+++ b/tools/test/misc/talign.c
@@ -66,7 +66,7 @@ main(void)
{
(void)H5Ldelete(fil, setname, H5P_DEFAULT);
}
- H5E_END_TRY;
+ H5E_END_TRY
cs6 = H5Tcopy(H5T_C_S1);
H5Tset_size(cs6, sizeof(string5));
diff --git a/tools/test/perform/chunk_cache.c b/tools/test/perform/chunk_cache.c
index 9f6554d..7daeb68 100644
--- a/tools/test/perform/chunk_cache.c
+++ b/tools/test/perform/chunk_cache.c
@@ -144,7 +144,7 @@ error:
H5Pclose(dcpl);
H5Sclose(dataspace);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(data);
return 1;
@@ -209,7 +209,7 @@ error:
H5Pclose(dcpl);
H5Sclose(dataspace);
}
- H5E_END_TRY;
+ H5E_END_TRY
HDfree(data);
return 1;
@@ -286,7 +286,7 @@ error:
H5Sclose(memspace);
H5Pclose(dapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -365,7 +365,7 @@ error:
H5Sclose(memspace);
H5Pclose(dapl);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
diff --git a/tools/test/perform/direct_write_perf.c b/tools/test/perform/direct_write_perf.c
index 0d94cf5..016c9b7 100644
--- a/tools/test/perform/direct_write_perf.c
+++ b/tools/test/perform/direct_write_perf.c
@@ -272,7 +272,7 @@ error:
H5Pclose(cparms);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -338,7 +338,7 @@ error:
H5Pclose(dxpl);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -403,7 +403,7 @@ error:
H5Pclose(dxpl);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -495,7 +495,7 @@ error:
H5Pclose(dxpl);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
@@ -587,7 +587,7 @@ error:
H5Pclose(dxpl);
H5Fclose(file);
}
- H5E_END_TRY;
+ H5E_END_TRY
return 1;
}
diff --git a/utils/mirror_vfd/mirror_writer.c b/utils/mirror_vfd/mirror_writer.c
index 2752121..5bf79f4 100644
--- a/utils/mirror_vfd/mirror_writer.c
+++ b/utils/mirror_vfd/mirror_writer.c
@@ -562,7 +562,7 @@ error:
{
(void)H5Pclose(fapl_id);
}
- H5E_END_TRY;
+ H5E_END_TRY
}
return -1;
} /* end do_open() */