summaryrefslogtreecommitdiffstats
path: root/tools/test
diff options
context:
space:
mode:
Diffstat (limited to 'tools/test')
-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
11 files changed, 63 insertions, 63 deletions
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;
}