summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlrknox <lrknox>2017-10-26 21:45:25 (GMT)
committerlrknox <lrknox>2017-10-26 21:45:25 (GMT)
commit6a52c26162f45e85b88aa6ddab5e5d861aaba7b8 (patch)
tree12d3e8b8c0a29d9eb5ac92fdc0fd03f0248f88de
parentb752960f56845f737d0e54cf257474d924fd2f0c (diff)
downloadhdf5-6a52c26162f45e85b88aa6ddab5e5d861aaba7b8.zip
hdf5-6a52c26162f45e85b88aa6ddab5e5d861aaba7b8.tar.gz
hdf5-6a52c26162f45e85b88aa6ddab5e5d861aaba7b8.tar.bz2
Revert "Fix for HDFFFV-10308. Initialize hid_ts in function check_objects and"
This reverts commit e92f3f858bf16a84c59aeb6692f5cab5e6b8e66f.
-rw-r--r--tools/src/h5repack/h5repack.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/tools/src/h5repack/h5repack.c b/tools/src/h5repack/h5repack.c
index 22ca279..14b9461 100644
--- a/tools/src/h5repack/h5repack.c
+++ b/tools/src/h5repack/h5repack.c
@@ -707,9 +707,9 @@ done:
*/
static int check_objects(const char* fname, pack_opt_t *options) {
int ret_value = 0; /*no need to LEAVE() on ERROR: HERR_INIT(int, SUCCEED) */
- hid_t fid = -1;
- hid_t did = -1;
- hid_t sid = -1;
+ hid_t fid;
+ hid_t did;
+ hid_t sid;
unsigned int i;
unsigned int uf;
trav_table_t *travt = NULL;
@@ -810,12 +810,9 @@ static int check_objects(const char* fname, pack_opt_t *options) {
done:
H5E_BEGIN_TRY {
- if (sid > -1)
- H5Sclose(sid);
- if (did > -1)
- H5Dclose(did);
- if (fid > -1)
- H5Fclose(fid);
+ H5Sclose(sid);
+ H5Dclose(did);
+ H5Fclose(fid);
} H5E_END_TRY;
if (travt)
trav_table_free(travt);