[svn-r489] Changed more API functions to the new names as documented. Also, added

stub for testing selections.

1 files changed, 33 insertions, 33 deletions

diff --git a/test/th5s.c b/test/th5s.c
index 5ac9ff1..000ca2f 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -108,14 +108,14 @@ test_h5s_basic(void)
     CHECK(n, UFAIL, "H5Sextent_npoints");
     VERIFY(n, SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3, "H5Sextent_npoints");
 
-    rank = H5Sget_ndims(sid1);
-    CHECK(rank, UFAIL, "H5Sget_lrank");
-    VERIFY(rank, SPACE1_RANK, "H5Sget_lrank");
+    rank = H5Sextent_ndims(sid1);
+    CHECK(rank, UFAIL, "H5Sextent_ndims");
+    VERIFY(rank, SPACE1_RANK, "H5Sextent_ndims");
 
-    ret = H5Sget_dims(sid1, tdims, NULL);
-    CHECK(ret, FAIL, "H5Sget_ldims");
+    ret = H5Sextent_dims(sid1, tdims, NULL);
+    CHECK(ret, FAIL, "H5Sextent_dims");
     VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(unsigned)), 0,
-	   "H5Sget_ldims");
+	   "H5Sextent_dims");
 
     sid2 = H5Screate_simple(SPACE2_RANK, dims2, max2);
     CHECK(sid2, FAIL, "H5Screate_simple");
@@ -125,16 +125,16 @@ test_h5s_basic(void)
     VERIFY(n, SPACE2_DIM1 * SPACE2_DIM2 * SPACE2_DIM3 * SPACE2_DIM4,
 	   "H5Sextent_npoints");
 
-    rank = H5Sget_ndims(sid2);
-    CHECK(rank, UFAIL, "H5Sget_lrank");
-    VERIFY(rank, SPACE2_RANK, "H5Sget_lrank");
+    rank = H5Sextent_ndims(sid2);
+    CHECK(rank, UFAIL, "H5Sextent_ndims");
+    VERIFY(rank, SPACE2_RANK, "H5Sextent_ndims");
 
-    ret = H5Sget_dims(sid2, tdims, tmax);
-    CHECK(ret, FAIL, "H5Sget_ldims");
+    ret = H5Sextent_dims(sid2, tdims, tmax);
+    CHECK(ret, FAIL, "H5Sextent_dims");
     VERIFY(HDmemcmp(tdims, dims2, SPACE2_RANK * sizeof(unsigned)), 0,
-	   "H5Sget_ldims");
+	   "H5Sextent_dims");
     VERIFY(HDmemcmp(tmax, max2, SPACE2_RANK * sizeof(unsigned)), 0,
-	   "H5Sget_ldims");
+	   "H5Sextent_dims");
 
     ret = H5Sclose(sid1);
     CHECK(ret, FAIL, "H5Sclose");
@@ -178,12 +178,12 @@ test_h5s_scalar_write(void)
     CHECK(n, UFAIL, "H5Sextent_npoints");
     VERIFY(n, 1, "H5Sextent_npoints");
 
-    rank = H5Sget_ndims(sid1);
-    CHECK(rank, UFAIL, "H5Sget_lrank");
-    VERIFY(rank, SPACE3_RANK, "H5Sget_lrank");
+    rank = H5Sextent_ndims(sid1);
+    CHECK(rank, UFAIL, "H5Sextent_ndims");
+    VERIFY(rank, SPACE3_RANK, "H5Sextent_ndims");
 
-    ret = H5Sget_dims(sid1, tdims, NULL);
-    VERIFY(ret, 0, "H5Sget_dims");
+    ret = H5Sextent_dims(sid1, tdims, NULL);
+    VERIFY(ret, 0, "H5Sextent_dims");
 
     /* Create a dataset */
     dataset=H5Dcreate(fid1,"Dataset1",H5T_NATIVE_UINT,sid1,H5P_DEFAULT);
@@ -240,12 +240,12 @@ test_h5s_scalar_read(void)
     CHECK(n, UFAIL, "H5Sextent_npoints");
     VERIFY(n, 1, "H5Sextent_npoints");
 
-    rank = H5Sget_ndims(sid1);
-    CHECK(rank, UFAIL, "H5Sget_lrank");
-    VERIFY(rank, SPACE3_RANK, "H5Sget_lrank");
+    rank = H5Sextent_ndims(sid1);
+    CHECK(rank, UFAIL, "H5Sextent_ndims");
+    VERIFY(rank, SPACE3_RANK, "H5Sextent_ndims");
 
-    ret = H5Sget_dims(sid1, tdims, NULL);
-    VERIFY(ret, 0, "H5Sget_dims");
+    ret = H5Sextent_dims(sid1, tdims, NULL);
+    VERIFY(ret, 0, "H5Sextent_dims");
 
     ret = H5Dread(dataset, H5T_NATIVE_UINT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata);
     CHECK(ret, FAIL, "H5Dread");
@@ -317,12 +317,12 @@ test_h5s_compound_scalar_write(void)
     CHECK(n, UFAIL, "H5Sextent_npoints");
     VERIFY(n, 1, "H5Sextent_npoints");
 
-    rank = H5Sget_ndims(sid1);
-    CHECK(rank, UFAIL, "H5Sget_lrank");
-    VERIFY(rank, SPACE3_RANK, "H5Sget_lrank");
+    rank = H5Sextent_ndims(sid1);
+    CHECK(rank, UFAIL, "H5Sextent_ndims");
+    VERIFY(rank, SPACE3_RANK, "H5Sextent_ndims");
 
-    ret = H5Sget_dims(sid1, tdims, NULL);
-    VERIFY(ret, 0, "H5Sget_dims");
+    ret = H5Sextent_dims(sid1, tdims, NULL);
+    VERIFY(ret, 0, "H5Sextent_dims");
 
     /* Create a dataset */
     dataset=H5Dcreate(fid1,"Dataset1",tid1,sid1,H5P_DEFAULT);
@@ -381,12 +381,12 @@ test_h5s_compound_scalar_read(void)
     CHECK(n, UFAIL, "H5Sextent_npoints");
     VERIFY(n, 1, "H5Sextent_npoints");
 
-    rank = H5Sget_ndims(sid1);
-    CHECK(rank, UFAIL, "H5Sget_lrank");
-    VERIFY(rank, SPACE3_RANK, "H5Sget_lrank");
+    rank = H5Sextent_ndims(sid1);
+    CHECK(rank, UFAIL, "H5Sextent_ndims");
+    VERIFY(rank, SPACE3_RANK, "H5Sextent_ndims");
 
-    ret = H5Sget_dims(sid1, tdims, NULL);
-    VERIFY(ret, 0, "H5Sget_dims");
+    ret = H5Sextent_dims(sid1, tdims, NULL);
+    VERIFY(ret, 0, "H5Sextent_dims");
 
     type=H5Dget_type(dataset);
     CHECK(type, FAIL, "H5Dget_type");