Merge pull request #1819 in HDFFV/hdf5 from ~KOZIOL/hdf5:develop to develop

* commit '905d40aa6f6eb603c5507e7967130760e3a2e43c':
  Fix return type for H5Sselect_intersect_block().
  Updated H5TRACE macro.
  Add H5Sselect_shape_same and H5Sselect_intersect_block API routines, along with tests and minor cleanups and refactorings.

1 files changed, 21 insertions, 21 deletions

diff --git a/test/th5s.c b/test/th5s.c
index a48979b..f0365de 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -187,7 +187,7 @@ test_h5s_basic(void)
     CHECK(ret, FAIL, "H5Sclose");
 
     /*
-     * Check to be sure we can't create a simple data space that has too many
+     * Check to be sure we can't create a simple dataspace that has too many
      * dimensions.
      */
     H5E_BEGIN_TRY {
@@ -318,7 +318,7 @@ test_h5s_basic(void)
 
 /****************************************************************
 **
-**  test_h5s_null(): Test NULL data space
+**  test_h5s_null(): Test NULL dataspace
 **
 ****************************************************************/
 static void
@@ -460,7 +460,7 @@ test_h5s_null(void)
     CHECK(ret, FAIL, "H5Fclose");
 
     /*============================================
-     *  Reopen the file to check the data space
+     *  Reopen the file to check the dataspace
      *============================================
      */
     fid = H5Fopen(NULLFILE, H5F_ACC_RDONLY, H5P_DEFAULT);
@@ -1078,7 +1078,7 @@ test_h5s_zero_dim(void)
         CHECK(ret, FAIL, "H5Fclose");
 
         /*============================================
-         *  Reopen the file to check the data space
+         *  Reopen the file to check the dataspace
          *============================================
          */
         fid1 = H5Fopen(ZEROFILE, H5F_ACC_RDONLY, H5P_DEFAULT);
@@ -1227,7 +1227,7 @@ test_h5s_encode(H5F_libver_t low, H5F_libver_t high)
     ret = H5Sselect_hyperslab(sid1, H5S_SELECT_SET, start, stride, count, block);
     CHECK(ret, FAIL, "H5Sselect_hyperslab");
 
-    /* Encode simple data space in a buffer with the fapl setting */
+    /* Encode simple dataspace in a buffer with the fapl setting */
     ret = H5Sencode2(sid1, NULL, &sbuf_size, fapl);
     CHECK(ret, FAIL, "H5Sencode2");
 
@@ -1242,7 +1242,7 @@ test_h5s_encode(H5F_libver_t low, H5F_libver_t high)
     } H5E_END_TRY;
     VERIFY(ret_id, FAIL, "H5Sdecode");
 
-    /* Encode the simple data space in a buffer with the fapl setting */
+    /* Encode the simple dataspace in a buffer with the fapl setting */
     ret = H5Sencode2(sid1, sbuf, &sbuf_size, fapl);
     CHECK(ret, FAIL, "H5Sencode");
 
@@ -1289,7 +1289,7 @@ test_h5s_encode(H5F_libver_t low, H5F_libver_t high)
     sid2 = H5Screate(H5S_NULL);
     CHECK(sid2, FAIL, "H5Screate");
 
-    /* Encode null data space in a buffer */
+    /* Encode null dataspace in a buffer */
     ret = H5Sencode2(sid2, NULL, &null_size, fapl);
     CHECK(ret, FAIL, "H5Sencode");
 
@@ -1298,7 +1298,7 @@ test_h5s_encode(H5F_libver_t low, H5F_libver_t high)
         CHECK(null_sbuf, NULL, "HDcalloc");
     }
 
-    /* Encode the null data space in the buffer */
+    /* Encode the null dataspace in the buffer */
     ret = H5Sencode2(sid2, null_sbuf, &null_size, fapl);
     CHECK(ret, FAIL, "H5Sencode2");
 
@@ -1325,7 +1325,7 @@ test_h5s_encode(H5F_libver_t low, H5F_libver_t high)
     sid3 = H5Screate(H5S_SCALAR);
     CHECK(sid3, FAIL, "H5Screate_simple");
 
-    /* Encode scalar data space in a buffer */
+    /* Encode scalar dataspace in a buffer */
     ret = H5Sencode2(sid3, NULL, &scalar_size, fapl);
     CHECK(ret, FAIL, "H5Sencode");
 
@@ -1334,7 +1334,7 @@ test_h5s_encode(H5F_libver_t low, H5F_libver_t high)
         CHECK(scalar_buf, NULL, "HDcalloc");
     }
 
