summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2004-08-05 05:01:50 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2004-08-05 05:01:50 (GMT)
commita5bd3e42ea0913d6b652c26f82bd688ed6741cd1 (patch)
treecd9fb4d9a39bdcf2ac47ef02ada62d8544bace80
parent7de13f9663045620afbd2cb42db9851a0636468f (diff)
downloadhdf5-a5bd3e42ea0913d6b652c26f82bd688ed6741cd1.zip
hdf5-a5bd3e42ea0913d6b652c26f82bd688ed6741cd1.tar.gz
hdf5-a5bd3e42ea0913d6b652c26f82bd688ed6741cd1.tar.bz2
[svn-r9016] Purpose:
Code cleanup Description: Clean up ifdef's and close leaked ID. Platforms tested: FreeBSD 4.10 (sleipnir) Too minor to require h5committest
-rw-r--r--test/tmisc.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/test/tmisc.c b/test/tmisc.c
index 00ba268..6952fa7 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -347,7 +347,7 @@ static hid_t misc2_create_type(void)
CHECK(type, FAIL, "H5Tcreate");
ret = H5Tinsert (type, "string", offsetof(misc2_struct, string), type_tmp);
-
+ CHECK(ret, FAIL, "H5Tinsert");
ret = H5Tclose(type_tmp);
CHECK(ret, FAIL, "H5Tclose");
@@ -3499,8 +3499,7 @@ test_misc20(void)
and encoder is available.
EIP 2004/8/04
*/
-#ifdef H5_HAVE_FILTER_SZIP
-#ifdef H5_SZIP_CAN_ENCODE
+#if defined H5_HAVE_FILTER_SZIP && defined H5_SZIP_CAN_ENCODE
/****************************************************************
**
** test_misc21(): Test that late allocation time is treated the same
@@ -3683,6 +3682,9 @@ test_misc22(void)
VERIFY(cd_values[2], correct, "SZIP filter returned value for precision");
+ ret = H5Dclose (dsid);
+ CHECK(ret, FAIL, "H5Dclose");
+
ret = H5Gunlink (fid, MISC22_DSET_NAME );
CHECK(ret, FAIL, "H5Dunlink");
@@ -3706,8 +3708,7 @@ test_misc22(void)
HDfree(buf);
} /* end test_misc22() */
-#endif /* H5_SZIP_CAN_ENCODE */
-#endif /* H5_HAVE_FILTER_SZIP */
+#endif /* H5_SZIP_CAN_ENCODE & H5_HAVE_FILTER_SZIP */
/****************************************************************
**
@@ -3740,12 +3741,10 @@ test_misc(void)
test_misc18(); /* Test new object header information in H5G_stat_t struct */
test_misc19(); /* Test incrementing & decrementing ref count on IDs */
test_misc20(); /* Test problems with truncated dimensions in version 2 of storage layout message */
-#ifdef H5_HAVE_FILTER_SZIP
-#ifdef H5_SZIP_CAN_ENCODE
+#if defined H5_HAVE_FILTER_SZIP & defined H5_SZIP_CAN_ENCODE
test_misc21(); /* Test that "late" allocation time is treated the same as "incremental", for chunked datasets w/a filters */
test_misc22(); /* check szip bits per pixel */
-#endif /* H5_SZIP_CAN_ENCODE */
-#endif /* H5_HAVE_FILTER_SZIP */
+#endif /* H5_SZIP_CAN_ENCODE & H5_HAVE_FILTER_SZIP */
} /* test_misc() */
@@ -3790,6 +3789,8 @@ cleanup_misc(void)
HDremove(MISC18_FILE);
HDremove(MISC19_FILE);
HDremove(MISC20_FILE);
+#if defined H5_HAVE_FILTER_SZIP & defined H5_SZIP_CAN_ENCODE
HDremove(MISC21_FILE);
HDremove(MISC22_FILE);
+#endif /* H5_SZIP_CAN_ENCODE & H5_HAVE_FILTER_SZIP */
}