diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/.distdep | 189 | ||||
| -rw-r--r-- | test/dsets.c | 2 | ||||
| -rw-r--r-- | test/links.c | 18 | ||||
| -rw-r--r-- | test/mtime.c | 10 | ||||
| -rw-r--r-- | test/tattr.c | 76 | ||||
| -rw-r--r-- | test/testhdf5.c | 2 | ||||
| -rw-r--r-- | test/th5s.c | 106 | ||||
| -rw-r--r-- | test/tselect.c | 12 |
8 files changed, 210 insertions, 205 deletions
diff --git a/test/.distdep b/test/.distdep index b5d511d..c2dccae 100644 --- a/test/.distdep +++ b/test/.distdep @@ -178,8 +178,8 @@ th5s.o: \ ../src/H5Tpublic.h \ ../src/H5Zprivate.h \ ../src/H5Zpublic.h -external.o: \ - external.c \ +dtypes.o: \ + dtypes.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -198,10 +198,51 @@ external.o: \ ../src/H5Opublic.h \ ../src/H5Ppublic.h \ ../src/H5Zpublic.h \ + ../src/H5Rpublic.h \ ../src/H5Spublic.h \ - ../src/H5Tpublic.h -shtype.o: \ - shtype.c \ + ../src/H5Tpublic.h \ + ../src/H5Tpkg.h \ + ../src/H5HGprivate.h \ + ../src/H5Fprivate.h \ + ../src/H5private.h \ + ../src/H5Tprivate.h +hyperslab.o: \ + hyperslab.c \ + ../src/H5private.h \ + ../src/H5public.h \ + ../src/H5config.h \ + ../src/H5MMprivate.h \ + ../src/H5MMpublic.h +istore.o: \ + istore.c \ + ../src/H5private.h \ + ../src/H5public.h \ + ../src/H5config.h \ + ../src/H5Iprivate.h \ + ../src/H5Ipublic.h \ + ../src/H5Pprivate.h \ + ../src/H5Ppublic.h \ + ../src/H5Dpublic.h \ + ../src/H5Fpublic.h \ + ../src/H5Zpublic.h \ + ../src/H5Fprivate.h \ + ../src/H5Gprivate.h \ + ../src/H5Gpublic.h \ + ../src/H5Bprivate.h \ + ../src/H5Bpublic.h \ + ../src/H5MMprivate.h \ + ../src/H5MMpublic.h \ + ../src/H5Oprivate.h \ + ../src/H5Opublic.h \ + ../src/H5HGprivate.h \ + ../src/H5HGpublic.h \ + ../src/H5Tprivate.h \ + ../src/H5Tpublic.h \ + ../src/H5Sprivate.h \ + ../src/H5Spublic.h \ + ../src/H5Zprivate.h +dsets.o: \ + dsets.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -220,9 +261,11 @@ shtype.o: \ ../src/H5Opublic.h \ ../src/H5Ppublic.h \ ../src/H5Zpublic.h \ - ../src/H5Spublic.h -big.o: \ - big.c \ + ../src/H5Rpublic.h \ + ../src/H5Spublic.h \ + ../src/H5Tpublic.h +cmpd_dset.o: \ + cmpd_dset.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -241,11 +284,11 @@ big.o: \ ../src/H5Opublic.h \ ../src/H5Ppublic.h \ ../src/H5Zpublic.h \ + ../src/H5Rpublic.h \ ../src/H5Spublic.h \ - ../src/H5Tpublic.h \ - ../src/H5private.h -chunk.o: \ - chunk.c \ + ../src/H5Tpublic.h +extend.o: \ + extend.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -264,10 +307,9 @@ chunk.o: \ ../src/H5Opublic.h \ ../src/H5Ppublic.h \ ../src/H5Zpublic.h \ - ../src/H5Spublic.h \ - ../src/H5Tpublic.h -iopipe.o: \ - iopipe.c \ + ../src/H5Rpublic.h +external.o: \ + external.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -286,17 +328,11 @@ iopipe.o: \ ../src/H5Opublic.h \ ../src/H5Ppublic.h \ ../src/H5Zpublic.h \ + ../src/H5Rpublic.h \ ../src/H5Spublic.h \ ../src/H5Tpublic.h -hyperslab.o: \ - hyperslab.c \ - ../src/H5private.h \ - ../src/H5public.h \ - ../src/H5config.h \ - ../src/H5MMprivate.h \ - ../src/H5MMpublic.h -extend.o: \ - extend.c \ +iopipe.o: \ + iopipe.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -315,9 +351,30 @@ extend.o: \ ../src/H5Opublic.h \ ../src/H5Ppublic.h \ ../src/H5Zpublic.h \ - ../src/H5Spublic.h -links.o: \ - links.c \ + ../src/H5Rpublic.h \ + ../src/H5Spublic.h \ + ../src/H5Tpublic.h +gheap.o: \ + gheap.c \ + ../src/H5private.h \ + ../src/H5public.h \ + ../src/H5config.h \ + ../src/H5Eprivate.h \ + ../src/H5Epublic.h \ + ../src/H5Ipublic.h \ + ../src/H5Fprivate.h \ + ../src/H5Fpublic.h \ + ../src/H5Dpublic.h \ + ../src/H5Gprivate.h \ + ../src/H5Gpublic.h \ + ../src/H5Bprivate.h \ + ../src/H5Bpublic.h \ + ../src/H5HGprivate.h \ + ../src/H5HGpublic.h \ + ../src/H5Pprivate.h \ + ../src/H5Ppublic.h +shtype.o: \ + shtype.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -336,10 +393,9 @@ links.o: \ ../src/H5Opublic.h \ ../src/H5Ppublic.h \ ../src/H5Zpublic.h \ - ../src/H5Spublic.h \ - ../src/H5Tpublic.h -dtypes.o: \ - dtypes.c \ + ../src/H5Rpublic.h +big.o: \ + big.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -358,15 +414,12 @@ dtypes.o: \ ../src/H5Opublic.h \ ../src/H5Ppublic.h \ ../src/H5Zpublic.h \ + ../src/H5Rpublic.h \ ../src/H5Spublic.h \ ../src/H5Tpublic.h \ - ../src/H5Tpkg.h \ - ../src/H5HGprivate.h \ - ../src/H5Fprivate.h \ - ../src/H5private.h \ - ../src/H5Tprivate.h -dsets.o: \ - dsets.c \ + ../src/H5private.h +links.o: \ + links.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -385,10 +438,10 @@ dsets.o: \ ../src/H5Opublic.h \ ../src/H5Ppublic.h \ ../src/H5Zpublic.h \ - ../src/H5Spublic.h \ - ../src/H5Tpublic.h -cmpd_dset.o: \ - cmpd_dset.c \ + ../src/H5Rpublic.h \ + ../src/H5Spublic.h +chunk.o: \ + chunk.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -408,8 +461,7 @@ cmpd_dset.o: \ ../src/H5Ppublic.h \ ../src/H5Zpublic.h \ ../src/H5Rpublic.h \ - ../src/H5Spublic.h \ - ../src/H5Tpublic.h + ../src/H5Spublic.h bittests.o: \ bittests.c \ ../src/H5Tpkg.h \ @@ -426,53 +478,6 @@ bittests.o: \ ../src/H5Tpublic.h \ ../src/H5Gprivate.h \ ../src/H5Gpublic.h -istore.o: \ - istore.c \ - ../src/H5private.h \ - ../src/H5public.h \ - ../src/H5config.h \ - ../src/H5Iprivate.h \ - ../src/H5Ipublic.h \ - ../src/H5Pprivate.h \ - ../src/H5Ppublic.h \ - ../src/H5Dpublic.h \ - ../src/H5Fpublic.h \ - ../src/H5Zpublic.h \ - ../src/H5Fprivate.h \ - ../src/H5Gprivate.h \ - ../src/H5Gpublic.h \ - ../src/H5Bprivate.h \ - ../src/H5Bpublic.h \ - ../src/H5MMprivate.h \ - ../src/H5MMpublic.h \ - ../src/H5Oprivate.h \ - ../src/H5Opublic.h \ - ../src/H5HGprivate.h \ - ../src/H5HGpublic.h \ - ../src/H5Tprivate.h \ - ../src/H5Tpublic.h \ - ../src/H5Sprivate.h \ - ../src/H5Spublic.h \ - ../src/H5Zprivate.h -gheap.o: \ - gheap.c \ - ../src/H5private.h \ - ../src/H5public.h \ - ../src/H5config.h \ - ../src/H5Eprivate.h \ - ../src/H5Epublic.h \ - ../src/H5Ipublic.h \ - ../src/H5Fprivate.h \ - ../src/H5Fpublic.h \ - ../src/H5Dpublic.h \ - ../src/H5Gprivate.h \ - ../src/H5Gpublic.h \ - ../src/H5Bprivate.h \ - ../src/H5Bpublic.h \ - ../src/H5HGprivate.h \ - ../src/H5HGpublic.h \ - ../src/H5Pprivate.h \ - ../src/H5Ppublic.h mtime.o: \ mtime.c \ ../src/hdf5.h \ diff --git a/test/dsets.c b/test/dsets.c index cb27004..1e0799d 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -712,7 +712,7 @@ test_multiopen (hid_t file) /* Get the size from the second handle */ if ((space = H5Dget_space (dset2))<0) goto error; - if (H5Sextent_dims (space, tmp_size, NULL)<0) goto error; + if (H5Sget_simple_extent_dims (space, tmp_size, NULL)<0) goto error; if (cur_size[0]!=tmp_size[0]) { puts ("*FAILED*"); printf (" Got %d instead of %d!\n", diff --git a/test/links.c b/test/links.c index 8fb55a3..0a0f807 100644 --- a/test/links.c +++ b/test/links.c @@ -176,8 +176,8 @@ cklinks(void) } /* Hard link */ - if (H5Gstat(file, "d1", TRUE, &sb1)<0) goto error; - if (H5Gstat(file, "grp1/hard", TRUE, &sb2)<0) goto error; + if (H5Gget_stat(file, "d1", TRUE, &sb1)<0) goto error; + if (H5Gget_stat(file, "grp1/hard", TRUE, &sb2)<0) goto error; if (H5G_DATASET!=sb2.type) { puts("*FAILED*"); puts(" Unexpected object type should have been a dataset"); @@ -191,7 +191,7 @@ cklinks(void) } /* Symbolic link */ - if (H5Gstat(file, "grp1/soft", TRUE, &sb2)<0) goto error; + if (H5Gget_stat(file, "grp1/soft", TRUE, &sb2)<0) goto error; if (H5G_DATASET!=sb2.type) { puts("*FAILED*"); puts(" Unexpected object type should have been a dataset"); @@ -214,14 +214,14 @@ cklinks(void) /* Dangling link */ H5E_BEGIN_TRY { - status = H5Gstat(file, "grp1/dangle", TRUE, &sb2); + status = H5Gget_stat(file, "grp1/dangle", TRUE, &sb2); } H5E_END_TRY; if (status>=0) { puts("*FAILED*"); - puts(" H5Gstat() should have failed for a dangling link."); + puts(" H5Gget_stat() should have failed for a dangling link."); goto error; } - if (H5Gstat(file, "grp1/dangle", FALSE, &sb2)<0) goto error; + if (H5Gget_stat(file, "grp1/dangle", FALSE, &sb2)<0) goto error; if (H5G_LINK!=sb2.type) { puts("*FAILED*"); puts(" Unexpected object type should have been a symbolic link"); @@ -238,14 +238,14 @@ cklinks(void) /* Recursive link */ H5E_BEGIN_TRY { - status = H5Gstat(file, "grp1/recursive", TRUE, &sb2); + status = H5Gget_stat(file, "grp1/recursive", TRUE, &sb2); } H5E_END_TRY; if (status>=0) { puts("*FAILED*"); - puts(" H5Gstat() should have failed for a recursive link."); + puts(" H5Gget_stat() should have failed for a recursive link."); goto error; } - if (H5Gstat(file, "grp1/recursive", FALSE, &sb2)<0) goto error; + if (H5Gget_stat(file, "grp1/recursive", FALSE, &sb2)<0) goto error; if (H5G_LINK!=sb2.type) { puts("*FAILED*"); puts(" Unexpected object type should have been a symbolic link"); diff --git a/test/mtime.c b/test/mtime.c index 91d7400..401d7d7 100644 --- a/test/mtime.c +++ b/test/mtime.c @@ -120,21 +120,21 @@ main(void) /* * Open the file and get the modification time. We'll test the new - * H5Gstat() arguments too: being able to stat something without knowing + * H5Gget_stat() arguments too: being able to stat something without knowing * its name. */ if ((file = H5Fopen(FILE_NAME_1, H5F_ACC_RDONLY, H5P_DEFAULT))<0) return 1; - if (H5Gstat(file, "dset", TRUE, &sb1)<0) return 1; + if (H5Gget_stat(file, "dset", TRUE, &sb1)<0) return 1; if ((dset=H5Dopen(file, "dset"))<0) return 1; - if (H5Gstat(dset, ".", TRUE, &sb2)<0) return 1; + if (H5Gget_stat(dset, ".", TRUE, &sb2)<0) return 1; if (H5Dclose(dset)<0) return 1; if (H5Fclose(file)<0) return 1; - /* Compare times from the two ways of calling H5Gstat() */ + /* Compare times from the two ways of calling H5Gget_stat() */ if (sb1.objno[0]!=sb2.objno[0] || sb1.objno[1]!=sb2.objno[1] || sb1.mtime!=sb2.mtime) { puts("*FAILED*"); - puts(" Calling H5Gstat() with the dataset ID returned different"); + puts(" Calling H5Gget_stat() with the dataset ID returned different"); puts(" values than calling it with a file and dataset name."); return 1; } diff --git a/test/tattr.c b/test/tattr.c index e373d34..132af1c 100644 --- a/test/tattr.c +++ b/test/tattr.c @@ -216,8 +216,8 @@ test_attr_basic_read(void) CHECK(dataset, FAIL, "H5Dopen"); /* Verify the correct number of attributes */ - ret=H5Anum_attrs(dataset); - VERIFY(ret, 1, "H5Anum_attrs"); + ret=H5Aget_num_attrs(dataset); + VERIFY(ret, 1, "H5Aget_num_attrs"); /* Open an attribute for the dataset */ attr=H5Aopen_name(dataset,ATTR1_NAME); @@ -245,8 +245,8 @@ test_attr_basic_read(void) group=H5Gopen(fid1,GROUP1_NAME); /* Verify the correct number of attributes */ - ret=H5Anum_attrs(group); - VERIFY(ret, 1, "H5Anum_attrs"); + ret=H5Aget_num_attrs(group); + VERIFY(ret, 1, "H5Aget_num_attrs"); /* Open an attribute for the dataset */ attr=H5Aopen_name(group,ATTR2_NAME); @@ -402,8 +402,8 @@ test_attr_compound_read(void) dataset=H5Dopen(fid1,"Dataset1"); /* Verify the correct number of attributes */ - ret=H5Anum_attrs(dataset); - VERIFY(ret, 1, "H5Anum_attrs"); + ret=H5Aget_num_attrs(dataset); + VERIFY(ret, 1, "H5Aget_num_attrs"); /* Open 1st attribute for the dataset */ attr=H5Aopen_idx(dataset,0); @@ -412,10 +412,10 @@ test_attr_compound_read(void) /* Verify Dataspace */ space=H5Aget_space(attr); CHECK(space, FAIL, "H5Aget_space"); - rank=H5Sextent_ndims(space); - VERIFY(rank, ATTR4_RANK, "H5Sextent_ndims"); - ret=H5Sextent_dims(space,dims, NULL); - CHECK(ret, FAIL, "H5Sextent_dims"); + rank=H5Sget_simple_extent_ndims(space); + VERIFY(rank, ATTR4_RANK, "H5Sget_simple_extent_ndims"); + ret=H5Sget_simple_extent_dims(space,dims, NULL); + CHECK(ret, FAIL, "H5Sget_simple_extent_dims"); if(dims[0]!=ATTR4_DIM1) { printf("attribute dimensions different: dims[0]=%d, should be %d\n",(int)dims[0],ATTR4_DIM1); num_errs++; @@ -607,8 +607,8 @@ test_attr_scalar_read(void) CHECK(dataset, FAIL, "H5Dopen"); /* Verify the correct number of attributes */ - ret=H5Anum_attrs(dataset); - VERIFY(ret, 1, "H5Anum_attrs"); + ret=H5Aget_num_attrs(dataset); + VERIFY(ret, 1, "H5Aget_num_attrs"); /* Open an attribute for the dataset */ attr=H5Aopen_name(dataset,ATTR5_NAME); @@ -787,8 +787,8 @@ test_attr_mult_read(void) dataset=H5Dopen(fid1,"Dataset1"); /* Verify the correct number of attributes */ - ret=H5Anum_attrs(dataset); - VERIFY(ret, 3, "H5Anum_attrs"); + ret=H5Aget_num_attrs(dataset); + VERIFY(ret, 3, "H5Aget_num_attrs"); /* Open 1st attribute for the dataset */ attr=H5Aopen_idx(dataset,0); @@ -797,10 +797,10 @@ test_attr_mult_read(void) /* Verify Dataspace */ space=H5Aget_space(attr); CHECK(space, FAIL, "H5Aget_space"); - rank=H5Sextent_ndims(space); - VERIFY(rank, ATTR1_RANK, "H5Sextent_ndims"); - ret=H5Sextent_dims(space,dims, NULL); - CHECK(ret, FAIL, "H5Sextent_dims"); + rank=H5Sget_simple_extent_ndims(space); + VERIFY(rank, ATTR1_RANK, "H5Sget_simple_extent_ndims"); + ret=H5Sget_simple_extent_dims(space,dims, NULL); + CHECK(ret, FAIL, "H5Sget_simple_extent_dims"); if(dims[0]!=ATTR1_DIM1) { printf("attribute dimensions different: dims[0]=%d, should be %d\n",(int)dims[0],ATTR1_DIM1); num_errs++; @@ -858,10 +858,10 @@ test_attr_mult_read(void) /* Verify Dataspace */ space=H5Aget_space(attr); CHECK(space, FAIL, "H5Aget_space"); - rank=H5Sextent_ndims(space); - VERIFY(rank, ATTR2_RANK, "H5Sextent_ndims"); - ret=H5Sextent_dims(space,dims, NULL); - CHECK(ret, FAIL, "H5Sextent_dims"); + rank=H5Sget_simple_extent_ndims(space); + VERIFY(rank, ATTR2_RANK, "H5Sget_simple_extent_ndims"); + ret=H5Sget_simple_extent_dims(space,dims, NULL); + CHECK(ret, FAIL, "H5Sget_simple_extent_dims"); if(dims[0]!=ATTR2_DIM1) { printf("attribute dimensions different: dims[0]=%d, should be %d\n",(int)dims[0],ATTR2_DIM1); num_errs++; @@ -924,10 +924,10 @@ test_attr_mult_read(void) /* Verify Dataspace */ space=H5Aget_space(attr); CHECK(space, FAIL, "H5Aget_space"); - rank=H5Sextent_ndims(space); - VERIFY(rank, ATTR3_RANK, "H5Sextent_ndims"); - ret=H5Sextent_dims(space,dims, NULL); - CHECK(ret, FAIL, "H5Sextent_dims"); + rank=H5Sget_simple_extent_ndims(space); + VERIFY(rank, ATTR3_RANK, "H5Sget_simple_extent_ndims"); + ret=H5Sget_simple_extent_dims(space,dims, NULL); + CHECK(ret, FAIL, "H5Sget_simple_extent_dims"); if(dims[0]!=ATTR3_DIM1) { printf("attribute dimensions different: dims[0]=%d, should be %d\n",(int)dims[0],ATTR3_DIM1); num_errs++; @@ -1065,8 +1065,8 @@ test_attr_iterate(void) dataset=H5Dopen(file,"Dataset1"); /* Verify the correct number of attributes */ - ret=H5Anum_attrs(dataset); - VERIFY(ret, 3, "H5Anum_attrs"); + ret=H5Aget_num_attrs(dataset); + VERIFY(ret, 3, "H5Aget_num_attrs"); /* Close dataset */ start=0; @@ -1109,24 +1109,24 @@ test_attr_delete(void) dataset=H5Dopen(fid1,"Dataset1"); /* Verify the correct number of attributes */ - ret=H5Anum_attrs(dataset); - VERIFY(ret, 3, "H5Anum_attrs"); + ret=H5Aget_num_attrs(dataset); + VERIFY(ret, 3, "H5Aget_num_attrs"); /* Try to delete bogus attribute */ ret=H5Adelete(dataset,"Bogus"); VERIFY(ret, FAIL, "H5Adelete"); /* Verify the correct number of attributes */ - ret=H5Anum_attrs(dataset); - VERIFY(ret, 3, "H5Anum_attrs"); + ret=H5Aget_num_attrs(dataset); + VERIFY(ret, 3, "H5Aget_num_attrs"); /* Delete middle (2nd) attribute */ ret=H5Adelete(dataset,ATTR2_NAME); CHECK(ret, FAIL, "H5Adelete"); /* Verify the correct number of attributes */ - ret=H5Anum_attrs(dataset); - VERIFY(ret, 2, "H5Anum_attrs"); + ret=H5Aget_num_attrs(dataset); + VERIFY(ret, 2, "H5Aget_num_attrs"); /* Open 1st attribute for the dataset */ attr=H5Aopen_idx(dataset,0); @@ -1165,8 +1165,8 @@ test_attr_delete(void) CHECK(ret, FAIL, "H5Adelete"); /* Verify the correct number of attributes */ - ret=H5Anum_attrs(dataset); - VERIFY(ret, 1, "H5Anum_attrs"); + ret=H5Aget_num_attrs(dataset); + VERIFY(ret, 1, "H5Aget_num_attrs"); /* Open last (formally 3rd) attribute for the dataset */ attr=H5Aopen_idx(dataset,0); @@ -1189,8 +1189,8 @@ test_attr_delete(void) CHECK(ret, FAIL, "H5Adelete"); /* Verify the correct number of attributes */ - ret=H5Anum_attrs(dataset); - VERIFY(ret, 0, "H5Anum_attrs"); + ret=H5Aget_num_attrs(dataset); + VERIFY(ret, 0, "H5Aget_num_attrs"); /* Close dataset */ ret = H5Dclose(dataset); diff --git a/test/testhdf5.c b/test/testhdf5.c index c25bcf4..d83062e 100644 --- a/test/testhdf5.c +++ b/test/testhdf5.c @@ -172,7 +172,7 @@ main(int argc, char *argv[]) InitTest("select", test_select, cleanup_select, "Selections"); Verbosity = 4; /* Default Verbosity is Low */ - H5version(&major, &minor, &release); + H5get_libversion(&major, &minor, &release); print_func("\nFor help use: testhdf5 -help\n"); print_func("Linked with hdf5 version %u.%u release %u\n", diff --git a/test/th5s.c b/test/th5s.c index 6b4a66c..abb16cd 100644 --- a/test/th5s.c +++ b/test/th5s.c @@ -104,37 +104,37 @@ test_h5s_basic(void) sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL); CHECK(sid1, FAIL, "H5Screate_simple"); - n = H5Sextent_npoints(sid1); - CHECK(n, UFAIL, "H5Sextent_npoints"); - VERIFY(n, SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3, "H5Sextent_npoints"); + n = H5Sget_simple_extent_npoints(sid1); + CHECK(n, UFAIL, "H5Sget_simple_extent_npoints"); + VERIFY(n, SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3, "H5Sget_simple_extent_npoints"); - rank = H5Sextent_ndims(sid1); - CHECK(rank, UFAIL, "H5Sextent_ndims"); - VERIFY(rank, SPACE1_RANK, "H5Sextent_ndims"); + rank = H5Sget_simple_extent_ndims(sid1); + CHECK(rank, UFAIL, "H5Sget_simple_extent_ndims"); + VERIFY(rank, SPACE1_RANK, "H5Sget_simple_extent_ndims"); - ret = H5Sextent_dims(sid1, tdims, NULL); - CHECK(ret, FAIL, "H5Sextent_dims"); + ret = H5Sget_simple_extent_dims(sid1, tdims, NULL); + CHECK(ret, FAIL, "H5Sget_simple_extent_dims"); VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(unsigned)), 0, - "H5Sextent_dims"); + "H5Sget_simple_extent_dims"); sid2 = H5Screate_simple(SPACE2_RANK, dims2, max2); CHECK(sid2, FAIL, "H5Screate_simple"); - n = H5Sextent_npoints(sid2); - CHECK(n, UFAIL, "H5Sextent_npoints"); + n = H5Sget_simple_extent_npoints(sid2); + CHECK(n, UFAIL, "H5Sget_simple_extent_npoints"); VERIFY(n, SPACE2_DIM1 * SPACE2_DIM2 * SPACE2_DIM3 * SPACE2_DIM4, - "H5Sextent_npoints"); + "H5Sget_simple_extent_npoints"); - rank = H5Sextent_ndims(sid2); - CHECK(rank, UFAIL, "H5Sextent_ndims"); - VERIFY(rank, SPACE2_RANK, "H5Sextent_ndims"); + rank = H5Sget_simple_extent_ndims(sid2); + CHECK(rank, UFAIL, "H5Sget_simple_extent_ndims"); + VERIFY(rank, SPACE2_RANK, "H5Sget_simple_extent_ndims"); - ret = H5Sextent_dims(sid2, tdims, tmax); - CHECK(ret, FAIL, "H5Sextent_dims"); + ret = H5Sget_simple_extent_dims(sid2, tdims, tmax); + CHECK(ret, FAIL, "H5Sget_simple_extent_dims"); VERIFY(HDmemcmp(tdims, dims2, SPACE2_RANK * sizeof(unsigned)), 0, - "H5Sextent_dims"); + "H5Sget_simple_extent_dims"); VERIFY(HDmemcmp(tmax, max2, SPACE2_RANK * sizeof(unsigned)), 0, - "H5Sextent_dims"); + "H5Sget_simple_extent_dims"); ret = H5Sclose(sid1); CHECK(ret, FAIL, "H5Sclose"); @@ -175,20 +175,20 @@ test_h5s_scalar_write(void) sid1 = H5Screate_simple(SPACE3_RANK, NULL, NULL); CHECK(sid1, FAIL, "H5Screate_simple"); - n = H5Sextent_npoints(sid1); - CHECK(n, UFAIL, "H5Sextent_npoints"); - VERIFY(n, 1, "H5Sextent_npoints"); + n = H5Sget_simple_extent_npoints(sid1); + CHECK(n, UFAIL, "H5Sget_simple_extent_npoints"); + VERIFY(n, 1, "H5Sget_simple_extent_npoints"); - rank = H5Sextent_ndims(sid1); - CHECK(rank, UFAIL, "H5Sextent_ndims"); - VERIFY(rank, SPACE3_RANK, "H5Sextent_ndims"); + rank = H5Sget_simple_extent_ndims(sid1); + CHECK(rank, UFAIL, "H5Sget_simple_extent_ndims"); + VERIFY(rank, SPACE3_RANK, "H5Sget_simple_extent_ndims"); - ret = H5Sextent_dims(sid1, tdims, NULL); - VERIFY(ret, 0, "H5Sextent_dims"); + ret = H5Sget_simple_extent_dims(sid1, tdims, NULL); + VERIFY(ret, 0, "H5Sget_simple_extent_dims"); /* Verify extent type */ - ext_type = H5Sextent_class(sid1); - VERIFY(ext_type, H5S_SCALAR, "H5Sextent_class"); + ext_type = H5Sget_simple_extent_type(sid1); + VERIFY(ext_type, H5S_SCALAR, "H5Sget_simple_extent_type"); /* Create a dataset */ dataset=H5Dcreate(fid1,"Dataset1",H5T_NATIVE_UINT,sid1,H5P_DEFAULT); @@ -241,16 +241,16 @@ test_h5s_scalar_read(void) sid1=H5Dget_space(dataset); CHECK(sid1, FAIL, "H5Dget_space"); - n = H5Sextent_npoints(sid1); - CHECK(n, UFAIL, "H5Sextent_npoints"); - VERIFY(n, 1, "H5Sextent_npoints"); + n = H5Sget_simple_extent_npoints(sid1); + CHECK(n, UFAIL, "H5Sget_simple_extent_npoints"); + VERIFY(n, 1, "H5Sget_simple_extent_npoints"); - rank = H5Sextent_ndims(sid1); - CHECK(rank, UFAIL, "H5Sextent_ndims"); - VERIFY(rank, SPACE3_RANK, "H5Sextent_ndims"); + rank = H5Sget_simple_extent_ndims(sid1); + CHECK(rank, UFAIL, "H5Sget_simple_extent_ndims"); + VERIFY(rank, SPACE3_RANK, "H5Sget_simple_extent_ndims"); - ret = H5Sextent_dims(sid1, tdims, NULL); - VERIFY(ret, 0, "H5Sextent_dims"); + ret = H5Sget_simple_extent_dims(sid1, tdims, NULL); + VERIFY(ret, 0, "H5Sget_simple_extent_dims"); ret = H5Dread(dataset, H5T_NATIVE_UINT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata); CHECK(ret, FAIL, "H5Dread"); @@ -318,16 +318,16 @@ test_h5s_compound_scalar_write(void) sid1 = H5Screate_simple(SPACE3_RANK, NULL, NULL); CHECK(sid1, FAIL, "H5Screate_simple"); - n = H5Sextent_npoints(sid1); - CHECK(n, UFAIL, "H5Sextent_npoints"); - VERIFY(n, 1, "H5Sextent_npoints"); + n = H5Sget_simple_extent_npoints(sid1); + CHECK(n, UFAIL, "H5Sget_simple_extent_npoints"); + VERIFY(n, 1, "H5Sget_simple_extent_npoints"); - rank = H5Sextent_ndims(sid1); - CHECK(rank, UFAIL, "H5Sextent_ndims"); - VERIFY(rank, SPACE3_RANK, "H5Sextent_ndims"); + rank = H5Sget_simple_extent_ndims(sid1); + CHECK(rank, UFAIL, "H5Sget_simple_extent_ndims"); + VERIFY(rank, SPACE3_RANK, "H5Sget_simple_extent_ndims"); - ret = H5Sextent_dims(sid1, tdims, NULL); - VERIFY(ret, 0, "H5Sextent_dims"); + ret = H5Sget_simple_extent_dims(sid1, tdims, NULL); + VERIFY(ret, 0, "H5Sget_simple_extent_dims"); /* Create a dataset */ dataset=H5Dcreate(fid1,"Dataset1",tid1,sid1,H5P_DEFAULT); @@ -382,16 +382,16 @@ test_h5s_compound_scalar_read(void) sid1=H5Dget_space(dataset); CHECK(sid1, FAIL, "H5Dget_space"); - n = H5Sextent_npoints(sid1); - CHECK(n, UFAIL, "H5Sextent_npoints"); - VERIFY(n, 1, "H5Sextent_npoints"); + n = H5Sget_simple_extent_npoints(sid1); + CHECK(n, UFAIL, "H5Sget_simple_extent_npoints"); + VERIFY(n, 1, "H5Sget_simple_extent_npoints"); - rank = H5Sextent_ndims(sid1); - CHECK(rank, UFAIL, "H5Sextent_ndims"); - VERIFY(rank, SPACE3_RANK, "H5Sextent_ndims"); + rank = H5Sget_simple_extent_ndims(sid1); + CHECK(rank, UFAIL, "H5Sget_simple_extent_ndims"); + VERIFY(rank, SPACE3_RANK, "H5Sget_simple_extent_ndims"); - ret = H5Sextent_dims(sid1, tdims, NULL); - VERIFY(ret, 0, "H5Sextent_dims"); + ret = H5Sget_simple_extent_dims(sid1, tdims, NULL); + VERIFY(ret, 0, "H5Sget_simple_extent_dims"); type=H5Dget_type(dataset); CHECK(type, FAIL, "H5Dget_type"); diff --git a/test/tselect.c b/test/tselect.c index c19bfdd..3223cdb 100644 --- a/test/tselect.c +++ b/test/tselect.c @@ -107,8 +107,8 @@ test_select_hyper(void) CHECK(sid2, FAIL, "H5Screate_simple"); /* Verify extent type */ - ext_type = H5Sextent_class(sid1); - VERIFY(ext_type, H5S_SIMPLE, "H5Sextent_class"); + ext_type = H5Sget_simple_extent_type(sid1); + VERIFY(ext_type, H5S_SIMPLE, "H5Sget_simple_extent_type"); /* Select 2x15x13 hyperslab for disk dataset */ start[0]=1; start[1]=0; start[2]=0; @@ -378,8 +378,8 @@ test_select_all(void) CHECK(sid2, FAIL, "H5Screate_simple"); /* Verify extent type */ - ext_type = H5Sextent_class(sid1); - VERIFY(ext_type, H5S_SIMPLE, "H5Sextent_class"); + ext_type = H5Sget_simple_extent_type(sid1); + VERIFY(ext_type, H5S_SIMPLE, "H5Sget_simple_extent_type"); /* Select entire 15x26 extent for disk dataset */ ret = H5Sselect_all(sid1); @@ -1137,8 +1137,8 @@ test_select_hyper_offset(void) CHECK(sid2, FAIL, "H5Screate_simple"); /* Verify extent type */ - ext_type = H5Sextent_class(sid1); - VERIFY(ext_type, H5S_SIMPLE, "H5Sextent_class"); + ext_type = H5Sget_simple_extent_type(sid1); + VERIFY(ext_type, H5S_SIMPLE, "H5Sget_simple_extent_type"); /* Select 2x15x13 hyperslab for disk dataset */ start[0]=1; start[1]=0; start[2]=0; |