-    /* Encode the scalar data space in the buffer */
+    /* Encode the scalar dataspace in the buffer */
     ret = H5Sencode2(sid3, scalar_buf, &scalar_size, fapl);
     CHECK(ret, FAIL, "H5Sencode2");
 
@@ -1419,7 +1419,7 @@ test_h5s_encode1(void)
     ret = H5Sselect_hyperslab(sid1, H5S_SELECT_SET, start, stride, count, block);
     CHECK(ret, FAIL, "H5Sselect_hyperslab");
 
-    /* Encode simple data space in a buffer with the fapl setting */
+    /* Encode simple dataspace in a buffer with the fapl setting */
     ret = H5Sencode1(sid1, NULL, &sbuf_size);
     CHECK(ret, FAIL, "H5Sencode2");
 
@@ -1434,7 +1434,7 @@ test_h5s_encode1(void)
     } H5E_END_TRY;
     VERIFY(ret_id, FAIL, "H5Sdecode");
 
-    /* Encode the simple data space in a buffer */
+    /* Encode the simple dataspace in a buffer */
     ret = H5Sencode1(sid1, sbuf, &sbuf_size);
     CHECK(ret, FAIL, "H5Sencode");
 
@@ -1481,7 +1481,7 @@ test_h5s_encode1(void)
     sid2 = H5Screate(H5S_NULL);
     CHECK(sid2, FAIL, "H5Screate");
 
-    /* Encode null data space in a buffer */
+    /* Encode null dataspace in a buffer */
     ret = H5Sencode1(sid2, NULL, &null_size);
     CHECK(ret, FAIL, "H5Sencode");
 
@@ -1490,7 +1490,7 @@ test_h5s_encode1(void)
         CHECK(null_sbuf, NULL, "HDcalloc");
     }
 
-    /* Encode the null data space in the buffer */
+    /* Encode the null dataspace in the buffer */
     ret = H5Sencode1(sid2, null_sbuf, &null_size);
     CHECK(ret, FAIL, "H5Sencode2");
 
@@ -1515,9 +1515,9 @@ test_h5s_encode1(void)
      */
     /* Create scalar dataspace */
     sid3 = H5Screate(H5S_SCALAR);
-    CHECK(sid3, FAIL, "H5Screate_simple");
+    CHECK(sid3, FAIL, "H5Screate");
 
-    /* Encode scalar data space in a buffer */
+    /* Encode scalar dataspace in a buffer */
     ret = H5Sencode1(sid3, NULL, &scalar_size);
     CHECK(ret, FAIL, "H5Sencode");
 
@@ -1526,7 +1526,7 @@ test_h5s_encode1(void)
         CHECK(scalar_buf, NULL, "HDcalloc");
     }
 
-    /* Encode the scalar data space in the buffer */
+    /* Encode the scalar dataspace in the buffer */
     ret = H5Sencode1(sid3, scalar_buf, &scalar_size);
     CHECK(ret, FAIL, "H5Sencode2");
 
@@ -1622,8 +1622,8 @@ test_h5s_check_encoding(hid_t in_fapl, hid_t in_sid,
         VERIFY(H5Sget_select_npoints(in_sid), H5Sget_select_npoints(d_sid), "Compare npoints");
 
         /* Verify if the two dataspace selections (in_sid, d_sid) are the same shape */
-        check = H5S__select_shape_same_test(in_sid, d_sid);
-        VERIFY(check, TRUE, "H5S__select_shape_same_test");
+        check = H5Sselect_shape_same(in_sid, d_sid);
+        VERIFY(check, TRUE, "H5Sselect_shape_same");
 
         /* Compare the starting/ending coordinates of the bounding box for in_sid and d_sid */
         ret = H5Sget_select_bounds(in_sid, in_low_bounds, in_high_bounds);
@@ -2127,7 +2127,7 @@ test_h5s_encode_length(void)
     ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, &start, &stride, &count, &block);
     CHECK(ret, FAIL, "H5Sselect_hyperslab");
 
-    /* Encode simple data space in a buffer */
+    /* Encode simple dataspace in a buffer */
     ret = H5Sencode2(sid, NULL, &sbuf_size, H5P_DEFAULT);
     CHECK(ret, FAIL, "H5Sencode");
 
@@ -2493,7 +2493,7 @@ test_h5s_chunk(void)
     status = H5Pset_chunk(plist_id, 2, csize);
     CHECK(status, FAIL, "H5Pset_chunk");
 
-    /* Create the data space */
+    /* Create the dataspace */
     dims[0] = 50000;
     dims[1] = 3;
     space_id = H5Screate_simple(2, dims, NULL);