diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 1998-03-12 21:04:53 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 1998-03-12 21:04:53 (GMT) |
| commit | e4d89c2cd635e38c379a93a569dce473d66e69f4 (patch) | |
| tree | 73173c110fe74a679cd3a63060831fd42536986d /test | |
| parent | 4e295e1fdaeb1e73ed505482013b000bb62269be (diff) | |
| download | hdf5-e4d89c2cd635e38c379a93a569dce473d66e69f4.zip hdf5-e4d89c2cd635e38c379a93a569dce473d66e69f4.tar.gz hdf5-e4d89c2cd635e38c379a93a569dce473d66e69f4.tar.bz2 | |
[svn-r319] Removed H5M API from code
Diffstat (limited to 'test')
| -rw-r--r-- | test/tfile.c | 33 | ||||
| -rw-r--r-- | test/th5s.c | 10 |
2 files changed, 21 insertions, 22 deletions
diff --git a/test/tfile.c b/test/tfile.c index ffb399e..7afc184 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -29,7 +29,6 @@ static char RcsId[] = "$Revision$"; #include <H5private.h> #include <H5Bprivate.h> #include <H5Pprivate.h> -#include <H5Mprivate.h> #define F1_USERBLOCK_SIZE 0 #define F1_OFFSET_SIZE sizeof(size_t) @@ -98,13 +97,13 @@ test_file_create(void) VERIFY(iparm2, F1_SYM_LEAF_K, "H5Pget_sym_k"); /* Release file-creation template */ - ret = H5Mclose(tmpl1); - CHECK(ret, FAIL, "H5Mrelease"); + ret = H5Pclose(tmpl1); + CHECK(ret, FAIL, "H5Pclose"); #ifdef LATER /* Double-check that the atom has been vaporized */ - ret = H5Mclose(tmpl1); - VERIFY(ret, FAIL, "H5Mrelease"); + ret = H5Pclose(tmpl1); + VERIFY(ret, FAIL, "H5Pclose"); #endif /* Create a new file with a non-standard file-creation template */ @@ -129,8 +128,8 @@ test_file_create(void) CHECK(fid2, FAIL, "H5Fcreate"); /* Release file-creation template */ - ret = H5Mclose(tmpl1); - CHECK(ret, FAIL, "H5Mrelease"); + ret = H5Pclose(tmpl1); + CHECK(ret, FAIL, "H5Pclose"); /* Get the file-creation template */ tmpl1 = H5Fget_create_template(fid2); @@ -152,12 +151,12 @@ test_file_create(void) VERIFY(iparm2, F2_SYM_LEAF_K, "H5Pget_sym_k"); /* Clone the file-creation template */ - tmpl2 = H5Mcopy(tmpl1); - CHECK(tmpl2, FAIL, "H5Mcopy"); + tmpl2 = H5Pcopy(tmpl1); + CHECK(tmpl2, FAIL, "H5Pcopy"); /* Release file-creation template */ - ret = H5Mclose(tmpl1); - CHECK(ret, FAIL, "H5Mrelease"); + ret = H5Pclose(tmpl1); + CHECK(ret, FAIL, "H5Pclose"); /* Set the new file-creation parameter */ ret = H5Pset_userblock(tmpl2, F3_USERBLOCK_SIZE); @@ -171,8 +170,8 @@ test_file_create(void) CHECK(fid3, FAIL, "H5Fcreate"); /* Release file-creation template */ - ret = H5Mclose(tmpl2); - CHECK(ret, FAIL, "H5Mrelease"); + ret = H5Pclose(tmpl2); + CHECK(ret, FAIL, "H5Pclose"); /* Get the file-creation template */ tmpl1 = H5Fget_create_template(fid3); @@ -194,8 +193,8 @@ test_file_create(void) VERIFY(iparm2, F3_SYM_LEAF_K, "H5Pget_sym_k"); /* Release file-creation template */ - ret = H5Mclose(tmpl1); - CHECK(ret, FAIL, "H5Mrelease"); + ret = H5Pclose(tmpl1); + CHECK(ret, FAIL, "H5Pclose"); /* Close first file */ ret = H5Fclose(fid1); @@ -252,8 +251,8 @@ test_file_open(void) VERIFY(iparm2, F2_SYM_LEAF_K, "H5Pget_sym_k"); /* Release file-creation template */ - ret = H5Mclose(tmpl1); - CHECK(ret, FAIL, "H5Mrelease"); + ret = H5Pclose(tmpl1); + CHECK(ret, FAIL, "H5Pclose"); /* Close first file */ ret = H5Fclose(fid1); diff --git a/test/th5s.c b/test/th5s.c index aca8df0..4431fef 100644 --- a/test/th5s.c +++ b/test/th5s.c @@ -28,8 +28,8 @@ static char RcsId[] = "$Revision$"; #include <H5private.h> #include <H5Bprivate.h> -#include <H5Mprivate.h> #include <H5Sprivate.h> +#include <H5Pprivate.h> #define FILE "th5p1.h5" @@ -103,11 +103,11 @@ test_h5p_basic(void) CHECK(ret, FAIL, "H5Sget_ldims"); VERIFY(HDmemcmp(tdims, dims2, SPACE2_RANK * sizeof(uint32)), 0, "H5Sget_ldims"); - ret = H5Mclose(sid1); - CHECK(ret, FAIL, "H5Mrelease"); + ret = H5Sclose(sid1); + CHECK(ret, FAIL, "H5Sclose"); - ret = H5Mclose(sid2); - CHECK(ret, FAIL, "H5Mrelease"); + ret = H5Sclose(sid2); + CHECK(ret, FAIL, "H5Sclose"); /* Close first file */ ret = H5Fclose(fid1); |